Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/jsLibraryMappings.xml
#	MephorceAuth.iml
#	web/WEB-INF/views/loginViews/studentBar.jsp
Кинетик 5 years ago
parent
commit
2835393387
28 changed files with 15173 additions and 574 deletions
  1. 2 2
      .idea/dataSources.xml
  2. 208 245
      .idea/dataSources/4eb729b2-843d-44b4-aab0-d35125e95ae3.xml
  3. 1 0
      MephorceAuth.iml
  4. 1339 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css
  5. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map
  6. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css
  7. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map
  8. 459 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css
  9. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map
  10. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css
  11. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map
  12. 9320 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css
  13. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map
  14. 6 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css
  15. 1 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map
  16. 59 123
      web/WEB-INF/views/cssforpr.css
  17. 3535 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js
  18. 7 0
      web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js
  19. 1 0
      web/WEB-INF/dispatcher-servlet.xml
  20. 0 7
      web/WEB-INF/views/bootstrap.min.css
  21. 28 24
      web/WEB-INF/views/loginViews/adminBar.jsp
  22. 31 27
      web/WEB-INF/views/loginViews/index.jsp
  23. 28 24
      web/WEB-INF/views/loginViews/ownerBar.jsp
  24. 17 13
      web/WEB-INF/views/loginViews/studentBar.jsp
  25. 33 29
      web/WEB-INF/views/registrationViews/regAdminPage.jsp
  26. 26 25
      web/WEB-INF/views/registrationViews/regClientPage.jsp
  27. 34 30
      web/WEB-INF/views/registrationViews/regStudentPage.jsp
  28. 31 25
      web/WEB-INF/views/registrationViews/registration.jsp

+ 2 - 2
.idea/dataSources.xml

@@ -32,10 +32,10 @@
       </driver-properties>
       <libraries>
         <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/mysql-connector-license.txt</url>
         </library>
         <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/mysql-connector-java-5.1.35-bin.jar</url>
         </library>
       </libraries>
     </data-source>

+ 208 - 245
.idea/dataSources/4eb729b2-843d-44b4-aab0-d35125e95ae3.xml

@@ -1,276 +1,239 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="hibernate.cfg.xml/Hibernate">
-  <database-model serializer="dbm" rdbms="MYSQL" format-version="4.0">
-    <root id="1"/>
-    <schema id="2" parent="1" name="anketa">
-      <Current>1</Current>
-      <Visible>1</Visible>
+  <database-model serializer="dbm" rdbms="MYSQL" format-version="2.6">
+    <schema id="1" name="anketa">
+      <visible>1</visible>
     </schema>
-    <schema id="3" parent="1" name="information_schema"/>
-    <schema id="4" parent="1" name="mysql"/>
-    <schema id="5" parent="1" name="performance_schema"/>
-    <schema id="6" parent="1" name="sakila"/>
-    <schema id="7" parent="1" name="sys"/>
-    <schema id="8" parent="1" name="world"/>
-    <table id="9" parent="2" name="clients"/>
-    <table id="10" parent="2" name="groups"/>
-    <table id="11" parent="2" name="moderators"/>
-    <table id="12" parent="2" name="projects"/>
-    <table id="13" parent="2" name="st_pr"/>
-    <table id="14" parent="2" name="students"/>
-    <table id="15" parent="2" name="users"/>
-    <column id="16" parent="9" name="client_id">
-      <Position>1</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="17" parent="9" name="cl_family">
-      <Position>2</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="18" parent="9" name="cl_first_name">
-      <Position>3</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="19" parent="9" name="cl_sec_name">
-      <Position>4</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="20" parent="9" name="cl_password">
-      <Position>5</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <key id="21" parent="9" name="PRIMARY">
-      <ColNames>client_id</ColNames>
-      <Primary>1</Primary>
+    <schema id="2" name="information_schema"/>
+    <schema id="3" name="mysql"/>
+    <schema id="4" name="performance_schema"/>
+    <schema id="5" name="sakila"/>
+    <schema id="6" name="sys"/>
+    <schema id="7" name="test1"/>
+    <schema id="8" name="test_db"/>
+    <schema id="9" name="world"/>
+    <table id="10" parent="1" name="clients"/>
+    <table id="11" parent="1" name="groups"/>
+    <table id="12" parent="1" name="moderators"/>
+    <table id="13" parent="1" name="projects"/>
+    <table id="14" parent="1" name="st_pr"/>
+    <table id="15" parent="1" name="students"/>
+    <table id="16" parent="1" name="users"/>
+    <column id="17" parent="10" name="client_id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
+    </column>
+    <column id="18" parent="10" name="cl_family">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="19" parent="10" name="cl_first_name">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="20" parent="10" name="cl_sec_name">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="21" parent="10" name="cl_password">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <key id="22" parent="10" name="PRIMARY">
+      <columns>client_id</columns>
+      <primary>1</primary>
     </key>
-    <column id="22" parent="10" name="group_id">
-      <Position>1</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="23" parent="10" name="group_name">
-      <Position>2</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="24" parent="10" name="year">
-      <Position>3</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <key id="25" parent="10" name="PRIMARY">
-      <ColNames>group_id</ColNames>
-      <Primary>1</Primary>
+    <column id="23" parent="11" name="group_id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
+    </column>
+    <column id="24" parent="11" name="group_name">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="25" parent="11" name="year">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <key id="26" parent="11" name="PRIMARY">
+      <columns>group_id</columns>
+      <primary>1</primary>
     </key>
