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; margin: 5px;
} }
.small-icon {
width: 16px;
}
/* --------------------------------------------------- /* ---------------------------------------------------
FEEDBACK STYLE FEEDBACK STYLE
----------------------------------------------------- */ ----------------------------------------------------- */

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

@ -3,7 +3,7 @@ $(document).ready(function () {
$(".grant-row").mouseenter(function (event) { $(".grant-row").mouseenter(function (event) {
var grantRow = $(event.target).closest(".grant-row"); var grantRow = $(event.target).closest(".grant-row");
$(grantRow).css("background-color", "#f8f9fa"); $(grantRow).css("background-color", "#f8f9fa");
$(grantRow).find(".remove-paper").removeClass("d-none"); $(grantRow).find(".remove-grant").removeClass("d-none");
}); });
$(".grant-row").mouseleave(function (event) { $(".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)"/> title=${paper.title}, small=true)"/>
</span> </span>
<input class="id-class" type="hidden" th:value="${grant.id}"/> <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="Удалить грант?"> data-confirm="Удалить грант?">
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</a> </a>

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

@ -2,9 +2,7 @@
<html lang="en" <html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" 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"> 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"/> <link rel="stylesheet" href="../css/grant.css"/>
</head>
<body> <body>
<div class="container" layout:fragment="content"> <div class="container" layout:fragment="content">
@ -214,7 +212,8 @@
type="submit"> type="submit">
Сохранить Сохранить
</button> </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> </button>
</div> </div>
@ -242,6 +241,7 @@
}); });
$('.selectpicker').selectpicker(); $('.selectpicker').selectpicker();
}); });
/*]]>*/ /*]]>*/
function addNewFile(fileDto) { function addNewFile(fileDto) {
var fileNumber = $("#files-list div.row").length; var fileNumber = $("#files-list div.row").length;

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

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

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

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

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

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