#42 merge with dev

pull/171/head
T-Midnight 5 years ago
parent 416ad7eeda
commit 958a0d461b

@ -1,7 +1,7 @@
<!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">
layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
<head>
</head>
@ -19,7 +19,8 @@
</div>
<div class="row">
<div class="col-lg-12">
<form id="project-form" method="post" th:action="@{'/projects/project?id='+ *{id == null ? '' : id} + ''}"
<form id="project-form" method="post"
th:action="@{'/projects/project?id='+ *{id == null ? '' : id} + ''}"
th:object="${projectDto}">
<div class="row">
<div class="col-md-6 col-sm-12">
@ -55,7 +56,7 @@
<input type="submit" id="createGrant" name="createGrant" class="btn btn-primary"
value="Добавить грант"/>
</div>
<input type = "hidden" th:field="*{grant.id}"/>
<input type="hidden" th:field="*{grant.id}"/>
</div>
<div class="form-group">
@ -88,7 +89,8 @@
class="alert alert-danger">Incorrect title</p>
</div>
<div class="form-group">
<input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary" value="Добавить
<input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
value="Добавить
дедлайн"/>
</div>
@ -107,7 +109,8 @@
type="submit">
Сохранить
</button>
<button id="cancelButton" class="btn btn-default text-uppercase" href="/projects/projects">
<button id="cancelButton" class="btn btn-default text-uppercase"
href="/projects/projects">
Отмена
</button>
</div>
@ -135,6 +138,7 @@
$('.selectpicker').selectpicker();
});
/*]]>*/
</script>
</div>
</body>

Loading…
Cancel
Save