-    <column id="26" parent="11" name="mod_id">
-      <Position>1</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="27" parent="11" name="mod_family">
-      <Position>2</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="28" parent="11" name="mod_first_name">
-      <Position>3</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="29" parent="11" name="mod_sec_name">
-      <Position>4</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="30" parent="11" name="mod_password">
-      <Position>5</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="31" parent="11" name="mod_birthdate">
-      <Position>6</Position>
-      <DataType>varchar(255)|0</DataType>
-      <DefaultExpression>&apos;11.11.2011&apos;</DefaultExpression>
-    </column>
-    <column id="32" parent="11" name="mod_email">
-      <Position>7</Position>
-      <DataType>varchar(255)|0</DataType>
-      <DefaultExpression>&apos;pochta@mail.ru&apos;</DefaultExpression>
-    </column>
-    <column id="33" parent="11" name="mod_hometown">
-      <Position>8</Position>
-      <DataType>varchar(255)|0</DataType>
-      <DefaultExpression>&apos;Город&apos;</DefaultExpression>
-    </column>
-    <column id="34" parent="11" name="mod_phone">
-      <Position>9</Position>
-      <DataType>varchar(255)|0</DataType>
-      <DefaultExpression>&apos;0000000000&apos;</DefaultExpression>
-    </column>
-    <key id="35" parent="11" name="PRIMARY">
-      <ColNames>mod_id</ColNames>
-      <Primary>1</Primary>
+    <column id="27" parent="12" name="mod_id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
+    </column>
+    <column id="28" parent="12" name="mod_family">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="29" parent="12" name="mod_first_name">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="30" parent="12" name="mod_sec_name">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="31" parent="12" name="mod_password">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="32" parent="12" name="mod_birthdate">
+      <data-type>varchar(255)|0</data-type>
+      <default-expression>&apos;11.11.2011&apos;</default-expression>
+    </column>
+    <column id="33" parent="12" name="mod_email">
+      <data-type>varchar(255)|0</data-type>
+      <default-expression>&apos;pochta@mail.ru&apos;</default-expression>
+    </column>
+    <column id="34" parent="12" name="mod_hometown">
+      <data-type>varchar(255)|0</data-type>
+      <default-expression>&apos;Город&apos;</default-expression>
+    </column>
+    <column id="35" parent="12" name="mod_phone">
+      <data-type>varchar(255)|0</data-type>
+      <default-expression>&apos;0000000000&apos;</default-expression>
+    </column>
+    <key id="36" parent="12" name="PRIMARY">
+      <columns>mod_id</columns>
+      <primary>1</primary>
     </key>
-    <column id="36" parent="12" name="pr_id">
-      <Position>1</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
-      <SequenceIdentity>1</SequenceIdentity>
-    </column>
-    <column id="37" parent="12" name="title">
-      <Position>2</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="38" parent="12" name="description">
-      <Position>3</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="39" parent="12" name="date_of_creation">
-      <Position>4</Position>
-      <DataType>timestamp|0</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
-    </column>
-    <column id="40" parent="12" name="status">
-      <Position>5</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="41" parent="12" name="date_of_ready">
-      <Position>6</Position>
-      <DataType>date|0</DataType>
-    </column>
-    <column id="42" parent="12" name="sum">
-      <Position>7</Position>
-      <DataType>int(11)|0</DataType>
-    </column>
-    <column id="43" parent="12" name="mod_id">
-      <Position>8</Position>
-      <DataType>int(11)|0</DataType>
-    </column>
-    <column id="44" parent="12" name="client_id">
-      <Position>9</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="45" parent="12" name="jsondata">
-      <Position>10</Position>
-      <DataType>varchar(255)|0</DataType>
-      <DefaultExpression>&apos;[]&apos;</DefaultExpression>
-    </column>
-    <index id="46" parent="12" name="FK_ffb6klvqmnwust69pdfgau69i">
-      <ColNames>client_id</ColNames>
+    <column id="37" parent="13" name="pr_id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
+      <sequence-identity>1</sequence-identity>
+    </column>
+    <column id="38" parent="13" name="title">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="39" parent="13" name="description">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="40" parent="13" name="date_of_creation">
+      <mandatory>1</mandatory>
+      <data-type>timestamp|0</data-type>
+      <default-expression>CURRENT_TIMESTAMP</default-expression>
+    </column>
+    <column id="41" parent="13" name="status">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="42" parent="13" name="date_of_ready">
+      <data-type>date|0</data-type>
+    </column>
+    <column id="43" parent="13" name="sum">
+      <data-type>int(11)|0</data-type>
+    </column>
+    <column id="44" parent="13" name="mod_id">
+      <data-type>int(11)|0</data-type>
+    </column>
+    <column id="45" parent="13" name="client_id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
+    </column>
+    <column id="46" parent="13" name="jsondata">
+      <data-type>varchar(255)|0</data-type>
+      <default-expression>&apos;[]&apos;</default-expression>
+    </column>
+    <index id="47" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <columns>client_id</columns>
+      <desc-columns></desc-columns>
     </index>
-    <index id="47" parent="12" name="pr_modFK_idx">
-      <ColNames>mod_id</ColNames>
+    <index id="48" parent="13" name="pr_modFK_idx">
+      <columns>mod_id</columns>
+      <desc-columns></desc-columns>
     </index>
-    <key id="48" parent="12" name="PRIMARY">
-      <ColNames>pr_id</ColNames>
-      <Primary>1</Primary>
+    <key id="49" parent="13" name="PRIMARY">
+      <columns>pr_id</columns>
+      <primary>1</primary>
     </key>
-    <foreign-key id="49" parent="12" name="pr_modFK">
-      <ColNames>mod_id</ColNames>
-      <RefSchemaName>anketa</RefSchemaName>
-      <RefTableName>moderators</RefTableName>
-      <RefColNames>mod_id</RefColNames>
-      <OnUpdate>no-action</OnUpdate>
-      <OnDelete>no-action</OnDelete>
+    <foreign-key id="50" parent="13" name="pr_modFK">
+      <columns>mod_id</columns>
+      <ref-key>~.moderators.PRIMARY</ref-key>
+      <cascade-update-rule>no_action</cascade-update-rule>
+      <cascade-delete-rule>no_action</cascade-delete-rule>
     </foreign-key>
