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

fix grant indicators

Browse Source
This commit is contained in:
Anton Romanov 2019-06-13 14:48:02 +04:00
parent ff19001f1f
commit db97892af2
7 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/public/css/agency.css
View File

@ -782,6 +782,10 @@ ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons l
margin: 5px;
}
.small-icon {
width: 16px;
}
/* ---------------------------------------------------
FEEDBACK STYLE
----------------------------------------------------- */

2
src/main/resources/public/js/grants.js
View File

@ -3,7 +3,7 @@ $(document).ready(function () {
$(".grant-row").mouseenter(function (event) {
var grantRow = $(event.target).closest(".grant-row");
$(grantRow).css("background-color", "#f8f9fa");
$(grantRow).find(".remove-paper").removeClass("d-none");
$(grantRow).find(".remove-grant").removeClass("d-none");
});
$(".grant-row").mouseleave(function (event) {

2
src/main/resources/templates/grants/fragments/grantLineFragment.html
View File

@ -19,7 +19,7 @@
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}}"
<a class="remove-grant pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
data-confirm="Удалить грант?">
<i class="fa fa-trash" aria-hidden="true"></i>
</a>

10
src/main/resources/templates/grants/grant.html
View File

@ -1,10 +1,8 @@
<!DOCTYPE html>
<html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
<head>
<link rel="stylesheet" href="../css/grant.css"/>
</head>
layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
<link rel="stylesheet" href="../css/grant.css"/>
<body>
<div class="container" layout:fragment="content">
@ -214,7 +212,8 @@
type="submit">
Сохранить
</button>
<button id="cancelButton" class="btn btn-default text-uppercase" href="/grants/grants">
<button id="cancelButton" class="btn btn-default text-uppercase"
href="/grants/grants">
Отмена
</button>
</div>
@ -242,6 +241,7 @@
});
$('.selectpicker').selectpicker();
});
/*]]>*/
function addNewFile(fileDto) {
var fileNumber = $("#files-list div.row").length;

4
src/main/resources/templates/papers/fragments/paperStatusFragment.html
View File

@ -4,8 +4,8 @@
<meta charset="UTF-8"/>
</head>
<body>
<span th:fragment="paperStatus (paperStatus, title, small)" class="fa-stack fa-1x">
<th:block th:switch="${paperStatus.name()}" >
<span th:fragment="paperStatus (paperStatus, title, small)" class="fa-stack fa-1x" th:classappend="${small} ? small-icon : big-icon">
<th:block th:switch="${paperStatus.name()}">
<div th:case="'ATTENTION'">
<i class="fa fa-circle text-warning" th:classappend="${small} ? fa-stack-1x : fa-stack-2x" th:title="${title}"></i>
</div>

6
src/main/resources/templates/users/changePassword.html
View File

@ -1,9 +1,5 @@
<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org">
<head th:fragment="headerfiles">
<meta charset="UTF-8"/>
<script type='text/javascript' src="js/users.js"></script>
</head>
<html>
<body>
<div id="changePasswordModal" class="modal fade text-center">
<div class="modal-dialog">

7
src/main/resources/templates/users/inviteModal.html
View File

@ -1,10 +1,5 @@
<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org">
<head th:fragment="headerfiles">
<meta charset="UTF-8"/>
<script src="js/users.js"></script>
<script src="js/core.js"></script>
</head>
<html>
<body>
<div id="inviteModal" class="modal fade text-center">
<div class="modal-dialog">