From 93e68b1929cae34135a7a4c84e377155ce5f1105 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Wed, 6 Mar 2019 16:27:25 +0400 Subject: [PATCH 1/8] #50 creating html page, changing href --- .../templates/conferences/conference.html | 13 +++++++++++++ .../templates/conferences/conferences.html | 14 ++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/main/resources/templates/conferences/conference.html create mode 100644 src/main/resources/templates/conferences/conferences.html diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html new file mode 100644 index 0000000..4d4c2ea --- /dev/null +++ b/src/main/resources/templates/conferences/conference.html @@ -0,0 +1,13 @@ + + + + + + +
+ +
+ + \ 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..dbd1f49 --- /dev/null +++ b/src/main/resources/templates/conferences/conferences.html @@ -0,0 +1,14 @@ + + + + + + +
+ +
+ + + \ No newline at end of file From c21a65a075eecffc14d2b0c1eeb8fd869a9c9002 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Wed, 6 Mar 2019 16:48:51 +0400 Subject: [PATCH 2/8] #54 add transitions --- .../java/ru/ulstu/configuration/MvcConfiguration.java | 1 + src/main/resources/templates/conferences/conferences.html | 8 +++++++- src/main/resources/templates/index.html | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) 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/templates/conferences/conferences.html b/src/main/resources/templates/conferences/conferences.html index dbd1f49..ab9fd31 100644 --- a/src/main/resources/templates/conferences/conferences.html +++ b/src/main/resources/templates/conferences/conferences.html @@ -7,7 +7,13 @@
- + + нажать
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 @@
- +
From 76ec5add30767ed2f3e3d886d5b03fd7a0dd28d9 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Wed, 6 Mar 2019 20:51:46 +0400 Subject: [PATCH 3/8] #54 part of make-up --- .../templates/conferences/conference.html | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 4d4c2ea..159f14a 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -7,7 +7,97 @@ \ No newline at end of file From 7fff337c3ac87f571bdb6255e330852496bdd30c Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Thu, 7 Mar 2019 22:50:37 +0400 Subject: [PATCH 4/8] #54 add member list --- src/main/resources/public/css/conference.css | 14 ++++++ .../templates/conferences/conference.html | 50 +++++++++++++------ 2 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/public/css/conference.css diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css new file mode 100644 index 0000000..6bde9bc --- /dev/null +++ b/src/main/resources/public/css/conference.css @@ -0,0 +1,14 @@ +.member-list{ + height: 200px; + padding: 0px; +} + +.member{ + margin: 0; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: .25rem; + transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; +} \ No newline at end of file diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 159f14a..901822f 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="default"> - +
@@ -28,14 +28,14 @@
- +
- -
@@ -47,33 +47,51 @@ value="Добавить дедлайн"/>
-
+
-
-
Дата проведения:
-
-
+ +
-
-
+ -
+
-
-
-
Дата изменения:
+ +
+
+
+ Пользователь 1 +
+
+ очная +
+
+ статья +
-
+
+
+ Пользователь 2 +
+
+ заочная +
+
+ доклад +
+ +
From d332282e0364f44519433446d904b6047a73903e Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Sun, 10 Mar 2019 22:15:09 +0400 Subject: [PATCH 5/8] #54 add custom deadline-list, add edit-button, add edit and delete icons --- src/main/resources/public/css/conference.css | 28 +++++++++++ .../public/img/conference/delete.png | Bin 0 -> 174 bytes .../resources/public/img/conference/edit.png | Bin 0 -> 254 bytes .../templates/conferences/conference.html | 47 ++++++++++++------ 4 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/public/img/conference/delete.png create mode 100644 src/main/resources/public/img/conference/edit.png diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 6bde9bc..3b867c6 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -1,3 +1,16 @@ +.deadline-list{ + height: 200px; + padding: 0px; +} + +.deadline{ + margin: 0; +} + +.deadline-text{ + flex: 1; +} + .member-list{ height: 200px; padding: 0px; @@ -5,6 +18,21 @@ .member{ margin: 0; +} + +.icon{ + width: 38px; + height: 38px; + padding: 2px; + cursor: pointer; +} + +.icon-edit-input-text{ + width: 27px; + height: 27px; +} + +.grey-border{ color: #495057; background-color: #fff; background-clip: padding-box; 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 0000000000000000000000000000000000000000..595bf6329fa89da65931ed3862d2634bd81dee23 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtQcoAhkP61P=MQooP!M6cxMhO( zfjnK+%!Bj3r19EEJ2_liaOTjR@3J|w4UcW=>VG=*{QtI&m6B`>2h@@i`4}3uGBh&- zjcI5F5^xYAx@^^^_hw9TsrQ%8dRP;@eAcEVU9Ys*UawlQL?St7fL=62#sl*%ga2FrzDp-c zrIy?=P7IMWr^3FwGEnd(_S+@;V)n<^7kvWTVvQZ?5!fDU>_9*(HtxkMf`9UMFU}FX zVa`RyID~gD@*v*1D45WyMa?@GJEm><3d8&h4PRfZmAr9dlz16GSMw!4pQ-tA;${3y z%|Gz@T+L59&7
+ Редактировать + placeholder="Название конференции"/>
+ Редактировать + placeholder="URL адрес"/>
+ Редактировать
- + +
+
+ + + Редактировать + Удалить +
+ +
-
- +
@@ -52,9 +71,9 @@
- + - - +
@@ -62,22 +81,22 @@
-
-
+
+
Пользователь 1
-
+
очная
статья
-
-
+
+
Пользователь 2
-
+
заочная
@@ -89,7 +108,7 @@
- From f90d92b19d47743c011fc105cb46d4baf019d62b Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Mon, 11 Mar 2019 11:36:00 +0400 Subject: [PATCH 6/8] #54 add custom paper-list --- src/main/resources/public/css/conference.css | 39 ++++++++++++++++ .../resources/public/img/conference/paper.png | Bin 0 -> 597 bytes .../templates/conferences/conference.html | 42 +++++++++++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/public/img/conference/paper.png diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 3b867c6..e29ef9a 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -1,6 +1,13 @@ +.form-group textarea{ + min-height: 206px; + max-height: 463px; +} + + .deadline-list{ height: 200px; padding: 0px; + overflow-y: scroll; } .deadline{ @@ -14,12 +21,32 @@ .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; @@ -27,9 +54,21 @@ cursor: pointer; } +.icon-delete{ + background: #ff4444; +} + +.icon-paper{ + height: 26px; + width: 26px; + float: right; + margin: 5px; +} + .icon-edit-input-text{ width: 27px; height: 27px; + float: right; } .grey-border{ 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 0000000000000000000000000000000000000000..78a0dfc525d61f0611eeb7c768c248cf1bb15158 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z;^_M8K-LVNdpDhOFVsD*&j1=vkPm?-EeRN0|TS7r;B5V$MK_6_hvCUin#f^ zOcTv%X^HqPG3lC?ht=*0YOYez8-p(8eqvFK^+-$<4Ps%+bdpmDo#zZ{M4d+eOzH(@OR9Ze+sq01ZHC5hom2rM* z5%KG%R7_znWXurEW8gg`xf$=-rfdlsr_AIxpp77|D!6DgX=>y8?3>9Su zCVbjowW0pNdUiX>_Tqo@&7~rqf7e_8BlaKTBesIR7AqcL#4xCqxJHzuB$lLFB^RXv zDF!10LrYx)V_ieT5CbzSLrW_Y18oCCD+7c7OwFKJL1@U$PsvQH#I2z(-ns#(K@wy` saDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0uvp00i_>zopr04dzcJpcdz literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 599c745..e8b8935 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -19,8 +19,10 @@
+
+
Редактировать - Удалить
-
+
-
+
@@ -106,13 +109,40 @@
-
-
+ +
+ +
+
+
+ + Имя статьи + + +
+ Удалить +
+
+
+
+ + +
+ +
From 2fec35264c5491d49aa0f677d0fe7cde8e9fb340 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Mon, 11 Mar 2019 12:58:40 +0400 Subject: [PATCH 7/8] #54 add back link, css fixes --- src/main/resources/public/css/conference.css | 20 +++++++-- .../resources/public/img/conference/back.png | Bin 0 -> 307 bytes .../templates/conferences/conference.html | 40 +++++++++--------- 3 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 src/main/resources/public/img/conference/back.png diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index e29ef9a..38b12c4 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -1,3 +1,13 @@ +.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; @@ -55,7 +65,7 @@ } .icon-delete{ - background: #ff4444; + background-color: #f44; } .icon-paper{ @@ -73,9 +83,13 @@ .grey-border{ color: #495057; - background-color: #fff; background-clip: padding-box; border: 1px solid #ced4da; border-radius: .25rem; transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; -} \ No newline at end of file +} + +#add-paper{ + margin-left: 10px; +} + 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 0000000000000000000000000000000000000000..7667350d3643f051f4b4b3134515e3434643bcc8 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DU!E?GAr*{o&KNQ>FmN2+(D}^0 zD)3^rt3yzKNN$Mm8@b)b-)*c0Qzy5&vrBNe1WL5}w<>w4F5psBU}9xb+}h62qQJ0- ziGxuwSE;FCMFwN5LWcq;SAejb&UbTW`<0;i@wQkOgulcow-2q4}an( zK}GLQF>bq!b|*T|KQf8@w57IKSxtT4)Wjs`HU-r=r#4sqcMkBf5MR(H<}c=|N;J*(ln`Y68HM;d{lz~JfX=d#Wzp$Pyd Cw|1`p literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index e8b8935..7500f08 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -10,8 +10,12 @@
-
-

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