-    <foreign-key id="50" parent="12" name="FK_ffb6klvqmnwust69pdfgau69i">
-      <ColNames>client_id</ColNames>
-      <RefSchemaName>anketa</RefSchemaName>
-      <RefTableName>clients</RefTableName>
-      <RefColNames>client_id</RefColNames>
+    <foreign-key id="51" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
+      <columns>client_id</columns>
+      <ref-key>~.clients.PRIMARY</ref-key>
+      <cascade-update-rule>restrict</cascade-update-rule>
+      <cascade-delete-rule>restrict</cascade-delete-rule>
     </foreign-key>
-    <column id="51" parent="13" name="id">
-      <Position>1</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
+    <column id="52" parent="14" name="id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
     </column>
-    <column id="52" parent="13" name="st_id">
-      <Position>2</Position>
-      <DataType>int(11)|0</DataType>
+    <column id="53" parent="14" name="st_id">
+      <data-type>int(11)|0</data-type>
     </column>
-    <column id="53" parent="13" name="pr_id">
-      <Position>3</Position>
-      <DataType>int(11)|0</DataType>
+    <column id="54" parent="14" name="pr_id">
+      <data-type>int(11)|0</data-type>
     </column>
-    <index id="54" parent="13" name="prFK_idx">
-      <ColNames>pr_id</ColNames>
+    <index id="55" parent="14" name="prFK_idx">
+      <columns>pr_id</columns>
+      <desc-columns></desc-columns>
     </index>
-    <index id="55" parent="13" name="stFK_idx">
-      <ColNames>st_id</ColNames>
+    <index id="56" parent="14" name="stFK_idx">
+      <columns>st_id</columns>
+      <desc-columns></desc-columns>
     </index>
-    <key id="56" parent="13" name="PRIMARY">
-      <ColNames>id</ColNames>
-      <Primary>1</Primary>
+    <key id="57" parent="14" name="PRIMARY">
+      <columns>id</columns>
+      <primary>1</primary>
     </key>
-    <foreign-key id="57" parent="13" name="stFK">
-      <ColNames>st_id</ColNames>
-      <RefSchemaName>anketa</RefSchemaName>
-      <RefTableName>students</RefTableName>
-      <RefColNames>students_id</RefColNames>
-      <OnUpdate>no-action</OnUpdate>
-      <OnDelete>no-action</OnDelete>
+    <foreign-key id="58" parent="14" name="stFK">
+      <columns>st_id</columns>
+      <ref-key>~.students.PRIMARY</ref-key>
+      <cascade-update-rule>no_action</cascade-update-rule>
+      <cascade-delete-rule>no_action</cascade-delete-rule>
     </foreign-key>
-    <foreign-key id="58" parent="13" name="prFK">
-      <ColNames>pr_id</ColNames>
-      <RefSchemaName>anketa</RefSchemaName>
-      <RefTableName>projects</RefTableName>
-      <RefColNames>pr_id</RefColNames>
-      <OnUpdate>no-action</OnUpdate>
-      <OnDelete>no-action</OnDelete>
+    <foreign-key id="59" parent="14" name="prFK">
+      <columns>pr_id</columns>
+      <ref-key>~.projects.PRIMARY</ref-key>
+      <cascade-update-rule>no_action</cascade-update-rule>
+      <cascade-delete-rule>no_action</cascade-delete-rule>
     </foreign-key>
-    <column id="59" parent="14" name="students_id">
-      <Position>1</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
+    <column id="60" parent="15" name="students_id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
     </column>
-    <column id="60" parent="14" name="group_id">
-      <Position>2</Position>
-      <DataType>int(11)|0</DataType>
+    <column id="61" parent="15" name="group_id">
+      <data-type>int(11)|0</data-type>
     </column>
-    <column id="61" parent="14" name="st_family">
-      <Position>3</Position>
-      <DataType>varchar(45)|0</DataType>
+    <column id="62" parent="15" name="st_family">
+      <data-type>varchar(45)|0</data-type>
     </column>
-    <column id="62" parent="14" name="st_first_name">
-      <Position>4</Position>
-      <DataType>varchar(45)|0</DataType>
+    <column id="63" parent="15" name="st_first_name">
+      <data-type>varchar(45)|0</data-type>
     </column>
-    <column id="63" parent="14" name="st_sec_name">
-      <Position>5</Position>
-      <DataType>varchar(45)|0</DataType>
+    <column id="64" parent="15" name="st_sec_name">
+      <data-type>varchar(45)|0</data-type>
     </column>
-    <column id="64" parent="14" name="st_pk_number">
-      <Position>6</Position>
-      <DataType>varchar(45)|0</DataType>
+    <column id="65" parent="15" name="st_pk_number">
+      <data-type>varchar(45)|0</data-type>
     </column>
-    <index id="65" parent="14" name="stud_groupFK_idx">
-      <ColNames>group_id</ColNames>
+    <index id="66" parent="15" name="stud_groupFK_idx">
+      <columns>group_id</columns>
+      <desc-columns></desc-columns>
     </index>
-    <key id="66" parent="14" name="PRIMARY">
-      <ColNames>students_id</ColNames>
-      <Primary>1</Primary>
+    <key id="67" parent="15" name="PRIMARY">
+      <columns>students_id</columns>
+      <primary>1</primary>
     </key>
