#103 merge with 44

src/main/resources/templates/conferences/conference.html

@@ -156,14 +156,16 @@
                                             <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}, small=false)"/>
                                                 <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}, small=false)"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>

src/main/resources/templates/grants/fragments/grantLineFragment.html

@@ -14,6 +14,10 @@
                   th:title="${grant.title}"/>
             <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}, 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}}"
            data-confirm="Удалить грант?">

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>

src/main/resources/templates/grants/grant.html

@@ -191,6 +191,7 @@
                                         </div>
                                     </div>
                                 </div>
+                                <!--
                                 <div class="form-group">
                                     <div th:if="*{project} == null">
                                         <input type="submit" name="createProject" class="btn btn-primary"
@@ -198,6 +199,7 @@
                                     </div>
                                     <input type = "hidden" th:field="*{project.id}"/>
                                 </div>
+                                -->
                             </div>
                             <div class="clearfix"></div>
                             <div class="col-lg-12">

src/main/resources/templates/papers/fragments/paperDashboardFragment.html

@@ -7,7 +7,8 @@
 <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}, small=false)"/>
         </div>
         <div class="col col-10 text-right">
             <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" class="externalLink"

src/main/resources/templates/papers/fragments/paperLineFragment.html

@@ -6,8 +6,8 @@
 <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})"/>
-        <a th:href="@{'paper?id='+${paper.id}}">
+        <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)"/>
+        <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}"

src/main/resources/templates/papers/fragments/paperStatusFragment.html

@@ -4,34 +4,35 @@
     <meta charset="UTF-8"/>
 </head>
 <body>
-<span th:fragment="paperStatus (paperStatus)" 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 fa-stack-2x 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 fa-stack-2x 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 fa-stack-2x 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 fa-stack-2x 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 fa-stack-2x 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 fa-stack-2x 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 fa-stack-2x 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"></i>
+    <i class="fa fa-file-text-o fa-stack-1x fa-inverse" th:title="${title}"></i>
 </span>
 </body>
 </html>