archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Minor adjustment of input spec css

Browse Source
This commit is contained in:
Robin Shen 2019-10-13 12:33:53 +08:00
parent 1194a79a6a
commit 40897ddcd9
14 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java
View File

@ -5,9 +5,11 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.RetryCondition;
@Editable
@Horizontal
public class JobRetry implements Serializable {
private static final long serialVersionUID = 1L;

13
server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpecCssResourceReference.java Normal file
View File

@ -0,0 +1,13 @@
package io.onedev.server.model.support.inputspec;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
public class InputSpecCssResourceReference extends BaseDependentCssResourceReference {
private static final long serialVersionUID = 1L;
public InputSpecCssResourceReference() {
super(InputSpecCssResourceReference.class, "input-spec.css");
}
}

23
server-core/src/main/java/io/onedev/server/model/support/inputspec/input-spec.css Normal file
View File

@ -0,0 +1,23 @@
.floating.input-spec .property-uuid, .input-spec-edit .property-uuid {
display: none;
}
.floating.input-spec>.content>.body>div>.bean-viewer>.bean-properties>table>tbody>tr>td.name {
min-width: 150px;
}
.floating.input-spec .bean-viewer+.bean-viewer table>tbody>tr:first-child>td {
padding-top: 16px;
}
.floating.input-spec .property-showCondition .property-inputName td.name,
.floating.input-spec .property-choicesProvider .property-inputName td.name,
.floating.input-spec .property-defaultValueProvider .property-inputName td.name {
border-right: none;
text-align: left;
}
.input-spec .property-showCondition .property-inputName td.name,
.input-spec-edit .property-showCondition .property-inputName label.name,
.input-spec-edit .property-choiceProvider>.value label.name,
.input-spec-edit .property-choiceProvider>.value .bean.list thead th {
font-weight: normal;
}

4
server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
View File

@ -187,8 +187,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
valueContainer.add(descriptionLabel);
valueContainer.add(new FencedFeedbackPanel("feedback", propertyEditor));
valueContainer.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));
}
@Override
@ -232,6 +230,8 @@ public class BeanEditor extends ValueEditor<Serializable> {
}
};
item.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));
return item;
}

13
server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java
View File

@ -1,13 +0,0 @@
package io.onedev.server.web.editable.job.paramspec;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
public class ParamSpecCssResourceReference extends BaseDependentCssResourceReference {
private static final long serialVersionUID = 1L;
public ParamSpecCssResourceReference() {
super(ParamSpecCssResourceReference.class, "param-spec.css");
}
}

2
server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
View File

@ -1,5 +1,5 @@
<wicket:panel>
<form wicket:id="form" class="job-param-spec-edit leave-confirm">
<form wicket:id="form" class="param-spec-edit leave-confirm">
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">

3
server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
View File

@ -27,6 +27,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.ci.job.paramspec.ParamSpec;
import io.onedev.server.model.support.inputspec.InputSpecCssResourceReference;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@ -226,7 +227,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));
response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
}
}

5
server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
View File

@ -29,6 +29,7 @@ import org.apache.wicket.model.Model;
import com.google.common.collect.Sets;
import io.onedev.server.ci.job.paramspec.ParamSpec;
import io.onedev.server.model.support.inputspec.InputSpecCssResourceReference;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.layout.SideFloating;
@ -147,7 +148,7 @@ class ParamSpecListViewPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));
response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
}
private abstract class ColumnFragment extends Fragment {
@ -179,7 +180,7 @@ class ParamSpecListViewPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
add(AttributeAppender.append("class", "job-param-spec def-detail"));
add(AttributeAppender.append("class", "param-spec input-spec def-detail"));
}
@Override

6
server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css
View File

@ -1,6 +0,0 @@
.floating.job-param-spec>.content>.body>.bean-viewer>.bean-properties>table>tbody>tr>td.name {
min-width: 150px;
}
.floating.job-param-spec .property-uuid, .job-param-spec-edit .property-uuid {
display: none;
}

2
server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html
View File

@ -1,5 +1,5 @@
<wicket:panel>
<form wicket:id="form" class="field-spec-edit leave-confirm">
<form wicket:id="form" class="field-spec-edit input-spec-edit leave-confirm">
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">

11
server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
View File

@ -15,6 +15,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@ -31,6 +33,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.inputspec.InputSpecCssResourceReference;
import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
import io.onedev.server.web.ajaxlistener.ConfirmListener;
import io.onedev.server.web.behavior.sortable.SortBehavior;
@ -215,6 +218,12 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {
}.sortable("tbody"));
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
}
private int getFieldSpecIndex(String fieldName) {
for (int i=0; i<getSetting().getFieldSpecs().size(); i++) {
if (getSetting().getFieldSpecs().get(i).getName().equals(fieldName))
@ -255,7 +264,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {
@Override
protected void onInitialize() {
super.onInitialize();
add(AttributeAppender.append("class", "field-spec def-detail"));
add(AttributeAppender.append("class", "field-spec input-spec def-detail"));
}
@Override

28
server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
View File

@ -1,27 +1,3 @@
.floating.field-spec>.content>.body>div>.bean-viewer>.bean-properties>table>tbody>tr>td.name {
min-width: 150px;
}
.floating.field-spec .bean-viewer+.bean-viewer table>tbody>tr:first-child>td {
padding-top: 16px;
}
.floating.field-spec .property-showCondition .property-inputName td.name,
.floating.field-spec .property-choicesProvider .property-inputName td.name,
.floating.field-spec .property-defaultValueProvider .property-inputName td.name {
border-right: none;
text-align: left;
}
.field-spec .property-showCondition .property-inputName td.name,
.field-spec-edit .property-showCondition .property-inputName label.name,
.field-spec-edit .property-choiceProvider>.value label.name,
.field-spec-edit .property-choiceProvider>.value .bean.list thead th,
.field-spec-edit .property-nameOfEmptyValue .control-label {
font-weight: normal;
}
.floating.field-spec .property-uuid, .field-spec-edit .property-uuid {
display: none;
}
#issue-setting .issue-states table>tbody>tr>td:first-child a span {
border-radius: 3px;
padding: 2px 6px;
@ -36,6 +12,10 @@
#issue-setting .default-queries th.property-name {
width: 30%;
}
.field-spec-edit .property-nameOfEmptyValue .control-label {
font-weight: normal;
}
@media(max-width: 991px) {
#issue-setting .display-in-issue-list, .field-spec .property-displayInIssueList,
.field-spec-edit .property-displayInIssueList {

2
server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
View File

@ -111,3 +111,5 @@
.ci-spec>.valid .def-list table>tbody>tr>td:first-child>div>a {
margin-left: 0;
}

2
server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
View File

@ -87,7 +87,7 @@ onedev.server.ciSpec = {
var $contents = $body.children(".contents");
var $content = $contents.children().eq(index);
var $input = $content.find(">div>table>tbody>tr>td.property-name input");
var $input = $content.find(">div>table>tbody>tr.property-name>td input");
function syncName() {
var name = $input.val().trim();