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

Merge branch 'master' into 23-dashboard

Browse Source 
# Conflicts:
#	src/main/resources/templates/papers.html
This commit is contained in:
Alyona 2018-09-26 16:11:19 +04:00
commit e4e37454ed
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/resources/templates/myPaper.html Normal file
View File

@ -0,0 +1,42 @@
<!DOCTYPE html>
<html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default">
<head>
</head>
<body>
<div class="container" layout:fragment="content">
<section id="papers">
<div class="container">
<div class="row" id="paper-list">
<div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Пустая страница</h2>
</div>
</div>
</div>
</section>
<!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Plugin JavaScript -->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Contact form JavaScript -->
<script src="js/jqBootstrapValidation.js"></script>
<script src="js/contact_me.js"></script>
<!-- Custom scripts for this template -->
<script src="js/agency.js"></script>
<script src="js/core.js"></script>
<script src="js/papers.js"></script>
<script>
showPapers($("#paper-list"));
</script>
</div>
</body>
</html>

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

@ -15,6 +15,12 @@
<a href = "./AlyonaTest"><h5>Перейти на тестовую страницу Алёны</h5></a>
</div>
</div>
<div class="row" id="paper-list1">
<div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Статьи</h2>
<a href ="./myPaper"><h4>Ссылка на пустую страницу</h4></a>
</div>
</div>
</div>
</section>