#71 adding pages and layout
This commit is contained in:
ASH
parent
3169551968
commit
bd975c53f3
@ -14,6 +14,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
|
|||||||
registry.addViewController("/papers/{articlename:\\w+}");
|
registry.addViewController("/papers/{articlename:\\w+}");
|
||||||
registry.addViewController("/grants/{articlename:\\w+}");
|
registry.addViewController("/grants/{articlename:\\w+}");
|
||||||
registry.addViewController("/conferences/{articlename:\\w+}");
|
registry.addViewController("/conferences/{articlename:\\w+}");
|
||||||
|
registry.addViewController("/students/{articlename:\\w+}");
|
||||||
registry.addRedirectViewController("/", "/index");
|
registry.addRedirectViewController("/", "/index");
|
||||||
registry.addRedirectViewController("/default", "/index");
|
registry.addRedirectViewController("/default", "/index");
|
||||||
}
|
}
|
||||||
|
|||||||
24
src/main/resources/public/css/tasks.css
Normal file
24
src/main/resources/public/css/tasks.css
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
.bootstrap-tagsinput{
|
||||||
|
|
||||||
|
width: 100%;
|
||||||
|
padding: .375rem .75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bootstrap-tagsinput .label{
|
||||||
|
|
||||||
|
display: inline;
|
||||||
|
padding: .2em .6em .3em;
|
||||||
|
font-size: 75%;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 2.5;
|
||||||
|
color: #fff;
|
||||||
|
text-align: center;
|
||||||
|
white-space: nowrap;
|
||||||
|
vertical-align: baseline;
|
||||||
|
border-radius: .25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bootstrap-tagsinput .label-info{
|
||||||
|
|
||||||
|
background-color: orange;
|
||||||
|
}
|
||||||
0
src/main/resources/public/js/tasks.js
Normal file
0
src/main/resources/public/js/tasks.js
Normal file
@ -88,7 +88,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 col-sm-6 portfolio-item">
|
<div class="col-md-4 col-sm-6 portfolio-item">
|
||||||
<a class="portfolio-link" data-toggle="modal" href="/students">
|
<a class="portfolio-link" href="./students/tasks">
|
||||||
<div class="portfolio-hover">
|
<div class="portfolio-hover">
|
||||||
<div class="portfolio-hover-content">
|
<div class="portfolio-hover-content">
|
||||||
<i class="fa fa-arrow-right fa-3x"></i>
|
<i class="fa fa-arrow-right fa-3x"></i>
|
||||||
|
|||||||
24
src/main/resources/templates/students/dashboard.html
Normal file
24
src/main/resources/templates/students/dashboard.html
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en"
|
||||||
|
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||||
|
layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml">
|
||||||
|
<head>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="container" layout:fragment="content">
|
||||||
|
<section id="services">
|
||||||
|
<div class="container">
|
||||||
|
<div class="col-lg-12 text-center">
|
||||||
|
<h2 class="section-heading text-uppercase">Работа со студентами</h2>
|
||||||
|
<div th:replace="students/fragments/taskNavigationFragment"/>
|
||||||
|
</div>
|
||||||
|
<div class="row justify-content-center" id="dashboard">
|
||||||
|
<!--<th:block th:each="task : ${tasks}">-->
|
||||||
|
<!--<div th:replace="students/fragments/taskDashboardFragment :: taskDashboard(task=${task})"/>-->
|
||||||
|
<!--</th:block>-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
<!DOCTYPE HTML>
|
||||||
|
<html xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<head th:fragment="headerfiles">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="row justify-content-center">
|
||||||
|
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
|
||||||
|
<a href="./tasks" class="btn btn-light toolbar-button"><i class="fa fa-list-alt"></i>
|
||||||
|
Список</a>
|
||||||
|
</div>
|
||||||
|
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
|
||||||
|
<a href="" class="btn btn-light toolbar-button"><i class="fa fa-newspaper-o"
|
||||||
|
aria-hidden="true"></i> Панель
|
||||||
|
управления</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
|
||||||
|
<a href="./task" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle"
|
||||||
|
aria-hidden="true"></i>
|
||||||
|
Добавить задачу</a>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
91
src/main/resources/templates/students/task.html
Normal file
91
src/main/resources/templates/students/task.html
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en"
|
||||||
|
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||||
|
layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
|
||||||
|
<head>
|
||||||
|
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.css"/>
|
||||||
|
<link rel="stylesheet" href="../css/tasks.css"/>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<div class="container" layout:fragment="content">
|
||||||
|
|
||||||
|
<section id="paper">
|
||||||
|
<div class="container">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-12 text-center">
|
||||||
|
<h2 class="section-heading text-uppercase">Редактирование задачи</h2>
|
||||||
|
<div th:replace="students/fragments/taskNavigationFragment"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-12">
|
||||||
|
<form id="task-form" method="post">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 col-sm-12">
|
||||||
|
<input type="hidden" name="id"/>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="title">Название:</label>
|
||||||
|
<input class="form-control" id="title" type="text" placeholder="Название задачи"/>
|
||||||
|
<p class="help-block text-danger"></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="status">Статус:</label>
|
||||||
|
<select class="form-control" id="status">
|
||||||
|
<option>Status</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="comment">Описание задачи:</label>
|
||||||
|
<textarea class="form-control" rows="3" id="comment"></textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="tags">Теги:</label>
|
||||||
|
<input class="form-control" data-role="tagsinput" placeholder="Теги задачи" id="tags"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Дедлайны задачи:</label>
|
||||||
|
<div class="row">
|
||||||
|
<input type="hidden" />
|
||||||
|
<div class="col-6">
|
||||||
|
<input type="date" class="form-control" name="deadline"/>
|
||||||
|
</div>
|
||||||
|
<div class="col-4">
|
||||||
|
<input class="form-control" type="text" placeholder="Описание"/>
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<a class="btn btn-danger float-right"><span
|
||||||
|
aria-hidden="true"><i class="fa fa-times"/></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary" value="Добавить
|
||||||
|
дедлайн"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="clearfix"></div>
|
||||||
|
<div class="form-group">
|
||||||
|
<button id="sendMessageButton" name="save" class="btn btn-success text-uppercase"
|
||||||
|
type="submit">
|
||||||
|
Сохранить
|
||||||
|
</button>
|
||||||
|
<button id="cancelButton" class="btn btn-default text-uppercase" href="/students/tasks">Отмена
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.min.js"></script>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
36
src/main/resources/templates/students/tasks.html
Normal file
36
src/main/resources/templates/students/tasks.html
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||||
|
layout:decorator="default" xmlns:th="">
|
||||||
|
<head>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div class="container" layout:fragment="content">
|
||||||
|
<form id="tasks-form" method="post" th:action="@{'/tasks/tasks'}">
|
||||||
|
<input th:type="hidden" name="taskDeleteId" id="taskDeleteId"/>
|
||||||
|
<section id="tasks">
|
||||||
|
<div class="container">
|
||||||
|
<div class="row" id="task-list">
|
||||||
|
<div class="col-lg-12 text-center">
|
||||||
|
<h2 class="section-heading text-uppercase">Работа со студентами</h2>
|
||||||
|
<div th:replace="students/fragments/taskNavigationFragment"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-9 col-sm-12">
|
||||||
|
<!--<th:block th:each="task : ${tasks}">-->
|
||||||
|
<!--<div th:replace="tasks/fragments/grantLineFragment :: taskLine(task=${task})"/>-->
|
||||||
|
<!--</th:block>-->
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3 col-sm-12">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<div id="modalDelete"/>
|
||||||
|
</form>
|
||||||
|
<script src="/js/tasks.js"></script>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Loading…
Reference in New Issue
Block a user