From c612e35ad9f8dd80a17af9ad18f4f3f45f260600 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Sun, 12 May 2019 23:27:19 +0400
Subject: [PATCH 1/8] #44 add check for papers

---
 .../templates/grants/fragments/grantLineFragment.html     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/resources/templates/grants/fragments/grantLineFragment.html b/src/main/resources/templates/grants/fragments/grantLineFragment.html
index dda0e8d..9d1e396 100644
--- a/src/main/resources/templates/grants/fragments/grantLineFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantLineFragment.html
@@ -11,6 +11,14 @@
             <span class="h6" th:text="${grant.title}"/>
             <span class="text-muted" th:text="${grant.authorsString}"/>
         </a>
+        <a th:each="paper, rowStat : *{grant.papers}">
+            <span th:if="${paper.status.name() == 'COMPLETED'}">
+                <i class="fa fa-circle" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+            </span>
+            <span th:unless="${paper.status.name() == 'COMPLETED'}">
+                <i class="fa fa-circle-o" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+            </span>
+        </a>
         <input class="id-class" type="hidden" th:value="${grant.id}"/>
         <a class="remove-paper  pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
            data-confirm="Удалить грант?">
-- 
2.25.1


From 395cf57cc1e7a5c58d0c86c66b6feb4355b7c75a Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Mon, 13 May 2019 16:29:33 +0400
Subject: [PATCH 2/8] #44 finish with papers

---
 .../grants/fragments/grantLineFragment.html   | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/grants/fragments/grantLineFragment.html b/src/main/resources/templates/grants/fragments/grantLineFragment.html
index 9d1e396..35f5152 100644
--- a/src/main/resources/templates/grants/fragments/grantLineFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantLineFragment.html
@@ -11,14 +11,32 @@
             <span class="h6" th:text="${grant.title}"/>
             <span class="text-muted" th:text="${grant.authorsString}"/>
         </a>
-        <a th:each="paper, rowStat : *{grant.papers}">
-            <span th:if="${paper.status.name() == 'COMPLETED'}">
-                <i class="fa fa-circle" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-            </span>
-            <span th:unless="${paper.status.name() == 'COMPLETED'}">
-                <i class="fa fa-circle-o" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-            </span>
-        </a>
+        <span th:each="paper, rowStat : *{grant.papers}">
+            <th:block th:switch="${paper.status.name()}">
+                <span th:case="'ATTENTION'">
+                    <i class="fa fa-circle text-warning" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+                </span>
+                <span th:case="'DRAFT'">
+                    <i class="fa fa-circle text-draft" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+                </span>
+                <span th:case="'ON_PREPARATION'">
+                    <i class="fa fa-circle text-primary" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+                </span>
+                <span th:case="'ON_REVIEW'">
+                    <i class="fa fa-circle text-review" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+                </span>
+                <span th:case="'ACCEPTED'">
+                    <i class="fa fa-circle text-success" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+                </span>
+                <span th:case="'NOT_ACCEPTED'">
+                    <i class="fa fa-circle text-not-accepted" aria-hidden="true"
+                       th:title="'Статья: ' + ${paper.title}"></i>
+                </span>
+                <span th:case="'FAILED'">
+                    <i class="fa fa-circle text-failed" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
+                </span>
+            </th:block>
+        </span>
         <input class="id-class" type="hidden" th:value="${grant.id}"/>
         <a class="remove-paper  pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
            data-confirm="Удалить грант?">
-- 
2.25.1


From 72923312b73aca732e235e34783c957b6d495342 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 14 May 2019 23:42:49 +0400
Subject: [PATCH 3/8] #44 add title to paper status fragment

---
 .../templates/papers/fragments/paperDashboardFragment.html  | 2 +-
 .../templates/papers/fragments/paperLineFragment.html       | 2 +-
 .../templates/papers/fragments/paperStatusFragment.html     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
index d0ec0c5..a37c8d5 100644
--- a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
@@ -7,7 +7,7 @@
 <div th:fragment="paperDashboard (paper)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
     <div class="row">
         <div class="col-2">
-            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/>
+            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
         </div>
         <div class="col col-10 text-right">
             <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" th:href="${paper.url}"><i
diff --git a/src/main/resources/templates/papers/fragments/paperLineFragment.html b/src/main/resources/templates/papers/fragments/paperLineFragment.html
index b703859..c1c9683 100644
--- a/src/main/resources/templates/papers/fragments/paperLineFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperLineFragment.html
@@ -6,7 +6,7 @@
 <body>
 <div th:fragment="paperLine (paper)" class="row text-left paper-row" style="background-color: white;">
     <div class="col">
-        <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/>
+        <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
         <a th:href="@{'paper?id='+${paper.id}}">
             <span class="h6" th:text="${paper.title}"/>
             <span class="text-muted" th:text="${paper.authorsString}"/>
