Skip to content

The Unified and Autonomous Development Platform

fix issue #116: Place + below the list of enumeration values

Robin Shen234c71096d5b
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index 536dc2637b..e8b5c526dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -1,6 +1,5 @@
<wicket:panel>
<div class="bean-list list">
- <div class="head"><a wicket:id="addElement" title="Add new" class="add-element btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div>
<table class="table table-condensed">
<thead>
<th class="actions minimum"></th>
@@ -31,5 +30,6 @@
</tr>
</tfoot>
</table>
+ <div class="foot"><a wicket:id="addElement" title="Add new" class="add-element btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index 16c5d959c6..02d7a98dd5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -145,22 +145,19 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
super.onSubmit(target, form);
markFormDirty(target);
- Component firstRow;
+ Component lastRow;
if (rows.size() != 0)
- firstRow = rows.get(0);
+ lastRow = rows.get(rows.size() - 1);
else
- firstRow = null;
+ lastRow = null;
Component newRow = addRow(newElement());
- for (int i=0; i<rows.size()-1; i++)
- rows.swap(rows.size()-i-1, rows.size()-i-2);
-
String script = String.format("$('<tr id=\"%s\"></tr>')", newRow.getMarkupId());
- if (firstRow != null)
- script += ".insertBefore('#" + firstRow.getMarkupId() + "');";
+ if (lastRow != null)
+ script += ".insertAfter('#" + lastRow.getMarkupId() + "');";
else
script += ".appendTo('#" + BeanListPropertyEditor.this.getMarkupId() + ">div>table>tbody');";
-
+
target.prependJavaScript(script);
target.add(newRow);
target.add(noElements);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html
index 4df5e5a678..ceaf5a5a6f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="action-authorization-list list">
- <div class="head">
+ <table wicket:id="authorizations" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="authorizations" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index 18a9fcb203..dbaba5b2bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -77,29 +77,6 @@
margin-top: -7px;
padding: 8px 0 0 8px;
}
-.property-editor>.polymorphic-list>table>tbody>tr>td {
- border-top: 2px solid #BBB;
- padding-top: 20px;
-}
-.property-editor>.polymorphic-list>table>tbody>tr>td>.head {
- margin-bottom: 20px;
-}
-.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions {
- font-size: 18px;
- margin-left: 20px;
-}
-.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions a {
- color: #666;
-}
-
-.property-viewer>.polymorphic-list>tbody>tr>td {
- border-top: 2px solid #BBB;
- padding-top: 12px;
- padding-bottom: 12px;
-}
-.property-viewer>.polymorphic-list>tbody>tr>td>.type-selector {
- margin-bottom: 12px;
-}
.property-viewer>.bean-list>tfoot>tr>td.no-elements>div {
border-top: 2px solid #DDD;
margin-top: -7px;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html
index c530715d40..d9002e9ddf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="job-dependency-list list">
- <div class="head">
+ <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
index 08676be386..8bc3102da9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="param-spec-list list">
- <div class="head">
+ <table wicket:id="paramSpecs" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="paramSpecs" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html
index 31f9256657..680ce41b03 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="action-list list">
- <div class="head">
+ <table wicket:id="actions" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="actions" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html
index dc3c527c4b..b3e5a4f7d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="job-privilege-list list">
- <div class="head">
+ <table wicket:id="privileges" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="privileges" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html
index c530715d40..d9002e9ddf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="job-dependency-list list">
- <div class="head">
+ <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="dependencies" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html
index 4009b2e76d..ff557a5fb8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="report-list list">
- <div class="head">
+ <table wicket:id="reports" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="reports" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html
index 22b81e9e6c..8785616c10 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="job-service-list list">
- <div class="head">
+ <table wicket:id="services" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="services" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html
index 579fb40720..c778b520d2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="job-trigger-list list">
- <div class="head">
+ <table wicket:id="triggers" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="triggers" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html
index 6fb560ec85..5f93a15a06 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="locator-list list">
- <div class="head">
+ <table wicket:id="locators" class="table table-condensed table-hover"></table>
+ <div class="foot">
<a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>
</div>
- <table wicket:id="locators" class="table table-condensed table-hover"></table>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 6ba2e712cd..e81617be94 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -427,6 +427,9 @@ input.search {
.list>.head {
margin-bottom: 8px;
}
+.list>.foot {
+ margin-top: 8px;
+}
.list>.head>.pull-left {
margin-right: 20px;
margin-bottom: 8px;