+
+ + + Назад к списку конференций + +

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

@@ -62,7 +66,7 @@
-
+
@@ -109,8 +113,8 @@
-
- @@ -131,7 +135,7 @@
-
+
- -
-
- - - Отмена - -
+ + + + + + + + + + +
From 5cb865eb70fb51cde2dd1c579fc38e4d7f21b677 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Mon, 11 Mar 2019 14:43:32 +0400 Subject: [PATCH 8/8] #54 deleted edit btn --- src/main/resources/public/css/conference.css | 11 +++---- .../templates/conferences/conference.html | 32 +++++++------------ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 38b12c4..06d8041 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -75,12 +75,6 @@ margin: 5px; } -.icon-edit-input-text{ - width: 27px; - height: 27px; - float: right; -} - .grey-border{ color: #495057; background-clip: padding-box; @@ -93,3 +87,8 @@ margin-left: 10px; } +#cancel-button{ + position: relative; + font-size: 1rem; +} + diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html index 7500f08..078e697 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -29,24 +29,18 @@
- Редактировать
- Редактировать
- Редактировать
@@ -58,8 +52,6 @@ - Редактировать Удалить
@@ -114,7 +106,7 @@
- @@ -149,17 +141,17 @@
- - - - - - - - - - - +
+ + + Отмена + +