diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java index 8543847..3e8d66f 100644 --- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java @@ -13,6 +13,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter { //registry.addViewController("/admin/{articlename:\\w+}"); registry.addViewController("/papers/{articlename:\\w+}"); registry.addViewController("/grants/{articlename:\\w+}"); + registry.addViewController("/conferences/{articlename:\\w+}"); registry.addRedirectViewController("/", "/index"); registry.addRedirectViewController("/default", "/index"); } diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css new file mode 100644 index 0000000..06d8041 --- /dev/null +++ b/src/main/resources/public/css/conference.css @@ -0,0 +1,94 @@ +.col-lg-12 a{ + position: absolute; + font-size: smaller; +} + +.col-lg-12 a img{ + width: 36px; + height: 33px; +} + +.form-group textarea{ + min-height: 206px; + max-height: 463px; +} + + +.deadline-list{ + height: 200px; + padding: 0px; + overflow-y: scroll; +} + +.deadline{ + margin: 0; +} + +.deadline-text{ + flex: 1; +} + +.member-list{ + height: 200px; + padding: 0px; + overflow-y: scroll; +} + +.member{ + margin: 0; +} + +.paper-list{ + height: 200px; + padding: 0px; + overflow-y: scroll; +} + +.paper{ + margin: 0; +} + +.paper-name{ + flex: 1; +} + +.paper-name span{ + margin: 6px 15px; + display: inline-block; +} + +.icon{ + width: 38px; + height: 38px; + padding: 2px; + cursor: pointer; +} + +.icon-delete{ + background-color: #f44; +} + +.icon-paper{ + height: 26px; + width: 26px; + float: right; + margin: 5px; +} + +.grey-border{ + color: #495057; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: .25rem; + transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; +} + +#add-paper{ + margin-left: 10px; +} + +#cancel-button{ + position: relative; + font-size: 1rem; +} + diff --git a/src/main/resources/public/img/conference/back.png b/src/main/resources/public/img/conference/back.png new file mode 100644 index 0000000..7667350 Binary files /dev/null and b/src/main/resources/public/img/conference/back.png differ diff --git a/src/main/resources/public/img/conference/delete.png b/src/main/resources/public/img/conference/delete.png new file mode 100644 index 0000000..595bf63 Binary files /dev/null and b/src/main/resources/public/img/conference/delete.png differ diff --git a/src/main/resources/public/img/conference/edit.png b/src/main/resources/public/img/conference/edit.png new file mode 100644 index 0000000..832bef3 Binary files /dev/null and b/src/main/resources/public/img/conference/edit.png differ diff --git a/src/main/resources/public/img/conference/paper.png b/src/main/resources/public/img/conference/paper.png new file mode 100644 index 0000000..78a0dfc Binary files /dev/null and b/src/main/resources/public/img/conference/paper.png differ diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html new file mode 100644 index 0000000..078e697 --- /dev/null +++ b/src/main/resources/templates/conferences/conference.html @@ -0,0 +1,164 @@ + + + + + + +
+
+
+
+
+ + + Назад к списку конференций + +

Редактирование конференции

+
+
+
+
+
+
+
+ +
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+ + + Удалить +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ + - + +
+
+
+ +
+ +
+
+
+ Пользователь 1 +
+
+ очная +
+
+ статья +
+
+
+
+ Пользователь 2 +
+
+ заочная +
+
+ доклад +
+
+
+
+ +
+ +
+ +
+ +
+
+
+ + Имя статьи + + +
+ Удалить +
+
+
+
+ + +
+
+ +
+
+
+ + + Отмена + +
+
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/conferences/conferences.html b/src/main/resources/templates/conferences/conferences.html new file mode 100644 index 0000000..ab9fd31 --- /dev/null +++ b/src/main/resources/templates/conferences/conferences.html @@ -0,0 +1,20 @@ + + + + + + +
+ + нажать +
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 0f83f3f..40a1281 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -60,7 +60,7 @@
- +