Merge branch 'master' into 23-dashboard

# Conflicts: # src/main/resources/templates/papers.html
6 years ago · e4e37454ed
parent a93a19bcfe 5f4e63b96f
commit e4e37454ed
2 changed files with 48 additions and 0 deletions
--- a/src/main/resources/templates/myPaper.html
+++ b/src/main/resources/templates/myPaper.html
@ -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>
--- a/src/main/resources/templates/papers.html
+++ b/src/main/resources/templates/papers.html
@ -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>