-    <foreign-key id="67" parent="14" name="stud_groupFK">
-      <ColNames>group_id</ColNames>
-      <RefSchemaName>anketa</RefSchemaName>
-      <RefTableName>groups</RefTableName>
-      <RefColNames>group_id</RefColNames>
-      <OnUpdate>no-action</OnUpdate>
-      <OnDelete>no-action</OnDelete>
+    <foreign-key id="68" parent="15" name="stud_groupFK">
+      <columns>group_id</columns>
+      <ref-key>~.groups.PRIMARY</ref-key>
+      <cascade-update-rule>no_action</cascade-update-rule>
+      <cascade-delete-rule>no_action</cascade-delete-rule>
     </foreign-key>
-    <column id="68" parent="15" name="user_id">
-      <Position>1</Position>
-      <DataType>int(11)|0</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="69" parent="15" name="user_login">
-      <Position>2</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <column id="70" parent="15" name="user_password">
-      <Position>3</Position>
-      <DataType>varchar(45)|0</DataType>
-    </column>
-    <key id="71" parent="15" name="PRIMARY">
-      <ColNames>user_id</ColNames>
-      <Primary>1</Primary>
+    <column id="69" parent="16" name="user_id">
+      <mandatory>1</mandatory>
+      <data-type>int(11)|0</data-type>
+    </column>
+    <column id="70" parent="16" name="user_login">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="71" parent="16" name="user_password">
+      <data-type>varchar(45)|0</data-type>
+    </column>
+    <column id="72" parent="16" name="enabled">
+      <mandatory>1</mandatory>
+      <data-type>tinyint(4)|0</data-type>
+      <default-expression>&apos;1&apos;</default-expression>
+    </column>
+    <key id="73" parent="16" name="PRIMARY">
+      <columns>user_id</columns>
+      <primary>1</primary>
     </key>
   </database-model>
 </dataSource>

+ 1 - 0
MephorceAuth.iml

@@ -48,6 +48,7 @@
     <orderEntry type="library" name="Hibernate 5.2.3-5.2.3" level="project" />
     <orderEntry type="library" name="com.mysql.jdbc_5.1.5" level="project" />
     <orderEntry type="library" name="jstl-1.2" level="project" />
+    <orderEntry type="library" name="jquery-latest" level="application" />
     <orderEntry type="library" name="gson-2.2.2" level="project" />
     <orderEntry type="library" name="jQuery-2.0.0" level="application" />
     <orderEntry type="library" name="jstl" level="project" />

File diff suppressed because it is too large
+ 1339 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css


File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map


File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css


File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map


+ 459 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css

