Skip to content

The Unified and Autonomous Development Platform

Add default color to default issue fields and states

robin shen8f1e9c67ad0e
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
index 04d42212fb..1b026b1188 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
@@ -78,14 +78,17 @@ public class IssueWorkflow implements Serializable, InputContext {
Choice minor = new Choice();
minor.setValue("Minor");
+ minor.setColor("#d9ead3");
choices.add(minor);
Choice normal = new Choice();
normal.setValue("Normal");
+ normal.setColor("#f4cccc");
choices.add(normal);
Choice major = new Choice();
major.setValue("Major");
+ major.setColor("#cc0000");
choices.add(major);
specifiedChoices.setChoices(choices);
@@ -101,17 +104,20 @@ public class IssueWorkflow implements Serializable, InputContext {
StateSpec open = new StateSpec();
open.setName("Open");
+ open.setColor("#f1c232");
open.setFields(Lists.newArrayList("Type", "Severity"));
states.add(open);
StateSpec assigned = new StateSpec();
assigned.setName("Assigned");
+ assigned.setColor("#5d9d41");
assigned.setFields(Lists.newArrayList("Assignee"));
states.add(assigned);
StateSpec closed = new StateSpec();
+ closed.setColor("#cccccc");
closed.setName("Closed");
states.add(closed);
diff --git a/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js b/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js
index c6f89b2970..2a7fd4a750 100644
--- a/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js
+++ b/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js
@@ -5,7 +5,18 @@ onedev.server.colorPicker = {
preferredFormat: "hex",
showInput: true,
showInitial: true,
- allowEmpty: allowEmpty
+ allowEmpty: allowEmpty,
+ showPalette: true,
+ palette: [
+ ["#000","#444","#666","#999","#ccc","#eee","#f3f3f3","#fff"],
+ ["#f00","#f90","#ff0","#0f0","#0ff","#00f","#90f","#f0f"],
+ ["#f4cccc","#fce5cd","#fff2cc","#d9ead3","#d0e0e3","#cfe2f3","#d9d2e9","#ead1dc"],
+ ["#ea9999","#f9cb9c","#ffe599","#b6d7a8","#a2c4c9","#9fc5e8","#b4a7d6","#d5a6bd"],
+ ["#e06666","#f6b26b","#ffd966","#93c47d","#76a5af","#6fa8dc","#8e7cc3","#c27ba0"],
+ ["#c00","#e69138","#f1c232","#6aa84f","#45818e","#3d85c6","#674ea7","#a64d79"],
+ ["#900","#b45f06","#bf9000","#38761d","#134f5c","#0b5394","#351c75","#741b47"],
+ ["#600","#783f04","#7f6000","#274e13","#0c343d","#073763","#20124d","#4c1130"]
+ ]
});
}
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
index d073d73c2d..6be24b4645 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
@@ -44,7 +44,7 @@
padding-right: 8px;
}
#issue-list .issue .primary .number {
- width: 100px;
+ width: 75px;
font-size: 16px;
font-weight: bold;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.html
index 04ca02a8e9..bfe9027377 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.html
@@ -7,7 +7,7 @@
</div>
<div class="body">
<div class="alert alert-info">The first state will be used as initial state of created issues</div>
- <table wicket:id="issueStates" class="table table-hover table-condensed"></table>
+ <table wicket:id="issueStates" class="table table-hover"></table>
</div>
</div>
<wicket:fragment wicket:id="nameColumnFrag">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
index b485dd1e8c..05b23a5344 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
@@ -41,6 +41,7 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.layout.SideFloating;
import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
+import io.onedev.utils.ColorUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
@@ -89,7 +90,7 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getName(), true));
+ cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getName(), rowModel.getObject().getColor()));
}
});
@@ -97,7 +98,7 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getDescription(), false));
+ cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getDescription(), null));
}
});
@@ -146,17 +147,17 @@ public class IssueStatesPage extends IssueWorkflowPage {
private class ColumnFragment extends Fragment {
- private final boolean nameColumn;
-
private final int index;
private final String label;
- public ColumnFragment(String id, IModel<StateSpec> model, String label, boolean nameColumn) {
- super(id, nameColumn?"nameColumnFrag":"otherColumnFrag", IssueStatesPage.this, model);
- this.nameColumn = nameColumn;
+ private final String color;
+
+ public ColumnFragment(String id, IModel<StateSpec> model, String label, String color) {
+ super(id, color!=null?"nameColumnFrag":"otherColumnFrag", IssueStatesPage.this, model);
this.index = getWorkflow().getStateIndex(getState().getName());
this.label = label;
+ this.color = color;
}
private StateSpec getState() {
@@ -251,11 +252,26 @@ public class IssueStatesPage extends IssueWorkflowPage {
}
};
- if (label != null)
- link.add(new Label("label", label));
- else
+ if (label != null) {
+ link.add(new Label("label", label) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (color != null) {
+ String fontColor = ColorUtils.isLight(color)?"black":"white";
+ String style = String.format(
+ "background-color: %s; color: %s;",
+ color, fontColor);
+ add(AttributeAppender.append("style", style));
+ }
+ }
+
+ });
+ } else {
link.add(new Label("label", "&nbsp;").setEscapeModelStrings(false));
- if (nameColumn)
+ }
+ if (color != null)
link.add(new WebMarkupContainer("initial").setVisible(index==0));
add(link);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
index 7e186b9f6a..06dd1b2261 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
@@ -18,6 +18,11 @@
position: absolute;
top: 8px;
}
+#project-setting .issue-states table>tbody>tr>td:first-child a span {
+ border-radius: 3px;
+ padding: 2px 6px;
+ margin-right: 8px;
+}
#project-setting .issue-states table>tbody>tr>td:first-child>div>a {
margin-left: 16px;
}