diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java index bbe0885..14e6337 100644 --- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java @@ -11,6 +11,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter { public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/{articlename:\\w+}"); //registry.addViewController("/admin/{articlename:\\w+}"); + registry.addViewController("/papers/{articlename:\\w+}"); registry.addRedirectViewController("/", "/index"); registry.addRedirectViewController("/default", "/index"); } diff --git a/src/main/resources/public/css/agency.css b/src/main/resources/public/css/agency.css index 43f29c0..b978b4b 100644 --- a/src/main/resources/public/css/agency.css +++ b/src/main/resources/public/css/agency.css @@ -704,3 +704,12 @@ ul.social-buttons li a { ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons li a:hover { background-color: #fed136; } + +.dashboard-card { + background: #ffffff none repeat scroll 0 0; + margin: 15px; + padding: 20px; + border: 0 solid #e7e7e7; + border-radius: 5px; + box-shadow: 0 5px 20px rgba(0, 0, 0, 0.05); +} \ No newline at end of file diff --git a/src/main/resources/templates/AlyonaTest.html b/src/main/resources/templates/AlyonaTest.html deleted file mode 100644 index 6350a2b..0000000 --- a/src/main/resources/templates/AlyonaTest.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - -
-
-
-
-
-

Тестовая страница

-
-
-
-
- - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index b7fb7da..6754c32 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -84,7 +84,7 @@ - + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 94bb3de..fe62bbc 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -18,7 +18,7 @@
- +
diff --git a/src/main/resources/templates/myPaper.html b/src/main/resources/templates/myPaper.html deleted file mode 100644 index d129d60..0000000 --- a/src/main/resources/templates/myPaper.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - -
-
-
-
-
-

Пустая страница

-
-
-
-
- - - - - - - - - - - - - - - - - -
- - - diff --git a/src/main/resources/templates/papers/dashboard.html b/src/main/resources/templates/papers/dashboard.html new file mode 100644 index 0000000..b4e18d7 --- /dev/null +++ b/src/main/resources/templates/papers/dashboard.html @@ -0,0 +1,152 @@ + + + + + + +
+ +
+
+
+
+

Dashboard

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ + + + +
+
+ Название статьи +

Список авторов И.О.

+
+
+
+
+
+
+ +
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/papers/myPaper.html b/src/main/resources/templates/papers/myPaper.html new file mode 100644 index 0000000..14fc771 --- /dev/null +++ b/src/main/resources/templates/papers/myPaper.html @@ -0,0 +1,22 @@ + + + + + + +
+
+
+
+
+

Пустая страница

+
+
+
+
+
+ + + diff --git a/src/main/resources/templates/paper.html b/src/main/resources/templates/papers/paper.html similarity index 100% rename from src/main/resources/templates/paper.html rename to src/main/resources/templates/papers/paper.html diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers/papers.html similarity index 80% rename from src/main/resources/templates/papers.html rename to src/main/resources/templates/papers/papers.html index a31200f..5a77e98 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers/papers.html @@ -12,15 +12,15 @@
- - + +