diff --git a/src/main/resources/templates/papers/fragments/paperStatusFragment.html b/src/main/resources/templates/papers/fragments/paperStatusFragment.html
index 321370a..7026f4a 100644
--- a/src/main/resources/templates/papers/fragments/paperStatusFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperStatusFragment.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8"/>
 </head>
 <body>
-<span th:fragment="paperStatus (paperStatus)" class="fa-stack fa-1x">
+<span th:fragment="paperStatus (paperStatus, title)" class="fa-stack fa-1x">
     <th:block th:switch="${paperStatus.name()}">
         <div th:case="'ATTENTION'">
             <i class="fa fa-circle fa-stack-2x text-warning"></i>
@@ -30,8 +30,8 @@
         <div th:case="'NOT_ACCEPTED'">
             <i class="fa fa-circle fa-stack-2x text-not-accepted"></i>
         </div>
-        </th:block>
-    <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+    </th:block>
+    <i class="fa fa-file-text-o fa-stack-1x fa-inverse" th:title="${title}"></i>
 </span>
 </body>
 </html>
\ No newline at end of file
-- 
2.25.1


From 8747ac1619e72d027a7d50027112e5034e1e1afe Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 14 May 2019 23:44:00 +0400
Subject: [PATCH 4/8] #44 change icon for grant

---
 .../templates/grants/fragments/grantStatusFragment.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/grants/fragments/grantStatusFragment.html b/src/main/resources/templates/grants/fragments/grantStatusFragment.html
index 569f5ee..bf866d2 100644
--- a/src/main/resources/templates/grants/fragments/grantStatusFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantStatusFragment.html
@@ -25,7 +25,7 @@
             <i class="fa fa-circle fa-stack-2x text-failed"></i>
         </div>
         </th:block>
-    <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+    <i class="fa fa-clipboard fa-stack-1x fa-inverse"></i>
 </span>
 </body>
 </html>
\ No newline at end of file
-- 
2.25.1


From 8c13adb4aa831ec43905e5ee6519c32fd6e20ff0 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 14 May 2019 23:46:15 +0400
Subject: [PATCH 5/8] #44 replace paper status fragment

---
 .../grants/fragments/grantLineFragment.html   | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/main/resources/templates/grants/fragments/grantLineFragment.html b/src/main/resources/templates/grants/fragments/grantLineFragment.html
index 35f5152..c311b43 100644
--- a/src/main/resources/templates/grants/fragments/grantLineFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantLineFragment.html
@@ -12,30 +12,7 @@
             <span class="text-muted" th:text="${grant.authorsString}"/>
         </a>
         <span th:each="paper, rowStat : *{grant.papers}">
-            <th:block th:switch="${paper.status.name()}">
-                <span th:case="'ATTENTION'">
-                    <i class="fa fa-circle text-warning" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-                </span>
-                <span th:case="'DRAFT'">
-                    <i class="fa fa-circle text-draft" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-                </span>
-                <span th:case="'ON_PREPARATION'">
-                    <i class="fa fa-circle text-primary" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-                </span>
-                <span th:case="'ON_REVIEW'">
-                    <i class="fa fa-circle text-review" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-                </span>
-                <span th:case="'ACCEPTED'">
-                    <i class="fa fa-circle text-success" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-                </span>
-                <span th:case="'NOT_ACCEPTED'">
-                    <i class="fa fa-circle text-not-accepted" aria-hidden="true"
-                       th:title="'Статья: ' + ${paper.title}"></i>
-                </span>
-                <span th:case="'FAILED'">
-                    <i class="fa fa-circle text-failed" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
-                </span>
-            </th:block>
+            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
         </span>
         <input class="id-class" type="hidden" th:value="${grant.id}"/>
         <a class="remove-paper  pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
-- 
2.25.1


From 9ca8d15b8f7c01c528023d5756269ddc7ee9b4f3 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 14 May 2019 23:55:08 +0400
Subject: [PATCH 6/8] #44 update fragment in conference

---
 src/main/resources/templates/conferences/conference.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index d5906b6..c2fd6ed 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -143,14 +143,14 @@
                                             <a class="paper-name"
                                                th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}"
                                                th:if="*{papers[__${rowStat.index}__].id !=null}">
-                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status})"/>
+                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status}, title=*{papers[__${rowStat.index}__].title})"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>
                                             </a>
                                             <a class="paper-name"
                                                th:unless="*{papers[__${rowStat.index}__].id !=null}">
-                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status})"/>
+                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status, title=*{papers[__${rowStat.index}__].title}})"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>
-- 
2.25.1


