From 6e14860c340e0220b231671a9de1a5de82a39c7d Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Thu, 20 Dec 2018 23:30:25 +0400 Subject: [PATCH] fix paper status template --- src/main/resources/public/css/agency.css | 18 +++++++-- .../resources/templates/papers/dashboard.html | 2 +- .../fragments/paperDashboardFragment.html | 26 +------------ .../papers/fragments/paperLineFragment.html | 26 +------------ .../papers/fragments/paperStatusFragment.html | 37 +++++++++++++++++++ .../resources/templates/papers/papers.html | 12 ++---- 6 files changed, 61 insertions(+), 60 deletions(-) create mode 100644 src/main/resources/templates/papers/fragments/paperStatusFragment.html diff --git a/src/main/resources/public/css/agency.css b/src/main/resources/public/css/agency.css index 91f7593..5bfd18b 100644 --- a/src/main/resources/public/css/agency.css +++ b/src/main/resources/public/css/agency.css @@ -20,15 +20,27 @@ a:hover { } .text-primary { - color: #29c0ff !important; + color: #228bba !important; } .text-warning { - color: red !important; + color: #940000 !important; +} + +.text-review { + color: #94028d !important; } .text-success { - color: #00fe8e !important; + color: #007741 !important; +} + +.text-accepted { + color: #fec503 !important; +} + +.text-not-accepted { + color: #A38831 !important; } .text-failed { diff --git a/src/main/resources/templates/papers/dashboard.html b/src/main/resources/templates/papers/dashboard.html index 37eb62a..b7849f7 100644 --- a/src/main/resources/templates/papers/dashboard.html +++ b/src/main/resources/templates/papers/dashboard.html @@ -15,7 +15,7 @@
-
+
diff --git a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html index edbcd30..122696e 100644 --- a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html +++ b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html @@ -4,32 +4,10 @@ -
+
- - -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- - - +
title diff --git a/src/main/resources/templates/papers/fragments/paperLineFragment.html b/src/main/resources/templates/papers/fragments/paperLineFragment.html index bb66aab..423d09a 100644 --- a/src/main/resources/templates/papers/fragments/paperLineFragment.html +++ b/src/main/resources/templates/papers/fragments/paperLineFragment.html @@ -4,31 +4,9 @@ -
+
- - -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- - - + diff --git a/src/main/resources/templates/papers/fragments/paperStatusFragment.html b/src/main/resources/templates/papers/fragments/paperStatusFragment.html new file mode 100644 index 0000000..321370a --- /dev/null +++ b/src/main/resources/templates/papers/fragments/paperStatusFragment.html @@ -0,0 +1,37 @@ + + + + + + + + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html index e88b413..a797d26 100644 --- a/src/main/resources/templates/papers/papers.html +++ b/src/main/resources/templates/papers/papers.html @@ -20,7 +20,7 @@
-
+
@@ -28,12 +28,13 @@
Фильтр:
-