romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

Resolve "Ping конференции в списке конференций" #196

Merged
VladimirZarayskiy merged 44 commits from 68-ping-conf into dev 2019-04-25 14:00:36 +04:00
Conversation 13 Commits 44 Files Changed 54 +3 -7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9da227ab34 - Show all commits

7
src/main/resources/templates/students/dashboard.html
View File

@ -14,10 +14,9 @@
</div> </div>
<hr/> <hr/>
<div class="row justify-content-center" id="dashboard"> <div class="row justify-content-center" id="dashboard">
<div th:replace="students/fragments/taskDashboardFragment"/> <th:block th:each="task : ${tasks}">
<!--<th:block th:each="task : ${tasks}">--> <div th:replace="students/fragments/taskDashboardFragment :: taskDashboard(task=${task})"/>
<!--<div th:replace="students/fragments/taskDashboardFragment :: taskDashboard(task=${task})"/>--> </th:block>
<!--</th:block>-->
</div> </div>
</div> </div>
</section> </section>

3
src/main/resources/templates/students/fragments/taskStatusFragment.html
View File

@ -6,9 +6,6 @@
<body> <body>
<span th:fragment="taskStatus (taskStatus)" class="fa-stack fa-1x"> <span th:fragment="taskStatus (taskStatus)" class="fa-stack fa-1x">
<th:block th:switch="${taskStatus.name()}"> <th:block th:switch="${taskStatus.name()}">
<!--<div th:case="'ATTENTION'">-->
<!--<i class="fa fa-circle fa-stack-2x text-warning"></i>-->
<!--</div>-->
<div th:case="'IN_WORK'"> <div th:case="'IN_WORK'">
<i class="fa fa-circle fa-stack-2x text-primary"></i> <i class="fa fa-circle fa-stack-2x text-primary"></i>
</div> </div>