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

Resolve "Список периодических событий" #129

Merged
romanov73 merged 57 commits from 4-show-time-line into master 2018-10-30 23:32:01 +04:00
Conversation 18 Commits 57 Files Changed 121 +34 -5
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd6b82f892 - Show all commits

19
src/main/resources/templates/default.html
View File

@ -11,8 +11,11 @@
<title>NG-Tacker</title> <title>NG-Tacker</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link rel="stylesheet" href="/webjars/bootstrap/4.1.0/css/bootstrap.min.css"/> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"/>
<link rel="stylesheet" href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"/>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker-standalone.css" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker-standalone.min.css" />
<!-- Custom fonts for this template --> <!-- Custom fonts for this template -->
<link rel="stylesheet" type="text/css" href="/css/google/montserrat.css"/> <link rel="stylesheet" type="text/css" href="/css/google/montserrat.css"/>
@ -23,11 +26,17 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link rel="stylesheet" href="/css/agency.css"/> <link rel="stylesheet" href="/css/agency.css"/>
<!-- Bootstrap core JavaScript --> <!-- Bootstrap core JavaScript -->
<script src="/webjars/jquery/3.3.1-1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
<script src="/webjars/bootstrap/4.1.0/js/bootstrap.bundle.min.js"></script> <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/locale/ru.js"></script>-->
<script src="https://momentjs.com/downloads/moment.js"></script>
<script src="https://momentjs.com/downloads/moment-with-locales.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.bundle.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
<!-- Plugin JavaScript --> <!-- Plugin JavaScript -->
<script src="/webjars/jquery.easing/1.4.1/jquery.easing.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.js"></script>
</head> </head>

20
src/main/resources/templates/papers/paper.html
View File

@ -2,7 +2,9 @@
<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"> layout:decorator="default">
<!--<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap-datetimepicker.min.css" />-->
<head> <head>
</head> </head>
<body> <body>
@ -45,6 +47,17 @@
<label for="comment">Комментарий:</label> <label for="comment">Комментарий:</label>
<textarea class="form-control" rows="5" id="comment"></textarea> <textarea class="form-control" rows="5" id="comment"></textarea>
</div> </div>
<div class="form-group">
<div class="input-group date" id="datepicker1">
<input type="text" class="form-control" />
<div class="input-group-addon">
<span class="glyphicon glyphicon-th"></span>
</div>
</div>
</div>
<div class="form-check"> <div class="form-check">
<input type="checkbox" class="form-check-input" id="locked"/> <input type="checkbox" class="form-check-input" id="locked"/>
<label class="form-check-label" for="locked">Заблокирована</label> <label class="form-check-label" for="locked">Заблокирована</label>
@ -85,6 +98,13 @@
</section> </section>
<script type="text/javascript" src="/js/file-loader.js"></script> <script type="text/javascript" src="/js/file-loader.js"></script>
<script src="/js/papers.js"></script> <script src="/js/papers.js"></script>
<script>
$('.datepicker1').datepicker({
format: 'mm/dd/yyyy',
startDate: '-3d'
});
</script>
<script> <script>
/*<![CDATA[*/ /*<![CDATA[*/
$(document).ready(function () { $(document).ready(function () {