From 1d19472f82f3376bb0f0f944451aa7d74a698d0c Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 16 May 2019 07:59:25 +0400
Subject: [PATCH 7/8] #44 small icons

---
 .../grants/fragments/grantLineFragment.html    |  2 +-
 .../papers/fragments/paperLineFragment.html    |  2 +-
 .../papers/fragments/paperStatusFragment.html  | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/grants/fragments/grantLineFragment.html b/src/main/resources/templates/grants/fragments/grantLineFragment.html
index c311b43..4b350c0 100644
--- a/src/main/resources/templates/grants/fragments/grantLineFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantLineFragment.html
@@ -12,7 +12,7 @@
             <span class="text-muted" th:text="${grant.authorsString}"/>
         </a>
         <span th:each="paper, rowStat : *{grant.papers}">
-            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
+            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=true)"/>
         </span>
         <input class="id-class" type="hidden" th:value="${grant.id}"/>
         <a class="remove-paper  pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
diff --git a/src/main/resources/templates/papers/fragments/paperLineFragment.html b/src/main/resources/templates/papers/fragments/paperLineFragment.html
index c1c9683..a2a650f 100644
--- a/src/main/resources/templates/papers/fragments/paperLineFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperLineFragment.html
@@ -6,7 +6,7 @@
 <body>
 <div th:fragment="paperLine (paper)" class="row text-left paper-row" style="background-color: white;">
     <div class="col">
-        <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
+        <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)"/>
         <a th:href="@{'paper?id='+${paper.id}}">
             <span class="h6" th:text="${paper.title}"/>
             <span class="text-muted" th:text="${paper.authorsString}"/>
diff --git a/src/main/resources/templates/papers/fragments/paperStatusFragment.html b/src/main/resources/templates/papers/fragments/paperStatusFragment.html
index 7026f4a..14f8fba 100644
--- a/src/main/resources/templates/papers/fragments/paperStatusFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperStatusFragment.html
@@ -4,31 +4,31 @@
     <meta charset="UTF-8"/>
 </head>
 <body>
-<span th:fragment="paperStatus (paperStatus, title)" class="fa-stack fa-1x">
+<span th:fragment="paperStatus (paperStatus, title, small)" class="fa-stack fa-1x">
     <th:block th:switch="${paperStatus.name()}">
         <div th:case="'ATTENTION'">
-            <i class="fa fa-circle fa-stack-2x text-warning"></i>
+            <i class="fa fa-circle text-warning" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'DRAFT'">
-            <i class="fa fa-circle fa-stack-2x text-draft"></i>
+            <i class="fa fa-circle text-draft" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'ON_PREPARATION'">
-            <i class="fa fa-circle fa-stack-2x text-primary"></i>
+            <i class="fa fa-circle text-primary" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'ON_REVIEW'">
-            <i class="fa fa-circle fa-stack-2x text-review"></i>
+            <i class="fa fa-circle text-review" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'COMPLETED'">
-            <i class="fa fa-circle fa-stack-2x text-success"></i>
+            <i class="fa fa-circle text-success" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'FAILED'">
-            <i class="fa fa-circle fa-stack-2x text-failed"></i>
+            <i class="fa fa-circle text-failed" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'ACCEPTED'">
-            <i class="fa fa-circle fa-stack-2x text-accepted"></i>
+            <i class="fa fa-circle text-accepted" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'NOT_ACCEPTED'">
-            <i class="fa fa-circle fa-stack-2x text-not-accepted"></i>
+            <i class="fa fa-circle text-not-accepted" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
     </th:block>
     <i class="fa fa-file-text-o fa-stack-1x fa-inverse" th:title="${title}"></i>
-- 
2.25.1


From 8b263e7e0f53117e09ac1fe114355b562e8ab2f6 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Wed, 5 Jun 2019 11:52:54 +0400
Subject: [PATCH 8/8] #44 fix link to papers

---
 .../resources/templates/papers/fragments/paperLineFragment.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/papers/fragments/paperLineFragment.html b/src/main/resources/templates/papers/fragments/paperLineFragment.html
index ec3282d..95b7179 100644
--- a/src/main/resources/templates/papers/fragments/paperLineFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperLineFragment.html
@@ -7,7 +7,7 @@
 <div th:fragment="paperLine (paper)" class="row text-left paper-row" style="background-color: white;">
     <div class="col">
         <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
-        <a th:href="@{'paper?id='+${paper.id}}">
+        <a th:href="@{'../papers/paper?id='+${paper.id}}">
             <span class="h6" th:if="${#strings.length(paper.title)} > 50"
                   th:text="${#strings.substring(paper.title, 0, 50) + '...'}" th:title="${paper.title}"/>
             <span class="h6" th:if="${#strings.length(paper.title) le 50}" th:text="${paper.title}"
-- 
2.25.1