diff --git a/src/main/resources/public/css/tasks.css b/src/main/resources/public/css/tasks.css index 3b6f671..2f42db5 100644 --- a/src/main/resources/public/css/tasks.css +++ b/src/main/resources/public/css/tasks.css @@ -21,4 +21,4 @@ .bootstrap-tagsinput .label-info{ background-color: orange; -} \ No newline at end of file +} diff --git a/src/main/resources/public/js/tasks.js b/src/main/resources/public/js/tasks.js index e69de29..6bf160c 100644 --- a/src/main/resources/public/js/tasks.js +++ b/src/main/resources/public/js/tasks.js @@ -0,0 +1,43 @@ +/*\n' + + ' \n' + + ' '); + } + $('#dataConfirmModal').find('#myModalLabel').text($(this).attr('data-confirm')); + $('#dataConfirmOK').attr('href', href); + $('#dataConfirmModal').modal({show:true}); + return false; + }); + +}); +/*]]>*/ \ No newline at end of file diff --git a/src/main/resources/templates/students/fragments/taskLineFragment.html b/src/main/resources/templates/students/fragments/taskLineFragment.html new file mode 100644 index 0000000..79ad5d7 --- /dev/null +++ b/src/main/resources/templates/students/fragments/taskLineFragment.html @@ -0,0 +1,22 @@ + + + + + + +
+
+ + + Первая хадач + Курсовая работа + + + + + +
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/fragments/taskStatusFragment.html b/src/main/resources/templates/students/fragments/taskStatusFragment.html new file mode 100644 index 0000000..9af7d50 --- /dev/null +++ b/src/main/resources/templates/students/fragments/taskStatusFragment.html @@ -0,0 +1,37 @@ + + + + + + + + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/task.html b/src/main/resources/templates/students/task.html index b348078..533c8f6 100644 --- a/src/main/resources/templates/students/task.html +++ b/src/main/resources/templates/students/task.html @@ -18,11 +18,12 @@
+
-
+
@@ -45,8 +46,6 @@
- -
@@ -68,17 +67,45 @@
-
-
+
+
+
+
+
Дата создания:
+
+
+ + + text + +
+
+
+
+
+
+
Дата изменения:
+
+
+ + + text + +
+
+
+
diff --git a/src/main/resources/templates/students/tasks.html b/src/main/resources/templates/students/tasks.html index 5f370a0..076f7ba 100644 --- a/src/main/resources/templates/students/tasks.html +++ b/src/main/resources/templates/students/tasks.html @@ -2,6 +2,7 @@ + @@ -16,13 +17,42 @@
+
- - - + +
+
+
+
Фильтр:
+ + + +