DMC/scipro
7
0
Fork 0
Code Issues31 Pull Requests5 Actions Projects1 Releases Wiki Activity

87: Move cancel link to same row as submit button

Browse Source
This commit is contained in:
Tom Zhao 2025-04-07 13:31:14 +02:00
parent 3f604ad926
commit 8d5a082a6b
2 changed files with 6 additions and 20 deletions
view/src/main/java/se/su/dsv/scipro/admin/pages
AdminSplitProjectPage.htmlAdminSplitProjectPage.java

11
view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.html

@ -6,8 +6,6 @@
<div class="col-lg-5"> <div class="col-lg-5">
<h4 wicket:id="projectTitle"></h4> <h4 wicket:id="projectTitle"></h4>
<p wicket:id="errorInfo"></p>
<form class="form-horizontal" wicket:id="splitProjectForm"> <form class="form-horizontal" wicket:id="splitProjectForm">
<p>This project will be split between following authors:</p> <p>This project will be split between following authors:</p>
@ -16,12 +14,11 @@
<li wicket:id="author"></li> <li wicket:id="author"></li>
</ul> </ul>
</div> </div>
<button class="btn btn-success" type="submit">Split Project</button>
</form>
<div class="mt-5"> <button class="btn btn-success" type="submit">Split Project</button>
<a class="btn btn-success" wicket:id="cancelLink">Cancel</a> &nbsp;&nbsp;
</div> <a wicket:id="cancelLink">Cancel</a>
</form>
</div> </div>
</div> </div>

15
view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.java

@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel; import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.mapper.parameter.PageParameters;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAdminProjectManagement; import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAdminProjectManagement;
import se.su.dsv.scipro.data.DetachableServiceModel; import se.su.dsv.scipro.data.DetachableServiceModel;
@ -40,19 +39,7 @@ public class AdminSplitProjectPage extends AbstractAdminProjectPage implements M
add(new Label("projectTitle", dsModel.map(Project::getTitle))); add(new Label("projectTitle", dsModel.map(Project::getTitle)));
add(
new Label("errorInfo", Model.of("error Info!!")) {
@Override
protected void onConfigure() {
super.onConfigure();
setVisibilityAllowed(false);
}
}
);
add(new SplitProjectForm("splitProjectForm", dsModel)); add(new SplitProjectForm("splitProjectForm", dsModel));
add(new BookmarkablePageLink<Void>("cancelLink", ProjectManagementPage.class));
} }
private class SplitProjectForm extends Form<Project> { private class SplitProjectForm extends Form<Project> {
@ -67,6 +54,8 @@ public class AdminSplitProjectPage extends AbstractAdminProjectPage implements M
} }
} }
); );
add(new BookmarkablePageLink<Void>("cancelLink", ProjectManagementPage.class));
} }
@Override @Override