Skip to content

The Unified and Autonomous Development Platform

Minor UI improvements for SshKeysListPanel and better "no ssh key" message for ProjectInfoPanel

Andrea Del Bene4feb19a42270
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html
index 2345168608..8817b70855 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html
@@ -18,6 +18,13 @@
<td class="center-vertical"><span wicket:id="timestamp">Test ID</span></td>
<td class="center-vertical"><a class="btn btn-danger" wicket:id="delete">Delete</a></td>
</tr>
+ <wicket:enclosure>
+ <tr class="norecords-tr" >
+ <td class="norecords-td" colspan="4">
+ <div wicket:id="msg">No records found</div>
+ </td>
+ </tr>
+ </wicket:enclosure>
</tbody>
</table>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java
index 275216d6b1..fe3e7808ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java
@@ -10,6 +10,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.ResourceModel;
import io.onedev.server.OneDev;
import io.onedev.server.model.SshKey;
import io.onedev.server.persistence.dao.Dao;
@@ -62,6 +63,17 @@ public class SshKeysListPanel extends Panel {
}
}).setOutputMarkupId(true);
+ Label noRecordsMsg = new Label("msg", new ResourceModel("datatable.no-records-found")) {
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(model.getObject().size() == 0);
+ }
+ };
+
+ keyList.add(noRecordsMsg);
+
add(keyList);
+
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
index 1a515f60a8..e634c66dba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
@@ -47,11 +47,11 @@
<div class="pull-left">
<a href="#" id="sshHttpsSwitch">Use SSH</a>
</div>
- <div class="pull-right text-info" wicket:id="noKeyWarning">
- <a href="#" target="_blank" wicket:id="registerKey"
- title="To use SSH, register a public key here.">
+ <div class="pull-right hidden" id="noKeyWarning" wicket:id="noKeyWarning">
+ <a href="#" class="text-warning" target="_blank" wicket:id="registerKey"
+ title="To use SSH, you need to register a public key. To do it, just click here.">
<i class="fa fa-shield" aria-hidden="true"></i>
- Register your SSH key
+ No SSH key found! Register it here.
</a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.js b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.js
index 269071e91a..68ff5220ea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.js
@@ -4,6 +4,7 @@ onedev.server.projectInfo = {
$("#" + switchId).click(function() {
$(".clone").toggleClass('hidden');
+ $("#noKeyWarning").toggleClass('hidden');
if (alternativeProtocol === 'HTTPS') {
alternativeProtocol = 'SSH';