Merge branch '8-' into 'master'

Resolve "Добавить дедлайны" Closes #8 See merge request romanov73/ng-tracker!8
6 years ago · ed2554216d
parent 5c0de4bcf4 75c33bb065
commit ed2554216d
2 changed files with 9 additions and 1 deletions
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@ -93,4 +93,4 @@
 <script src="/js/core.js"></script>

 </body>
-</html>
+</html>
--- 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,12 @@
                                    <label for="comment">Комментарий:</label>
                                    <textarea class="form-control" rows="5" id="comment"></textarea>
                                </div>
+
+                                <div class="form-group">
+                                    <label>Дедлайн:</label>
+                                    <input type="date" class="form-control" name="deadline"/>
+                                </div>
+
                                <div class="form-check">
                                    <input type="checkbox" class="form-check-input" id="locked"/>
                                    <label class="form-check-label" for="locked">Заблокирована</label>