@@ -0,0 +1,459 @@
+/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+html {
+  font-family: sans-serif;
+  line-height: 1.15;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+
+body {
+  margin: 0;
+}
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+figcaption,
+figure,
+main {
+  display: block;
+}
+
+figure {
+  margin: 1em 40px;
+}
+
+hr {
+  -webkit-box-sizing: content-box;
+          box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+}
+
+pre {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+a {
+  background-color: transparent;
+  -webkit-text-decoration-skip: objects;
+}
+
+a:active,
+a:hover {
+  outline-width: 0;
+}
+
+abbr[title] {
+  border-bottom: none;
+  text-decoration: underline;
+  text-decoration: underline dotted;
+}
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+dfn {
+  font-style: italic;
+}
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+small {
+  font-size: 80%;
+}
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+audio,
+video {
+  display: inline-block;
+}
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+img {
+  border-style: none;
+}
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: sans-serif;
+  font-size: 100%;
+  line-height: 1.15;
+  margin: 0;
+}
+
+button,
+input {
+  overflow: visible;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+button,
+html [type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+legend {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  color: inherit;
+  display: table;
+  max-width: 100%;
+  padding: 0;
+  white-space: normal;
+}
+
+progress {
+  display: inline-block;
+  vertical-align: baseline;
+}
+
+textarea {
+  overflow: auto;
+}
+
+[type="checkbox"],
+[type="radio"] {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  padding: 0;
+}
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+[type="search"] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  font: inherit;
+}
+
+details,
+menu {
+  display: block;
+}
+
+summary {
+  display: list-item;
+}
+
+canvas {
+  display: inline-block;
+}
+
+template {
+  display: none;
+}
+
+[hidden] {
+  display: none;
+}
+
+html {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+*,
+*::before,
+*::after {
+  -webkit-box-sizing: inherit;
+          box-sizing: inherit;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+html {
+  -ms-overflow-style: scrollbar;
+  -webkit-tap-highlight-color: transparent;
+}
+
+body {
+  font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font-size: 1rem;
+  font-weight: normal;
+  line-height: 1.5;
+  color: #292b2c;
+  background-color: #fff;
+}
+
+[tabindex="-1"]:focus {
+  outline: none !important;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 0;
+  margin-bottom: .5rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-bottom: .5rem;
+  margin-left: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+a {
+  color: #0275d8;
+  text-decoration: none;
+}
+
+a:focus, a:hover {
+  color: #014c8c;
+  text-decoration: underline;
+}
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):not([tabindex]):focus {
+  outline: 0;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img {
+  vertical-align: middle;
+}
+
+[role="button"] {
+  cursor: pointer;
+}
+
+a,
+area,
+button,
+[role="button"],
+input,
+label,
+select,
+summary,
+textarea {
+  -ms-touch-action: manipulation;
+      touch-action: manipulation;
+}
+
+table {
+  border-collapse: collapse;
+  background-color: transparent;
+}
+
+caption {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+  color: #636c72;
+  text-align: left;
+  caption-side: bottom;
+}
+
+th {
+  text-align: left;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: .5rem;
+}
+
+button:focus {
+  outline: 1px dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+}
+
+input,
+button,
+select,
+textarea {
+  line-height: inherit;
+}
+
+input[type="radio"]:disabled,
+input[type="checkbox"]:disabled {
+  cursor: not-allowed;
+}
+
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="month"] {
+  -webkit-appearance: listbox;
+}
+
+textarea {
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: .5rem;
+  font-size: 1.5rem;
+  line-height: inherit;
+}
+
+input[type="search"] {
+  -webkit-appearance: none;
+}
+
+output {
+  display: inline-block;
+}
+
+[hidden] {
+  display: none !important;
+}
+/*# sourceMappingURL=bootstrap-reboot.css.map */

File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map


File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css


File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map


File diff suppressed because it is too large
+ 9320 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css


File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map


File diff suppressed because it is too large
+ 6 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css


File diff suppressed because it is too large
+ 1 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map


+ 59 - 123
web/WEB-INF/views/cssforpr.css

@@ -1,42 +1,40 @@
-body {
-    background: #ffffff;
+html {
+    position: relative;
+    min-height: 100%;
     font-family: 'Roboto', sans-serif;
-    margin-bottom: 60px;
 }
-
-.logo {
-    width: 213px;
-    height: 213px;
-    background: url('http://i.imgur.com/fd8Lcso.png') no-repeat;
-    margin: 30px auto;
+body {
+    margin-bottom: 60px;
 }
 
-.login-block {
-    width: 400px;
-    padding: 20px;
-    background: #ffffff;
-    border: 1px solid #063971;
-    border-radius: 5px;
-    border-top: 5px solid #063971;
+.cf {
+    width: 50%;
     margin: 0 auto;
-    margin-top: -150px;
+    text-align: center;
+    font-size: 14px;
+    margin-top: 100px;
 }
 
-.login-block h1 {
+.cf h1 {
     text-align: center;
     color: #000;
     font-size: 18px;
-    text-transform: uppercase;
-    margin-top: 0;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
 }
 
-html {
-    position: relative;
-    min-height: 100%;
+.navbar-brand{
+    color: #063971;
+}
+
+.nav-masthead{
+    float: right;
 }
 
-.main-footer {
+.nav-masthead a{
+    color: #063971;
+}
+
+.footer {
     position: absolute;
     bottom: 0;
     width: 100%;
@@ -45,6 +43,19 @@ html {
     text-align: center;
 }
 
+body > .container {
+    padding: 0px 15px 0;
+}
+
+.container .text-muted {
+    margin: 0px 0;
+}
+
+.footer > .container {
+    padding-right: 15px;
+    padding-left: 15px;
+}
+
 .login-block input {
     width: 100%;
     height: 42px;
@@ -53,7 +64,6 @@ html {
     border: 1px solid #ccc;
     margin-bottom: 20px;
     font-size: 14px;
-    font-family: 'Roboto', sans-serif;
     padding: 0 20px 0 50px;
     outline: none;
     background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
@@ -77,7 +87,6 @@ html {
     border: 1px solid #ccc;
     margin-bottom: 20px;
     font-size: 14px;
-    font-family: 'Roboto', sans-serif;
     padding: 0 20px 0 50px;
     outline: none;
     background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
@@ -88,7 +97,6 @@ html {
     align-items: center;
     color: #111;
     display: flex;
-    font-family: 'Roboto', sans-serif;
     justify-content: space-between;
     font-size: 1.5em;
     width: auto;
@@ -105,7 +113,6 @@ html {
     font-weight: bold;
     text-transform: uppercase;
     font-size: 14px;
-    font-family: 'Roboto', sans-serif;
     outline: none;
     cursor: pointer;
 }
@@ -114,78 +121,19 @@ html {
     background: #063971;
 }
 
-/*
- * Globals
- */
-
-/* Links */
-a,
-a:focus,
-a:hover {
-    color: #fff;
-}
-
-/* Custom default button */
-.btn-secondary,
-.btn-secondary:hover,
-.btn-secondary:focus {
-    color: #333;
-    text-shadow: none; /* Prevent inheritance from `body` */
-    background-color: #fff;
-    border: .05rem solid #fff;
-}
-
-
-/*
- * Base structure
- */
-
-/* Extra markup and styles for table-esque vertical and horizontal centering */
-.site-wrapper {
-    display: table;
-    width: 100%;
-    height: 100%; /* For at least Firefox */
-    min-height: 100%;
-    -webkit-box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
-    box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
-}
-.site-wrapper-inner {
-    display: table-cell;
-    vertical-align: top;
-}
-.cover-container {
-    margin-right: auto;
-    margin-left: auto;
-}
-
-/* Padding for spacing */
-.inner {
-    padding: 2rem;
-}
-
-
-/*
- * Header
- */
-
-.masthead {
-    margin-bottom: 2rem;
-}
-
-.masthead-brand {
-    margin-bottom: 0;
-    color: #063971;
-    font-size: xx-large;
-}
-
-.container{
-    text-align: center;
-    font-size: 14px;
-    font-family: 'Roboto', sans-serif;
-    margin-top: 150px;
+.login-block {
+    width: 400px;
+    padding: 20px;
+    background: #ffffff;
+    border: 1px solid #063971;
+    border-radius: 5px;
+    border-top: 5px solid #063971;
+    margin: 0 auto;
+    margin-top: 100px;
+    margin-bottom: 40px;
 }
 
-.container h1 {
+.login-block h1 {
     text-align: center;
     color: #000;
     font-size: 18px;
@@ -194,42 +142,30 @@ a:hover {
     margin-bottom: 20px;
 }
 
-.nav-masthead .nav-link {
-    padding: .25rem 0;
-    font-weight: bold;
-    color: rgba(6, 57, 113, 0.5);
-    background-color: transparent;
-    border-bottom: .25rem solid transparent;
-}
-
-.nav-masthead .nav-link:hover,
-.nav-masthead .nav-link:focus {
-    border-bottom-color: rgba(255,255,255,.25);
+.btn-secondary,
+.btn-secondary:hover,
+.btn-secondary:focus {
+    color: #333;
+    text-shadow: none; /* Prevent inheritance from `body` */
+    background-color: #fff;
+    border: .05rem solid #fff;
 }
 
-.nav-masthead .nav-link + .nav-link {
-    margin-left: 1rem;
-}
+@media (max-width: 767px) {
 
-@media (min-width: 48em) {
-    .masthead-brand {
-        float: left;
-    }
-    .nav-masthead {
-        float: right;
+    .nav-masthead{
+        float: none;
     }
-}
 
-@media (max-width: 767px) {
     .login-block {
-        width: 95%;
+        width: 100%;
         padding: 20px;
         background: #ffffff;
         border: 1px solid #063971;
         border-radius: 5px;
         border-top: 5px solid #063971;
         margin: 0 auto;
-        margin-top: -150px;
+        margin-top: 100px;
     }
     .nav-link{
         margin-top: 10px;

File diff suppressed because it is too large
+ 3535 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js


File diff suppressed because it is too large
+ 7 - 0
web/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js


+ 1 - 0
web/WEB-INF/dispatcher-servlet.xml

@@ -2,6 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 

File diff suppressed because it is too large
+ 0 - 7
web/WEB-INF/views/bootstrap.min.css


+ 28 - 24
web/WEB-INF/views/loginViews/adminBar.jsp

@@ -11,8 +11,8 @@
 <head>
     <title>Страница администратора</title>
     <style type="text/css">
-        <%@include file="../cssforpr.css" %>
-        <%@include file="../bootstrap.min.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
 </head>
 <body>
@@ -20,31 +20,35 @@
     Все сообщения ${<название сообщения} буду ошибками в случае неправильного заполнения/ не заполнения поля, около которого появляется
 --%>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
-
-<div class="logo"></div>
-<div class="login-block">
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
 
-<h1>Вход как Администратор</h1>
-    <form:form method="post" modelAttribute="adminLogin" action="checkAdmin">
-        <form:select path="name" type="text" value="" placeholder="Логин" id="adminName">
-            <form:options items="${adminList}"/>
-        </form:select><br/>
-        <form:input path="password" type="password" value="" placeholder="Пароль" id="password"/>${passMessage}<br/>
-        <form:button>Войти</form:button>
-    </form:form>
+<div class="container">
+    <div class="login-block">
+        <h1>Вход как Администратор</h1>
+        <form:form method="post" modelAttribute="adminLogin" action="checkAdmin">
+            <form:select path="name" type="text" value="" placeholder="Логин" id="adminName">
+                <form:options items="${adminList}"/>
+            </form:select><br/>
+            <form:input path="password" type="password" value="" placeholder="Пароль" id="password"/>${passMessage}<br/>
+            <form:button>Войти</form:button>
+        </form:form>
+    </div>
 </div>
 
-<footer class="main-footer">
-    <span>&copy;2017 Mephorce</span>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
 </footer>
 
 </body>

+ 31 - 27
web/WEB-INF/views/loginViews/index.jsp

@@ -8,47 +8,51 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<link href="../bootstrap.min.css" rel="stylesheet">
 
 <html>
 
 <head>
   <title>Login Page</title>
   <style type="text/css">
-    <%@include file="../cssforpr.css" %>
-    <%@include file="../bootstrap.min.css" %>
+    <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+    <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
   </style>
 </head>
 
 <body>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
-
-    <div class="logo"></div>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link active" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="container">
     <div class="login-block">
-  <h1>Вход в систему</h1>
-  <spring:form method="post"  modelAttribute="userJSP" action="check-user">
-     <spring:select path="name" type="text" value="" placeholder="Логин" id="username">
-         <spring:option value="исполнитель">Исполнитель</spring:option>
-         <spring:option value="модератор">Администратор</spring:option>
-         <spring:option value="заказчик">Заказчик</spring:option>
-     </spring:select> <br/>
-     <spring:input path="password" type="password" value="" placeholder="Пароль" id="password"/>   <br/>
-    ${message}<br/>
-    <spring:button>Вход</spring:button>
-  </spring:form>
+        <h1>Вход в систему</h1>
+        <spring:form method="post"  modelAttribute="userJSP" action="check-user">
+            <spring:select path="name" type="text" value="" placeholder="Логин" id="username">
+                <spring:option value="исполнитель">Исполнитель</spring:option>
+                <spring:option value="модератор">Администратор</spring:option>
+                <spring:option value="заказчик">Заказчик</spring:option>
+            </spring:select> <br/>
+            <spring:input path="password" type="password" value="" placeholder="Пароль" id="password"/>   <br/>
+            ${message}<br/>
+            <spring:button>Вход</spring:button>
+        </spring:form>
+    </div>
 </div>
 
-<footer class="main-footer">
-    <span>&copy;2017 Mephorce</span>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
 </footer>
 
 </body>

+ 28 - 24
web/WEB-INF/views/loginViews/ownerBar.jsp

@@ -11,8 +11,8 @@
 <head>
     <title>Страница заказчика</title>
     <style type="text/css">
-        <%@include file="../cssforpr.css" %>
-        <%@include file="../bootstrap.min.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
 </head>
 <body>
@@ -20,31 +20,35 @@
     Все сообщения ${<название сообщения} буду ошибками в случае неправильного заполнения/ не заполнения поля, около которого появляется
 --%>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
-
-<div class="logo"></div>
-<div class="login-block">
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
 
-<h1>Вход как заказчик</h1>
-    <form:form method="post" modelAttribute="clientLogin" action="checkClient">
-        <form:select path="name" type="text" value="" placeholder="Логин" id="clientName">
-            <form:options items="${clientList}"/>
-        </form:select><br/>
-        <form:input path="password" type="password" value="" placeholder="Пароль" id="password"/>${passMessage}<br/>
-        <form:button>Войти</form:button>
-    </form:form>
+<div class="container">
+    <div class="login-block">
+        <h1>Вход как заказчик</h1>
+        <form:form method="post" modelAttribute="clientLogin" action="checkClient">
+            <form:select path="name" type="text" value="" placeholder="Логин" id="clientName">
+                <form:options items="${clientList}"/>
+            </form:select><br/>
+            <form:input path="password" type="password" value="" placeholder="Пароль" id="password"/>${passMessage}<br/>
+            <form:button>Войти</form:button>
+        </form:form>
+    </div>
 </div>
 
-<footer class="main-footer">
-    <span>&copy;2017 Mephorce</span>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
 </footer>
 
 </body>

+ 17 - 13
web/WEB-INF/views/loginViews/studentBar.jsp

@@ -16,8 +16,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Страница студента</title>
     <style type="text/css">
-        <%@include file="../cssforpr.css" %>
-        <%@include file="../bootstrap.min.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
     <script type="text/javascript"
             src="<c:url value='/WEB-INF/lib/jquery-3.1.1.min.js' />"></script>
@@ -78,15 +78,17 @@
 </head>
 <body>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
 
 <div class="logo"></div>
 <div class="login-block">
@@ -107,8 +109,10 @@
     </form:form>
 </div>
 
-<footer class="main-footer">
-    <span>&copy;2017 Mephorce</span>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
 </footer>
 
 </body>

+ 33 - 29
web/WEB-INF/views/registrationViews/regAdminPage.jsp

@@ -11,8 +11,8 @@
 <head>
     <title>Регистрация Администратора</title>
     <style type="text/css">
-        <%@include file="../cssforpr.css" %>
-        <%@include file="../bootstrap.min.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
 </head>
 <body>
@@ -20,36 +20,40 @@
     Все сообщения ${<название сообщения} буду ошибками в случае неправильного заполнения/ не заполнения поля, около которого появляется
 --%>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
-
-<div class="logo"></div>
-<div class="login-block">
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
 
-    <spring:form method="post"  modelAttribute="admin" action="regAdminAction">
-        <h1>Регистрация Администратора</h1>
-        <spring:input path="modFamily" type="text" placeholder="Фамилия"/>${famMessage}   <br/>
-        <spring:input path="modFirstName" type="text" placeholder="Имя"/>${nameMessage}   <br/>
-        <spring:input path="modSecName" type="text" placeholder="Отчество"/>${secNameMessage}   <br/>
-        <spring:input path="modEmail" type="text" placeholder="E-mail"/>${emailMessage}   <br/>
-        <spring:input path="modHometown" type="text" placeholder="Город"/>${hometownMessage}   <br/>
-        <spring:input path="modPhone" type="text" placeholder="Телефон"/>${phoneMessage}   <br/>
-        <spring:input path="modBirthdate" type="date" placeholder="День рождения"/>${birthMessage} <br/>
-        <spring:input path="modPassword" type="password" placeholder="Пароль"/>${passMessage}   <br/>
-        ${errorMessage}<br/>
-        <spring:button>Зарегистрироваться</spring:button>
-    </spring:form>
+<div class="container">
+    <div class="login-block">
+        <spring:form method="post"  modelAttribute="admin" action="regAdminAction">
+            <h1>Регистрация Администратора</h1>
+            <spring:input path="modFamily" type="text" placeholder="Фамилия"/>${famMessage}   <br/>
+            <spring:input path="modFirstName" type="text" placeholder="Имя"/>${nameMessage}   <br/>
+            <spring:input path="modSecName" type="text" placeholder="Отчество"/>${secNameMessage}   <br/>
+            <spring:input path="modEmail" type="text" placeholder="E-mail"/>${emailMessage}   <br/>
+            <spring:input path="modHometown" type="text" placeholder="Город"/>${hometownMessage}   <br/>
+            <spring:input path="modPhone" type="text" placeholder="Телефон"/>${phoneMessage}   <br/>
+            <spring:input path="modBirthdate" type="date" placeholder="День рождения"/>${birthMessage} <br/>
+            <spring:input path="modPassword" type="password" placeholder="Пароль"/>${passMessage}   <br/>
+            ${errorMessage}<br/>
+            <spring:button>Зарегистрироваться</spring:button>
+        </spring:form>
+    </div>
 </div>
 
-<footer class="main-footer">
-    <span>&copy;2017 Mephorce</span>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
 </footer>
 
 </body>

+ 26 - 25
web/WEB-INF/views/registrationViews/regClientPage.jsp

@@ -11,8 +11,8 @@
 <head>
     <title>Регистрация Клиента</title>
     <style type="text/css">
-        <%@include file="../cssforpr.css" %>
-        <%@include file="../bootstrap.min.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
 </head>
 <body>
@@ -20,31 +20,32 @@
     Все сообщения ${<название сообщения} буду ошибками в случае неправильного заполнения/ не заполнения поля, около которого появляется
 --%>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
-
-<div class="logo"></div>
-<div class="login-block">
-
-    <spring:form method="post"  modelAttribute="client" action="regClientAction">
-        <h1>Регистрация Заказчика</h1>
-        <spring:input path="clFamily" type="text" placeholder="Фамилия"/>${famMessage}   <br/>
-        <spring:input path="clFirstName" type="text" placeholder="Имя"/>${nameMessage}   <br/>
-        <spring:input path="clSecName" type="text" placeholder="Отчество"/>${secNameMessage}   <br/>
-        <spring:input path="clPassword" type="password" placeholder="Пароль"/>${passMessage}   <br/>
-        ${errMessage}<br/>
-        <spring:button>Зарегистрироваться</spring:button>
-    </spring:form>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="container">
+    <div class="login-block">
+        <spring:form method="post"  modelAttribute="client" action="regClientAction">
+            <h1>Регистрация Заказчика</h1>
+            <spring:input path="clFamily" type="text" placeholder="Фамилия"/>${famMessage}   <br/>
+            <spring:input path="clFirstName" type="text" placeholder="Имя"/>${nameMessage}   <br/>
+            <spring:input path="clSecName" type="text" placeholder="Отчество"/>${secNameMessage}   <br/>
+            <spring:input path="clPassword" type="password" placeholder="Пароль"/>${passMessage}   <br/>
+            ${errMessage}<br/>
+            <spring:button>Зарегистрироваться</spring:button>
+        </spring:form>
+    </div>
 </div>
 
-<footer class="main-footer">
+<footer class="footer">
     <div class="container">
         <span>&copy;2017 Mephorce</span>
     </div>

+ 34 - 30
web/WEB-INF/views/registrationViews/regStudentPage.jsp

@@ -13,8 +13,8 @@
 <head>
     <title>Регистрация Исполнителя</title>
     <style type="text/css">
-        <%@include file="../cssforpr.css" %>
-        <%@include file="../bootstrap.min.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
 </head>
 <%--
@@ -22,37 +22,41 @@
 --%>
 <body>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
-
-<div class="logo"></div>
-<div class="login-block">
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
 
-    <spring:form method="post"  modelAttribute="student" action="regStudentAction">
-        <h1>Регистрация Исполнителя</h1>
-            <spring:input path="stFamily" type="text" placeholder="Фамилия"/> ${famMessage}  <br/>
-            <spring:input path="stFirstName" type="text" placeholder="Имя"/>${nameMessage}   <br/>
-            <spring:input path="stSecName" type="text" placeholder="Отчество"/>${secNameMessage}   <br/>
-            <spring:input path="stPkNumber" type="password" placeholder="Пароль"/>${passMessage}   <br/>
-        <form:select id="groupId" path="stGroup">
-        <c:forEach items="${groupList}" var="group">
-            <form:option value="${group.groupId}" >${group.groupName}</form:option>
-        </c:forEach><br/>
-        </form:select>
-            ${errMessage}<br/>
-        <spring:button>Зарегистрироваться</spring:button>
-        </spring:form>
+<div class="container">
+    <div class="login-block">
+        <spring:form method="post"  modelAttribute="student" action="regStudentAction">
+            <h1>Регистрация Исполнителя</h1>
+                <spring:input path="stFamily" type="text" placeholder="Фамилия"/> ${famMessage}  <br/>
+                <spring:input path="stFirstName" type="text" placeholder="Имя"/>${nameMessage}   <br/>
+                <spring:input path="stSecName" type="text" placeholder="Отчество"/>${secNameMessage}   <br/>
+                <spring:input path="stPkNumber" type="password" placeholder="Пароль"/>${passMessage}   <br/>
+            <form:select id="groupId" path="stGroup">
+            <c:forEach items="${groupList}" var="group">
+                <form:option value="${group.groupId}" >${group.groupName}</form:option>
+            </c:forEach><br/>
+            </form:select>
+                ${errMessage}<br/>
+            <spring:button>Зарегистрироваться</spring:button>
+            </spring:form>
+    </div>
 </div>
 
-<footer class="main-footer">
-    <span>&copy;2017 Mephorce</span>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
 </footer>
 
 </body>

+ 31 - 25
web/WEB-INF/views/registrationViews/registration.jsp

@@ -11,39 +11,45 @@
 <head>
     <title>Регистрация</title>
     <style type="text/css">
-        <%@include file="../cssforpr.css" %>
-        <%@include file="../bootstrap.min.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
 </head>
 <body>
 
-<div class="inner">
-    <h3 class="masthead-brand">Mephorce</h3>
-    <nav class="nav nav-masthead">
-        <a class="nav-link active" href="/">Войти</a>
-        <a class="nav-link" href="/aboutUs">О проекте</a>
-        <a class="nav-link" href="/registrate">Создать аккаунт</a>
-        <a class="nav-link" href="/contacts">Контакты</a>
-    </nav>
-</div>
+<nav class="navbar navbar-default navbar-fixed-top">
     <div class="container">
-    <h1>Выбор типа создаваемого пользователя</h1>
-    <div class="btn-group-vertical" role="group" aria-label="Vertical button group">
-
-        <button type="button" class="btn btn-secondary">
-            <a href="/regStudent">Исполнитель</a>
-        </button>
-        <button type="button" class="btn btn-secondary">
-            <a href="/regAdmin">Администратор</a>
-        </button>
-        <button type="button" class="btn btn-secondary">
-            <a href="/regClient">Заказчик</a>
-        </button>
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
 
+<div class="container">
+    <div class="cf">
+        <h1>Выбор типа создаваемого пользователя</h1>
+        <div class="btn-group-vertical" role="group" aria-label="Vertical button group">
+            <button type="button" class="btn btn-secondary">
+                <a href="/regStudent">Исполнитель</a>
+            </button>
+            <button type="button" class="btn btn-secondary">
+                <a href="/regAdmin">Администратор</a>
+            </button>
+            <button type="button" class="btn btn-secondary">
+                <a href="/regClient">Заказчик</a>
+            </button>
+        </div>
     </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
     </div>
-<footer class="main-footer">
-    <span>&copy;2017 Mephorce</span>
 </footer>
 
 </body>