From cd6b82f892ab8ffacb79a5c509523a30a0b2a299 Mon Sep 17 00:00:00 2001
From: Alyona <alyona.krebs@yandex.ru>
Date: Thu, 25 Oct 2018 08:41:37 +0400
Subject: [PATCH 1/3] partially add deadline

---
 src/main/resources/templates/default.html     | 19 +++++++++++++-----
 .../resources/templates/papers/paper.html     | 20 +++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index 54763d6..c0401c5 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -11,8 +11,11 @@
     <title>NG-Tacker</title>
 
     <!-- Bootstrap core CSS -->
-    <link rel="stylesheet" href="/webjars/bootstrap/4.1.0/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"/>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker-standalone.css" />
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker-standalone.min.css" />
+
 
     <!-- Custom fonts for this template -->
     <link rel="stylesheet" type="text/css" href="/css/google/montserrat.css"/>
@@ -23,11 +26,17 @@
     <!-- Custom styles for this template -->
     <link rel="stylesheet" href="/css/agency.css"/>
     <!-- Bootstrap core JavaScript -->
-    <script src="/webjars/jquery/3.3.1-1/jquery.min.js"></script>
-    <script src="/webjars/bootstrap/4.1.0/js/bootstrap.bundle.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+   <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/locale/ru.js"></script>-->
+    <script src="https://momentjs.com/downloads/moment.js"></script>
+    <script src="https://momentjs.com/downloads/moment-with-locales.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.bundle.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
+
 
     <!-- Plugin JavaScript -->
-    <script src="/webjars/jquery.easing/1.4.1/jquery.easing.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.js"></script>
 
 </head>
 
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index 587c9aa..40aae91 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -2,7 +2,9 @@
 <html lang="en"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="default">
+<!--<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap-datetimepicker.min.css" />-->
 <head>
+
 </head>
 <body>
 
@@ -45,6 +47,17 @@
                                     <label for="comment">Комментарий:</label>
                                     <textarea class="form-control" rows="5" id="comment"></textarea>
                                 </div>
+
+                                <div class="form-group">
+
+                                    <div class="input-group date" id="datepicker1">
+                                        <input type="text" class="form-control" />
+                                        <div class="input-group-addon">
+                                            <span class="glyphicon glyphicon-th"></span>
+                                        </div>
+                                    </div>
+                                </div>
+
                                 <div class="form-check">
                                     <input type="checkbox" class="form-check-input" id="locked"/>
                                     <label class="form-check-label" for="locked">Заблокирована</label>
@@ -85,6 +98,13 @@
     </section>
     <script type="text/javascript" src="/js/file-loader.js"></script>
     <script src="/js/papers.js"></script>
+    <script>
+        $('.datepicker1').datepicker({
+    format: 'mm/dd/yyyy',
+    startDate: '-3d'
+});
+
+    </script>
     <script>
         /*<![CDATA[*/
         $(document).ready(function () {

From 4f49e7ae32d0812b93511d114758fbfbd49b35a3 Mon Sep 17 00:00:00 2001
From: Alyona <alyona.krebs@yandex.ru>
Date: Thu, 25 Oct 2018 08:53:29 +0400
Subject: [PATCH 2/3] finish deadline

---
 src/main/resources/templates/papers/paper.html | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index bc9b506..fdd5190 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -49,13 +49,8 @@
                                 </div>
 
                                 <div class="form-group">
-
-                                    <div class="input-group date" id="datepicker1">
-                                        <input type="text" class="form-control" />
-                                        <div class="input-group-addon">
-                                            <span class="glyphicon glyphicon-th"></span>
-                                        </div>
-                                    </div>
+                                    <label>Дедлайн:</label>
+                                    <input type="date" class="form-control" name="deadline"/>
                                 </div>
 
                                 <div class="form-check">
@@ -171,13 +166,6 @@
     </section>
     <script type="text/javascript" src="/js/file-loader.js"></script>
     <script src="/js/papers.js"></script>
-    <script>
-        $('.datepicker1').datepicker({
-    format: 'mm/dd/yyyy',
-    startDate: '-3d'
-});
-
-    </script>
     <script>
         /*<![CDATA[*/
         $(document).ready(function () {

From 75c33bb065239f74d5f647937fd902c2e83fe1a7 Mon Sep 17 00:00:00 2001
From: Alyona <alyona.krebs@yandex.ru>
Date: Thu, 25 Oct 2018 08:53:48 +0400
Subject: [PATCH 3/3] finish deadline

---
 src/main/resources/templates/default.html | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index c0401c5..33884bf 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -11,11 +11,8 @@
     <title>NG-Tacker</title>
 
     <!-- Bootstrap core CSS -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"/>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker-standalone.css" />
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker-standalone.min.css" />
-
+    <link rel="stylesheet" href="/webjars/bootstrap/4.1.0/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
 
     <!-- Custom fonts for this template -->
     <link rel="stylesheet" type="text/css" href="/css/google/montserrat.css"/>
@@ -26,17 +23,11 @@
     <!-- Custom styles for this template -->
     <link rel="stylesheet" href="/css/agency.css"/>
     <!-- Bootstrap core JavaScript -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
-   <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/locale/ru.js"></script>-->
-    <script src="https://momentjs.com/downloads/moment.js"></script>
-    <script src="https://momentjs.com/downloads/moment-with-locales.js"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.bundle.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
-
+    <script src="/webjars/jquery/3.3.1-1/jquery.min.js"></script>
+    <script src="/webjars/bootstrap/4.1.0/js/bootstrap.bundle.min.js"></script>
 
     <!-- Plugin JavaScript -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.js"></script>
+    <script src="/webjars/jquery.easing/1.4.1/jquery.easing.js"></script>
 
 </head>
 
@@ -102,4 +93,4 @@
 <script src="/js/core.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
