From bd975c53f338cdd2d58d5179b9270b4c98d3cea9 Mon Sep 17 00:00:00 2001 From: ASH Date: Mon, 11 Mar 2019 22:46:51 +0400 Subject: [PATCH] #71 adding pages and layout --- .../ulstu/configuration/MvcConfiguration.java | 1 + src/main/resources/public/css/tasks.css | 24 +++++ src/main/resources/public/js/tasks.js | 0 src/main/resources/templates/index.html | 2 +- .../templates/students/dashboard.html | 24 +++++ .../fragments/taskNavigationFragment.html | 25 +++++ .../resources/templates/students/task.html | 91 +++++++++++++++++++ .../resources/templates/students/tasks.html | 36 ++++++++ 8 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/public/css/tasks.css create mode 100644 src/main/resources/public/js/tasks.js create mode 100644 src/main/resources/templates/students/dashboard.html create mode 100644 src/main/resources/templates/students/fragments/taskNavigationFragment.html create mode 100644 src/main/resources/templates/students/task.html create mode 100644 src/main/resources/templates/students/tasks.html diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java index 3e8d66f..81761d6 100644 --- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java @@ -14,6 +14,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter { registry.addViewController("/papers/{articlename:\\w+}"); registry.addViewController("/grants/{articlename:\\w+}"); registry.addViewController("/conferences/{articlename:\\w+}"); + registry.addViewController("/students/{articlename:\\w+}"); registry.addRedirectViewController("/", "/index"); registry.addRedirectViewController("/default", "/index"); } diff --git a/src/main/resources/public/css/tasks.css b/src/main/resources/public/css/tasks.css new file mode 100644 index 0000000..3b6f671 --- /dev/null +++ b/src/main/resources/public/css/tasks.css @@ -0,0 +1,24 @@ +.bootstrap-tagsinput{ + + width: 100%; + padding: .375rem .75rem; +} + +.bootstrap-tagsinput .label{ + + display: inline; + padding: .2em .6em .3em; + font-size: 75%; + font-weight: 700; + line-height: 2.5; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} + +.bootstrap-tagsinput .label-info{ + + background-color: orange; +} \ No newline at end of file diff --git a/src/main/resources/public/js/tasks.js b/src/main/resources/public/js/tasks.js new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 40a1281..2d86945 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -88,7 +88,7 @@
- +
diff --git a/src/main/resources/templates/students/dashboard.html b/src/main/resources/templates/students/dashboard.html new file mode 100644 index 0000000..d9f6e8a --- /dev/null +++ b/src/main/resources/templates/students/dashboard.html @@ -0,0 +1,24 @@ + + + + + +
+
+
+
+

Работа со студентами

+
+
+
+ + + +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/fragments/taskNavigationFragment.html b/src/main/resources/templates/students/fragments/taskNavigationFragment.html new file mode 100644 index 0000000..cf8a4cf --- /dev/null +++ b/src/main/resources/templates/students/fragments/taskNavigationFragment.html @@ -0,0 +1,25 @@ + + + + + +
+
+ + Список +
+
+ Панель + управления +
+ +
+ + Добавить задачу + +
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/task.html b/src/main/resources/templates/students/task.html new file mode 100644 index 0000000..b348078 --- /dev/null +++ b/src/main/resources/templates/students/task.html @@ -0,0 +1,91 @@ + + + + + + + + +
+ +
+
+
+
+

Редактирование задачи

+
+
+
+
+
+
+
+
+ +
+ + +

+
+ +
+ + +
+
+ + +
+ +
+ + +
+ + +
+ +
+ +
+ +
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+ + +
+
+
+ +
+
+
+
+ +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/tasks.html b/src/main/resources/templates/students/tasks.html new file mode 100644 index 0000000..5f370a0 --- /dev/null +++ b/src/main/resources/templates/students/tasks.html @@ -0,0 +1,36 @@ + + + + + + +
+
+ +
+
+
+
+

Работа со студентами

+
+
+
+
+
+ + + +
+
+
+
+
+
+ +
+ + +
+ + \ No newline at end of file