diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java index 8560f43..a143e3b 100644 --- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java +++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java @@ -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); } diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index e4243b1..452f8dd 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -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; } diff --git a/src/main/resources/templates/conferences/conferences.html b/src/main/resources/templates/conferences/conferences.html index 5f3f127..1c2d64e 100644 --- a/src/main/resources/templates/conferences/conferences.html +++ b/src/main/resources/templates/conferences/conferences.html @@ -20,13 +20,9 @@