From 29f836fcc8963b95cb5cef117261732b25cba5ac Mon Sep 17 00:00:00 2001
From: Elena <emilyelison@mail.ru>
Date: Thu, 18 Oct 2018 10:38:04 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=20?=
 =?UTF-8?q?=E2=84=967?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/papers/paper.html     | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index 886b021..a4cf199 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -111,8 +111,23 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label>Дата публикации:</label>
+                                    <div class='input-group date' id='datetimepickerPublish'>
+                                        <input type='text' class="form-control" />
+                                        <span class="input-group-addon">
+                                            <span class="glyphicon glyphicon-calendar"></span>
+                                        </span>
+                                    </div>
+                                    <label>Последнее изменение:</label>
+                                    <div class='input-group date' id='datetimepickerUpdateDates'>
+                                        <input type='text' class="form-control" />
+                                        <span class="input-group-addon">
+                                            <span class="glyphicon glyphicon-calendar"></span>
+                                        </span>
+                                    </div>
+                                </div>
                             </div>
-
                             <div class="col-md-3 offset-md-3 col-sm-12 offset-sm-0">
                                 <div class="form-group">
                                     <button id="pingButton" class="btn btn-primary text-uppercase" type="button">
@@ -161,6 +176,23 @@
         });
         /*]]>*/
     </script>
+    <script type="text/javascript">
+        $(function () {
+        var current = moment();
+           $('#datetimepickerPublish').DateTimePicker({
+               locale: 'ru'
+            });
+         });
+    </script>
+    <script type="text/javascript">
+        $(function () {
+        var current = moment();
+           $('#datetimepickerUpdateDates').DateTimePicker({
+               locale: 'ru'
+            });
+          $('#datetimepickerUpdateDates').data("DateTimePicker").minDate(current).maxDate(current);
+         });
+    </script>
 </div>
 
 </body>

From 275348563d40c8f0fa4f653e737466c2880302eb Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 18 Oct 2018 11:21:26 +0400
Subject: [PATCH 2/2] use html5 datetime pickers

---
 .../resources/templates/papers/paper.html     | 67 +++++++------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index a4cf199..12ab2ce 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -55,12 +55,23 @@
 
                                     </div>
                                 </div>
-                                <p><a href="#myModal1" class="btn btn-primary" data-toggle="modal">Редактировать авторов статьи</a></p>
+                                <div class="form-group">
+                                    <label>Дата публикации:</label>
+                                    <input type="date" class="form-control" name="date-publish"/>
+                                </div>
+                                <div class="form-group">
+                                    <label>Последнее изменение:</label>
+                                    <input type="date" class="form-control" name="date-update"/>
+                                </div>
+                                <p><a href="#myModal1" class="btn btn-primary" data-toggle="modal">Редактировать авторов
+                                    статьи</a></p>
                                 <div id="myModal1" class="modal fade">
                                     <div class="modal-dialog">
                                         <div class="modal-content">
                                             <div class="modal-header">
-                                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                                                <button type="button" class="close" data-dismiss="modal"
+                                                        aria-hidden="true">×
+                                                </button>
                                                 <h4 class="modal-title">Авторы статьи</h4>
                                             </div>
                                             <div class="modal-body">
@@ -78,7 +89,8 @@
                                                         <td>Иван</td>
                                                         <td>Иванович</td>
                                                         <td>
-                                                            <span class="table-remove"><button type="button" class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
+                                                            <span class="table-remove"><button type="button"
+                                                                                               class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -86,14 +98,17 @@
                                                         <td>text</td>
                                                         <td>text</td>
                                                         <td>
-                                                            <span class="table-remove"><button type="button" class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
+                                                            <span class="table-remove"><button type="button"
+                                                                                               class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
                                                         </td>
 
                                                         <div class="dropdown">
-                                                            <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Выберите автора
+                                                            <button class="btn btn-primary dropdown-toggle"
+                                                                    type="button" data-toggle="dropdown">Выберите автора
                                                                 <span class="caret"></span></button>
                                                             <ul class="dropdown-menu">
-                                                                <input class="form-control" id="myInput" type="text" placeholder="Search.."/>
+                                                                <input class="form-control" id="myInput" type="text"
+                                                                       placeholder="Search.."/>
                                                                 <li><a href="#">Иванов</a></li>
                                                                 <li><a href="#">Смирнов</a></li>
                                                                 <li><a href="#">Кузнецов</a></li>
@@ -105,28 +120,15 @@
                                                 </table>
                                             </div>
                                             <div class="modal-footer">
-                                                <button type="button" class="btn btn-primary">Сохранить изменения</button>
-                                                <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>
+                                                <button type="button" class="btn btn-primary">Сохранить изменения
+                                                </button>
+                                                <button type="button" class="btn btn-default" data-dismiss="modal">
+                                                    Отмена
+                                                </button>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group">
-                                    <label>Дата публикации:</label>
-                                    <div class='input-group date' id='datetimepickerPublish'>
-                                        <input type='text' class="form-control" />
-                                        <span class="input-group-addon">
-                                            <span class="glyphicon glyphicon-calendar"></span>
-                                        </span>
-                                    </div>
-                                    <label>Последнее изменение:</label>
-                                    <div class='input-group date' id='datetimepickerUpdateDates'>
-                                        <input type='text' class="form-control" />
-                                        <span class="input-group-addon">
-                                            <span class="glyphicon glyphicon-calendar"></span>
-                                        </span>
-                                    </div>
-                                </div>
                             </div>
                             <div class="col-md-3 offset-md-3 col-sm-12 offset-sm-0">
                                 <div class="form-group">
@@ -176,23 +178,6 @@
         });
         /*]]>*/
     </script>
-    <script type="text/javascript">
-        $(function () {
-        var current = moment();
-           $('#datetimepickerPublish').DateTimePicker({
-               locale: 'ru'
-            });
-         });
-    </script>
-    <script type="text/javascript">
-        $(function () {
-        var current = moment();
-           $('#datetimepickerUpdateDates').DateTimePicker({
-               locale: 'ru'
-            });
-          $('#datetimepickerUpdateDates').data("DateTimePicker").minDate(current).maxDate(current);
-         });
-    </script>
 </div>
 
 </body>