From 8d5a082a6b017a911482f4faaf8e0a82f68292e5 Mon Sep 17 00:00:00 2001
From: Tom Zhao <tom.zhao@dsv.su.se>
Date: Mon, 7 Apr 2025 13:31:14 +0200
Subject: [PATCH] 87: Move cancel link to same row as submit button
---
.../scipro/admin/pages/AdminSplitProjectPage.html | 11 ++++-------
.../scipro/admin/pages/AdminSplitProjectPage.java | 15 ++-------------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.html b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.html
index f49fc10ae1..f05d53317e 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.html
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.html
@@ -6,8 +6,6 @@
<div class="col-lg-5">
<h4 wicket:id="projectTitle"></h4>
- <p wicket:id="errorInfo"></p>
-
<form class="form-horizontal" wicket:id="splitProjectForm">
<p>This project will be split between following authors:</p>
@@ -16,12 +14,11 @@
<li wicket:id="author"></li>
</ul>
</div>
- <button class="btn btn-success" type="submit">Split Project</button>
- </form>
- <div class="mt-5">
- <a class="btn btn-success" wicket:id="cancelLink">Cancel</a>
- </div>
+ <button class="btn btn-success" type="submit">Split Project</button>
+
+ <a wicket:id="cancelLink">Cancel</a>
+ </form>
</div>
</div>
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.java
index 5ec65d6b52..4145fdd056 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSplitProjectPage.java
+++ b/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.ListView;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAdminProjectManagement;
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("errorInfo", Model.of("error Info!!")) {
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisibilityAllowed(false);
- }
- }
- );
-
add(new SplitProjectForm("splitProjectForm", dsModel));
-
- add(new BookmarkablePageLink<Void>("cancelLink", ProjectManagementPage.class));
}
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