romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#68 ping but style

Browse Source
This commit is contained in:
Nightblade73 2019-04-24 21:52:13 +04:00
parent d4b514a9b0
commit 70d260c34b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/ulstu/conference/controller/ConferenceController.java
View File

@ -126,7 +126,7 @@ public class ConferenceController {
return CONFERENCE_PAGE; return CONFERENCE_PAGE;
} }
@PostMapping(value = "/conference", params = "ping") @PostMapping(value = "/conference", params = "pingConference")
public String ping(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException { public String ping(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
if (errors.hasErrors()) { if (errors.hasErrors()) {
return CONFERENCE_PAGE; return CONFERENCE_PAGE;

10
src/main/resources/public/css/conference.css
View File

@ -77,6 +77,16 @@ body {
border-right: 1px solid #ced4da; border-right: 1px solid #ced4da;
} }
#ping-button[disabled=disabled] {
background-color: #ced4da;
border-color: #c2c5c7;
}
#ping-button[disabled=disabled]:hover {
background-color: #737475 !important;
border-color: #5d5e5f !important;
}
#take-part[disabled=disabled] { #take-part[disabled=disabled] {
background-color: #ced4da; background-color: #ced4da;
border-color: #c2c5c7; border-color: #c2c5c7;

7
src/main/resources/templates/conferences/conference.html
View File

@ -122,9 +122,10 @@
</div> </div>
<div class="form-group d-flex justify-content-between flex-wrap"> <div class="form-group d-flex justify-content-between flex-wrap">
<input type="hidden" th:value="*{ping}" th:name="ping"/> <!--<input type="hidden" th:value="*{ping}" th:name="ping"/>-->
<input id="pingButton" class="btn btn-primary" <input id="ping-button" class="btn btn-primary"
type="submit" name="ping" value="Ping участникам"/> type="submit" name="pingConference" value="Ping участникам"
th:disabled="*{id == null ? 'true' : 'false'}"/>
<input type="hidden" th:value="*{disabledTakePart}" th:name="disabledTakePart"/> <input type="hidden" th:value="*{disabledTakePart}" th:name="disabledTakePart"/>
<input id="take-part" class="btn btn-primary" <input id="take-part" class="btn btn-primary"
type="submit" name="takePart" value="Принять участие" type="submit" name="takePart" value="Принять участие"