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 +22 -4
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fe55890518 - Show all commits

21
src/main/resources/public/css/conference.css
View File

@ -3,7 +3,7 @@ body {
} }
.conference-row .d-flex:hover { .conference-row .d-flex:hover {
background-color: #f3f3f3; background-color: #f1f1f1;
border-radius: .25rem; border-radius: .25rem;
} }
@ -71,13 +71,17 @@ body {
padding: 0.5rem 1.75em 0.5rem 0.5em; padding: 0.5rem 1.75em 0.5rem 0.5em;
display: inline-block; display: inline-block;
background: transparent url("https://cdn3.iconfinder.com/data/icons/faticons/32/arrow-down-01-16.png") no-repeat right 7px center; background: transparent url("https://cdn3.iconfinder.com/data/icons/faticons/32/arrow-down-01-16.png") no-repeat right 7px center;
cursor: pointer;
} }
.member select:nth-child(4) { .member select:nth-child(4) {
border-right: 1px solid #ced4da; border-right: 1px solid #ced4da;
} }
.member select:hover {
background-color: #f1f1f1;
}
.member-name { .member-name {
padding: .75rem 1.25rem; padding: .75rem 1.25rem;
@ -114,11 +118,22 @@ body {
flex: 1; flex: 1;
} }
.paper-name:hover {
background-color: #f1f1f1;
}
.paper-name span { .paper-name span {
margin: 6px 15px; margin: 7px 10px;
display: inline-block; display: inline-block;
} }
.paper-name span:nth-child(1) {
margin: 3px 0px 3px 10px;
float: left;
}
.icon { .icon {
width: 38px; width: 38px;
height: 38px; height: 38px;

5
src/main/resources/templates/conferences/conference.html
View File

@ -136,13 +136,16 @@
th:each="paper, rowStat : *{papers}"> th:each="paper, rowStat : *{papers}">
<input type="hidden" th:field="*{papers[__${rowStat.index}__].id}"/> <input type="hidden" th:field="*{papers[__${rowStat.index}__].id}"/>
<input type="hidden" th:field="*{papers[__${rowStat.index}__].title}"/> <input type="hidden" th:field="*{papers[__${rowStat.index}__].title}"/>
<input type="hidden" th:field="*{papers[__${rowStat.index}__].status}"/>
<a class="paper-name" <a class="paper-name"
th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}" th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}"
th:if="*{papers[__${rowStat.index}__].id !=null}"> th:if="*{papers[__${rowStat.index}__].id !=null}">
<span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status})"/>
<span th:text="*{papers[__${rowStat.index}__].title}"> <span th:text="*{papers[__${rowStat.index}__].title}">
Имя статьи Имя статьи
</span> </span>
<img class="icon-paper" src="/img/conference/paper.png"/>
<!--<img class="icon-paper" src="/img/conference/paper.png"/>-->
</a> </a>
<a class="paper-name" <a class="paper-name"
th:unless="*{papers[__${rowStat.index}__].id !=null}"> th:unless="*{papers[__${rowStat.index}__].id !=null}">