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

Merge branch 'master' into 3-ui

Browse Source 
# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
This commit is contained in:
Anton Romanov 2018-09-27 10:03:00 +04:00
parent 948305e4d9
commit 879f388e66
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,12 @@
<!-- Custom styles for this template -->
<link rel="stylesheet" href="/css/agency.css"/>
<!-- Bootstrap core JavaScript -->
<script src="/webjars/jquery/3.3.1-1/jquery.js"></script>
<script src="/webjars/bootstrap/4.1.0/js/bootstrap.bundle.js"></script>
<!-- Plugin JavaScript -->
<script src="/webjars/jquery.easing/1.4.1/jquery.easing.js"></script>
</head>
@ -77,13 +83,6 @@
</div>
</footer>
<!-- Bootstrap core JavaScript -->
<script src="/webjars/jquery/3.3.1-1/jquery.js"></script>
<script src="/webjars/bootstrap/4.1.0/js/bootstrap.bundle.js"></script>
<!-- Plugin JavaScript -->
<script src="/webjars/jquery.easing/1.4.1/jquery.easing.js"></script>
<!-- Custom scripts for this template -->
<script src="js/agency.js"></script>

12
src/main/resources/templates/papers.html
View File

@ -12,8 +12,8 @@
<div class="row" id="paper-list">
<div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Статьи</h2>
<a href = "./AlyonaTest"><h5>Перейти на тестовую страницу Алёны</h5></a>
<a href ="./myPaper"><h4>Ссылка на пустую страницу</h4></a>
<a href="./AlyonaTest"><h5>Перейти на тестовую страницу Алёны</h5></a>
<a href="./myPaper"><h4>Ссылка на пустую страницу</h4></a>
</div>
</div>
</div>
@ -22,9 +22,11 @@
<script src="js/core.js"></script>
<script src="js/papers.js"></script>
<script>
showPapers($("#paper-list"));
// only for demo
//addPaper("название", "DRAFT", "comment", false);
$( document ).ready(function() {
showPapers($("#paper-list"));
// only for demo
//addPaper("название", "DRAFT", "comment", false);
});
</script>
</div>
</body>