From bff824bc0603f4939cb162b6c876ede5302133a7 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Sun, 24 Mar 2019 12:46:15 +0400 Subject: [PATCH] #53 added control panel --- src/main/resources/public/css/conference.css | 15 ++++------ .../templates/conferences/actual.html | 10 +++++++ .../templates/conferences/conference.html | 7 ++--- .../templates/conferences/conferences.html | 4 ++- .../fragments/confNavigationFragment.html | 29 +++++++++++++++++++ 5 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/templates/conferences/actual.html create mode 100644 src/main/resources/templates/conferences/fragments/confNavigationFragment.html diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 77cda8b..60ed029 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -2,7 +2,7 @@ margin-bottom: 10px; } -.dashboard button{ +.dashboard button { margin-left: 10px; height: 41px; } @@ -77,28 +77,23 @@ background-color: #ccc; cursor: pointer; } + .conference-item:hover .form-check:hover .circle { background: #ffdc64; } +.control-panel { + height: 50px; +} -.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; diff --git a/src/main/resources/templates/conferences/actual.html b/src/main/resources/templates/conferences/actual.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/src/main/resources/templates/conferences/actual.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ 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 078e697..0f2cf66 100644 --- a/src/main/resources/templates/conferences/conference.html +++ b/src/main/resources/templates/conferences/conference.html @@ -1,7 +1,7 @@ + layout:decorator="default" xmlns:th=""> @@ -11,11 +11,8 @@
- - - Назад к списку конференций -

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

+
diff --git a/src/main/resources/templates/conferences/conferences.html b/src/main/resources/templates/conferences/conferences.html index 962605e..4c83f4a 100644 --- a/src/main/resources/templates/conferences/conferences.html +++ b/src/main/resources/templates/conferences/conferences.html @@ -1,7 +1,7 @@ + layout:decorator="default" xmlns:th=""> @@ -13,9 +13,11 @@

Список конференций

+
+
diff --git a/src/main/resources/templates/conferences/fragments/confNavigationFragment.html b/src/main/resources/templates/conferences/fragments/confNavigationFragment.html new file mode 100644 index 0000000..31cc00f --- /dev/null +++ b/src/main/resources/templates/conferences/fragments/confNavigationFragment.html @@ -0,0 +1,29 @@ + + + + + + +
+ +
+ + + Весь список +
+ +
+ + + Актуальное +
+ +
+ + + Добавить конференцию +
+ +
+ + \ No newline at end of file