From 879f388e663272c1cce1bdf526a1655be0f4d19a Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 27 Sep 2018 10:03:00 +0400
Subject: [PATCH] Merge branch 'master' into 3-ui

# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
---
 src/main/resources/templates/default.html | 13 ++++++-------
 src/main/resources/templates/papers.html  | 12 +++++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index 9d51b5d..b7fb7da 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -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>
 
diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html
index f38cc10..a31200f 100644
--- a/src/main/resources/templates/papers.html
+++ b/src/main/resources/templates/papers.html
@@ -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>