From ec1e3ff052a230023421685bfdc95688b7964c23 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Tue, 18 Dec 2018 19:40:23 +0400
Subject: [PATCH] fix scripts

---
 src/main/resources/public/css/agency.css      |  2 +-
 src/main/resources/public/js/papers.js        | 65 +++++++++++--------
 .../resources/templates/grants/grant.html     |  1 -
 .../resources/templates/papers/dashboard.html |  8 ---
 .../resources/templates/papers/paper.html     |  5 +-
 .../resources/templates/papers/papers.html    | 41 ------------
 6 files changed, 40 insertions(+), 82 deletions(-)

diff --git a/src/main/resources/public/css/agency.css b/src/main/resources/public/css/agency.css
index 35e526b..91f7593 100644
--- a/src/main/resources/public/css/agency.css
+++ b/src/main/resources/public/css/agency.css
@@ -50,7 +50,7 @@ section {
 }
 
 section h2.section-heading {
-  font-size: 3vw;
+  font-size: 3.5vw;
   margin-top: 0;
   margin-bottom: 15px;
 }
diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index c8982df..78d3120 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -1,33 +1,42 @@
-function deletePaper() {
-    $("#remove-paper-modal").modal('show');
+/*<![CDATA[*/
+$(document).ready(function () {
+    $(".paper-row").mouseenter(function (event) {
+        var paperRow = $(event.target).closest(".paper-row");
+        $(paperRow).css("background-color", "#f8f9fa");
+        $(paperRow).find(".remove-paper").removeClass("d-none");
 
-    $("#modal-btn-yes").on("click", function () {
-        return true;
+    });
+    $(".paper-row").mouseleave(function (event) {
+        var paperRow = $(event.target).closest(".paper-row");
+        $(paperRow).css("background-color", "white");
+        $(paperRow).closest(".paper-row").find(".remove-paper").addClass("d-none");
     });
 
-    $("#modal-btn-no").on("click", function () {
-        $("#remove-paper-modal").modal('hide');
-    });
-    return false;
-}
+    $('a[data-confirm]').click(function(ev) {
+        var href = $(this).attr('href');
+        if (!$('#dataConfirmModal').length) {
+            $('#modalDelete').append('<div class="modal fade" id="dataConfirmModal"  tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true"\n' +
+                '             >\n' +
+                '            <div class="modal-dialog modal-sm">\n' +
+                '                <div class="modal-content">\n' +
+                '                    <div class="modal-header">\n' +
+                '                        <h8 class="modal-title" id="myModalLabel">Удалить статью?</h8>\n' +
+                '                        <button type="button" class="close" data-dismiss="modal" aria-label="Закрыть"><span\n' +
+                '                                aria-hidden="true">&times;</span></button>\n' +
+                '                    </div>\n' +
 
-function showPaperDashboard(dashboardElement) {
-    getFromRest(urlPapers, function (paperList) {
-        paperList.forEach(function (paper, index) {
-            $(dashboardElement).append("<div class=\"col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card\">" +
-                "<div class=\"row\">" +
-                "<div class=\"col-2\">" +
-                "<span class=\"fa-stack fa-1x\">" +
-                "<i class=\"fa fa-circle fa-stack-2x " + getPaperStatusClass(paper.status) + "\"></i>" +
-                "<i class=\"fa fa-file-text-o fa-stack-1x fa-inverse\"></i>" +
-                "</span>" +
-                "</div>" +
-                "<div class=\"col col-10 text-right\">" +
-                "<h7 class=\"service-heading\">" + paper.title + "</h7>" +
-                "<p class=\"text-muted\">" + paper.authorsString + "</p>" +
-                "</div>" +
-                "</div>" +
-                "</div>");
-        });
+                '                    <div class="modal-footer">\n' +
+                '                       <a class="btn btn-primary" id="dataConfirmOK">Да</a>'+
+                '                       <button class="btn primary" data-dismiss="modal" aria-hidden="true">Нет</button>'+
+                '                    </div>\n' +
+                '                </div>\n' +
+                '            </div>\n' +
+                '        </div>');
+        }
+        $('#dataConfirmModal').find('#myModalLabel').text($(this).attr('data-confirm'));
+        $('#dataConfirmOK').attr('href', href);
+        $('#dataConfirmModal').modal({show:true});
+        return false;
     });
-}
\ No newline at end of file
+});
+/*]]>*/
\ No newline at end of file
diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html
index a77b856..2f74adb 100644
--- a/src/main/resources/templates/grants/grant.html
+++ b/src/main/resources/templates/grants/grant.html
@@ -175,7 +175,6 @@
         </div>
     </section>
     <script type="text/javascript" src="/js/file-loader.js"></script>
-    <script src="/js/papers.js"></script>
     <script>
         /*<![CDATA[*/
         $(document).ready(function () {
diff --git a/src/main/resources/templates/papers/dashboard.html b/src/main/resources/templates/papers/dashboard.html
index 45457d5..37eb62a 100644
--- a/src/main/resources/templates/papers/dashboard.html
+++ b/src/main/resources/templates/papers/dashboard.html
@@ -7,7 +7,6 @@
 <body>
 
 <div class="container" layout:fragment="content">
-    <!-- Services -->
     <section id="services">
         <div class="container">
             <div class="col-lg-12 text-center">
@@ -21,13 +20,6 @@
             </div>
         </div>
     </section>
-    <script src="/js/papers.js"></script>
-    <script>
-        $(document).ready(function () {
-            showPaperDashboard("#dashboard");
-        });
-    </script>
 </div>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index 0b6957e..811e522 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -57,11 +57,11 @@
                                             <input type="date" class="form-control" name="deadline"
                                                    th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                         </div>
-                                        <div class="col-5">
+                                        <div class="col-4">
                                             <input class="form-control" type="text" placeholder="Описание"
                                                    th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                         </div>
-                                        <div class="col-1">
+                                        <div class="col-2">
                                             <a class="btn btn-danger float-right"
                                                th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');
                                                 $('#deadlines${rowStat.index}\\.date').val('');
@@ -138,7 +138,6 @@
         </div>
     </section>
     <script type="text/javascript" src="/js/file-loader.js"></script>
-    <script src="/js/papers.js"></script>
     <script>
         /*<![CDATA[*/
         $(document).ready(function () {
diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html
index e401f23..856f02e 100644
--- a/src/main/resources/templates/papers/papers.html
+++ b/src/main/resources/templates/papers/papers.html
@@ -47,48 +47,7 @@
     <script src="/js/papers.js"></script>
 
     <script type="text/javascript">
-        /*<![CDATA[*/
-        $(document).ready(function () {
-            $(".paper-row").mouseenter(function (event) {
-                var paperRow = $(event.target).closest(".paper-row");
-                $(paperRow).css("background-color", "#f8f9fa");
-                $(paperRow).find(".remove-paper").removeClass("d-none");
 
-            });
-            $(".paper-row").mouseleave(function (event) {
-                var paperRow = $(event.target).closest(".paper-row");
-                $(paperRow).css("background-color", "white");
-                $(paperRow).closest(".paper-row").find(".remove-paper").addClass("d-none");
-            });
-
-            $('a[data-confirm]').click(function(ev) {
-                var href = $(this).attr('href');
-                if (!$('#dataConfirmModal').length) {
-                    $('#modalDelete').append('<div class="modal fade" id="dataConfirmModal"  tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true"\n' +
-                        '             >\n' +
-                        '            <div class="modal-dialog modal-sm">\n' +
-                        '                <div class="modal-content">\n' +
-                        '                    <div class="modal-header">\n' +
-                        '                        <h8 class="modal-title" id="myModalLabel">Удалить статью?</h8>\n' +
-                        '                        <button type="button" class="close" data-dismiss="modal" aria-label="Закрыть"><span\n' +
-                        '                                aria-hidden="true">&times;</span></button>\n' +
-                        '                    </div>\n' +
-
-                        '                    <div class="modal-footer">\n' +
-                        '                       <a class="btn btn-primary" id="dataConfirmOK">Да</a>'+
-                        '                       <button class="btn primary" data-dismiss="modal" aria-hidden="true">Нет</button>'+
-                        '                    </div>\n' +
-                        '                </div>\n' +
-                        '            </div>\n' +
-                        '        </div>');
-                }
-                $('#dataConfirmModal').find('#myModalLabel').text($(this).attr('data-confirm'));
-                $('#dataConfirmOK').attr('href', href);
-                $('#dataConfirmModal').modal({show:true});
-                return false;
-            });
-        });
-        /*]]>*/
     </script>
 
 </div>