#64 style fixes
This commit is contained in:
parent
8f2f6adc3b
commit
7eb5dce94e
@ -68,15 +68,7 @@ public class ConferenceController {
|
||||
}
|
||||
|
||||
@PostMapping(value = "/conferences", params = "deleteConference")
|
||||
public String delete(@Valid ConferenceFilterDto conferenceFilterDto,
|
||||
@RequestParam("deleteConference") Integer conferenceId,
|
||||
Errors errors,
|
||||
ModelMap modelMap) throws IOException {
|
||||
if (true) {
|
||||
errors.reject("relationExist", "Статья прикреплена к конференции");
|
||||
filterConferences(conferenceFilterDto, modelMap);
|
||||
return CONFERENCES_PAGE;
|
||||
}
|
||||
public String delete(@RequestParam("deleteConference") Integer conferenceId) throws IOException {
|
||||
conferenceService.delete(conferenceId);
|
||||
return String.format(REDIRECT_TO, CONFERENCES_PAGE);
|
||||
}
|
||||
|
@ -19,6 +19,12 @@ body {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.conference-row .d-flex .text-decoration:nth-child(1) {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.conference-row .d-flex {
|
||||
margin: 0 15px;
|
||||
}
|
||||
@ -121,14 +127,14 @@ body {
|
||||
}
|
||||
|
||||
.icon-delete {
|
||||
background-color: #f44;
|
||||
background-color: #ff7272;
|
||||
background-image: url(/img/conference/delete.png);
|
||||
background-repeat: round;
|
||||
color: transparent !important;
|
||||
}
|
||||
|
||||
.icon-delete:hover {
|
||||
background-color: #ff2929;
|
||||
background-color: #ff0000;
|
||||
transition: background-color .15s ease-in-out;
|
||||
}
|
||||
|
||||
|
@ -20,13 +20,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<hr/>
|
||||
|
||||
|
||||
<div class="alert alert-danger" th:if="${#fields.hasErrors('*')}">
|
||||
<p th:each="err : ${#fields.errors('*')}" th:text="${err}"></p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9 col-sm-12">
|
||||
<th:block th:each="conference : *{conferences}">
|
||||
|
Loading…
Reference in New Issue
Block a user