Skip to content

The Unified and Autonomous Development Platform

Implemented a working modal for ssh keys

Andrea Del Bene8b6efd9f1a43
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html
new file mode 100644
index 0000000000..73aa69b87d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html
@@ -0,0 +1,28 @@
+<wicket:panel>
+ <div class="confirm">
+ <form>
+ <div class="modal-header">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 class="modal-title">Add a ssh key</h4>
+ </div>
+ </div>
+ <div class="modal-body">
+ <div name="feedback"></div>
+
+ <div class="form-group">
+ <label>Key Name *</label>
+ <input class="form-control">
+ </div>
+ <div class="form-group">
+ <label>Value </label>
+ <textarea rows="10" class="form-control"></textarea>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <input type="submit" class="btn btn-primary" value="Add">
+ <button wicket:id="cancel" type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+ </div>
+ </form>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java
new file mode 100644
index 0000000000..ce634e8588
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java
@@ -0,0 +1,38 @@
+package io.onedev.server.web.page.my.sshkeys;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.panel.Panel;
+import io.onedev.server.web.component.modal.ModalPanel;
+
+@SuppressWarnings("serial")
+public class InsertSshKeyPanel extends Panel {
+
+ private ModalPanel modal;
+
+ public InsertSshKeyPanel(String id, ModalPanel modal) {
+ super(id);
+ this.modal = modal;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+ });
+
+ add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+ });
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
index 9c2faa12fe..e3568b69f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html
@@ -1,4 +1,4 @@
<wicket:extend>
- <div class="page-title">Change Password</div>
- <div wicket:id="content"></div>
+ <div class="page-title">Ssh Keys</div>
+ <div wicket:id="content">ciao</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
index a3afc50f6f..d034bcdee6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
@@ -1,9 +1,9 @@
package io.onedev.server.web.page.my.sshkeys;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.Component;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.model.User;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.my.MyPage;
@SuppressWarnings("serial")
@@ -17,14 +17,13 @@ public class MySshKeysPage extends MyPage {
protected void onInitialize() {
super.onInitialize();
- add(new Label("content", new AbstractReadOnlyModel<User>() {
-
- @Override
- public User getObject() {
- return getLoginUser();
- }
-
- }));
+ add(new ModalLink("content") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new InsertSshKeyPanel(id, modal);
+ }
+ });
}
}