Skip to content

The Unified and Autonomous Development Platform

Re-design issue and pull request list to handle long titles

Robin Shen20bf0d417b31
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java
index 17ce78b648..f2c21c567f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java
@@ -46,7 +46,7 @@ public class VariableInterpolator implements Function<String, String> {
value = build.getSecretValue(value);
paramValues.add(value);
}
- return StringUtils.join(paramValues, "\n");
+ return StringUtils.join(paramValues, ",");
} else {
throw new OneException("Invisible param: " + paramName);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java
index ef3a6dea0a..cfbb7edb7e 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java
@@ -15,21 +15,10 @@ public class TextParam extends ParamSpec {
private static final long serialVersionUID = 1L;
- private boolean multiline;
-
private String pattern;
private DefaultValueProvider defaultValueProvider;
- @Editable(order=1000, description="Enable for multi-line input")
- public boolean isMultiline() {
- return multiline;
- }
-
- public void setMultiline(boolean multiline) {
- this.multiline = multiline;
- }
-
@Editable(order=1100, description="Optionally specify a <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>regular expression pattern</a> for valid values of " +
"the text input")
public String getPattern() {
@@ -59,7 +48,7 @@ public class TextParam extends ParamSpec {
@Override
public String getPropertyDef(Map<String, Integer> indexes) {
- return TextInput.getPropertyDef(this, indexes, pattern, defaultValueProvider, multiline);
+ return TextInput.getPropertyDef(this, indexes, pattern, defaultValueProvider);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index a4a4cb964a..f660c9a970 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -203,6 +203,10 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
query.setParameter("forkedFrom", project);
query.executeUpdate();
+ query = getSession().createQuery("update PullRequest set sourceProject=null where sourceProject=:sourceProject");
+ query.setParameter("sourceProject", project);
+ query.executeUpdate();
+
dao.remove(project);
synchronized (repositoryCache) {
diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/TextField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/TextField.java
index a835a4cc80..eb278761d0 100644
--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/TextField.java
+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/TextField.java
@@ -15,21 +15,10 @@ public class TextField extends FieldSpec {
private static final long serialVersionUID = 1L;
- private boolean multiline;
-
private String pattern;
private DefaultValueProvider defaultValueProvider;
- @Editable(order=1000, description="Enable for multi-line input")
- public boolean isMultiline() {
- return multiline;
- }
-
- public void setMultiline(boolean multiline) {
- this.multiline = multiline;
- }
-
@Editable(order=1100, description="Optionally specify a <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>regular expression pattern</a> for valid values of " +
"the text input")
public String getPattern() {
@@ -59,7 +48,7 @@ public class TextField extends FieldSpec {
@Override
public String getPropertyDef(Map<String, Integer> indexes) {
- return TextInput.getPropertyDef(this, indexes, pattern, defaultValueProvider, multiline);
+ return TextInput.getPropertyDef(this, indexes, pattern, defaultValueProvider);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 3896bbd3dc..08d7cb7daa 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.utils.BeanUtils;
@@ -451,35 +452,38 @@ public class Build extends AbstractEntity implements Referenceable {
public Map<String, Input> getParamInputs() {
Map<String, Input> inputs = new LinkedHashMap<>();
- List<BuildParam> params = new ArrayList<>(getParams());
- Map<String, Integer> paramOrders = new HashMap<>();
-
- int index = 1;
- for (ParamSpec paramSpec: getJob().getParamSpecs())
- paramOrders.put(paramSpec.getName(), index++);
-
- Collections.sort(params, new Comparator<BuildParam>() {
- @Override
- public int compare(BuildParam o1, BuildParam o2) {
- Integer order1 = paramOrders.get(o1.getName());
- Integer order2 = paramOrders.get(o2.getName());
- if (order1 == null)
- order1 = Integer.MAX_VALUE;
- if (order2 == null)
- order2 = Integer.MAX_VALUE;
- return order1 - order2;
+ Map<String, List<BuildParam>> paramMap = new HashMap<>();
+ for (BuildParam param: getParams()) {
+ List<BuildParam> paramsOfName = paramMap.get(param.getName());
+ if (paramsOfName == null) {
+ paramsOfName = new ArrayList<>();
+ paramMap.put(param.getName(), paramsOfName);
}
-
- });
- for (BuildParam param: params) {
- Input input = inputs.get(param.getName());
- if (input == null) {
- input = new Input(param.getName(), param.getType(), new ArrayList<>());
- inputs.put(param.getName(), input);
+ paramsOfName.add(param);
+ }
+ for (ParamSpec paramSpec: getJob().getParamSpecs()) {
+ String paramName = paramSpec.getName();
+ List<BuildParam> params = paramMap.get(paramName);
+ if (params != null) {
+ String type = params.iterator().next().getType();
+ List<String> values = new ArrayList<>();
+ for (BuildParam param: params) {
+ if (param.getValue() != null)
+ values.add(param.getValue());
+ }
+ Collections.sort(values, new Comparator<String>() {
+
+ @Override
+ public int compare(String o1, String o2) {
+ return (int) (paramSpec.getOrdinal(o1) - paramSpec.getOrdinal(o2));
+ }
+
+ });
+ if (!paramSpec.isAllowMultiple() && values.size() > 1)
+ values = Lists.newArrayList(values.iterator().next());
+ inputs.put(paramName, new Input(paramName, type, values));
}
- if (param.getValue() != null)
- input.getValues().add(param.getValue());
}
return inputs;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index eecda55e36..e2bbd8cb86 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -331,11 +331,18 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
if (fields != null) {
String type = fields.iterator().next().getType();
List<String> values = new ArrayList<>();
- for (IssueField entity: fields) {
- if (entity.getValue() != null)
- values.add(entity.getValue());
+ for (IssueField field: fields) {
+ if (field.getValue() != null)
+ values.add(field.getValue());
}
- Collections.sort(values);
+ Collections.sort(values, new Comparator<String>() {
+
+ @Override
+ public int compare(String o1, String o2) {
+ return (int) (fieldSpec.getOrdinal(o1) - fieldSpec.getOrdinal(o2));
+ }
+
+ });
if (!fieldSpec.isAllowMultiple() && values.size() > 1)
values = Lists.newArrayList(values.iterator().next());
inputs.put(fieldName, new Input(fieldName, type, values));
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java
index f0323edfba..df39116018 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java
@@ -7,7 +7,6 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.web.editable.annotation.Color;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@Editable(name="Value")
public class Choice implements Serializable {
@@ -18,7 +17,7 @@ public class Choice implements Serializable {
private String value;
- private String color;
+ private String color = "#E8E8E8";
@Editable
public String getUuid() {
@@ -40,8 +39,8 @@ public class Choice implements Serializable {
}
@Editable(order=200)
+ @NotEmpty
@Color
- @NameOfEmptyValue("No color")
public String getColor() {
return color;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
index 2f9740f533..d4b9f562d5 100755
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
@@ -14,15 +14,13 @@ import io.onedev.server.util.inputspec.textinput.defaultvalueprovider.DefaultVal
public class TextInput {
public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
- String pattern, DefaultValueProvider defaultValueProvider, boolean multiline) {
+ String pattern, DefaultValueProvider defaultValueProvider) {
int index = indexes.get(inputSpec.getName());
StringBuffer buffer = new StringBuffer();
inputSpec.appendField(buffer, index, "String");
inputSpec.appendCommonAnnotations(buffer, index);
if (!inputSpec.isAllowEmpty())
buffer.append(" @NotEmpty\n");
- if (multiline)
- buffer.append(" @Multiline\n");
if (pattern != null)
buffer.append(" @Pattern(regexp=\"" + pattern + "\", message=\"Should match regular expression: " + pattern + "\")\n");
inputSpec.appendMethods(buffer, index, "String", null, defaultValueProvider);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java
index f3c4903d95..297d1961c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java
@@ -44,9 +44,8 @@ public class BranchLink extends ViewStateAwarePageLink<Void> {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
configure();
- if (!isEnabled()) {
+ if (!isEnabled())
tag.setName("span");
- }
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html
index 1a11c140ef..8f413eefaf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.html
@@ -1,6 +1,6 @@
<wicket:panel>
<span class="project-and-branch">
- <a wicket:id="projectPicker" class="project btn btn-xs btn-default"></a>
- <a wicket:id="branchPicker" class="branch btn btn-xs btn-default"></a>
+ <a wicket:id="projectPicker" class="project btn btn-sm btn-default"></a>
+ <a wicket:id="branchPicker" class="branch btn btn-sm btn-default"></a>
</span>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-picker.css b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-picker.css
index 3a9b9127a2..87f2fad3f0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-picker.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-picker.css
@@ -1,8 +1,3 @@
.project-and-branch {
white-space: nowrap;
}
-.project-and-branch>a {
- color: #444;
- text-decoration: none;
- font-size: 16px;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 82afcdb403..0c97c21f25 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -60,7 +60,7 @@ import io.onedev.server.web.behavior.BuildQueryBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -477,7 +477,7 @@ public abstract class BuildListPanel extends Panel {
}
});
- body.add(buildsTable = new HistoryAwareDataTable<Build, Void>("builds", columns, dataProvider,
+ body.add(buildsTable = new DefaultDataTable<Build, Void>("builds", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 6f61e0a657..b1583ca9d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -24,13 +24,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.time.Duration;
import org.eclipse.jgit.revwalk.RevCommit;
-import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
-import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
@@ -40,6 +39,7 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.SecretInput;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
+import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -193,31 +193,14 @@ public abstract class BuildSidePanel extends Panel {
});
- add(new ListView<BuildParam>("params", new LoadableDetachableModel<List<BuildParam>>() {
+ add(new ListView<Input>("params", new LoadableDetachableModel<List<Input>>() {
@Override
- protected List<BuildParam> load() {
- List<BuildParam> params = new ArrayList<>();
+ protected List<Input> load() {
+ List<Input> params = new ArrayList<>();
for (Map.Entry<String, Input> entry: getBuild().getParamInputs().entrySet()) {
- if (getBuild().isParamVisible(entry.getKey())) {
- if (entry.getValue().getValues().size() > 1) {
- int i = 1;
- for (String value: entry.getValue().getValues()) {
- BuildParam param = new BuildParam();
- param.setName(entry.getKey() + "_" + (i++));
- param.setType(entry.getValue().getType());
- param.setValue(value);
- params.add(param);
- }
- } else {
- BuildParam param = new BuildParam();
- param.setName(entry.getKey());
- param.setType(entry.getValue().getType());
- if (entry.getValue().getValues().size() == 1)
- param.setValue(entry.getValue().getValues().iterator().next());
- params.add(param);
- }
- }
+ if (getBuild().isParamVisible(entry.getKey()))
+ params.add(entry.getValue());
}
return params;
}
@@ -225,19 +208,19 @@ public abstract class BuildSidePanel extends Panel {
}) {
@Override
- protected void populateItem(ListItem<BuildParam> item) {
- BuildParam param = item.getModelObject();
+ protected void populateItem(ListItem<Input> item) {
+ Input param = item.getModelObject();
item.add(new Label("name", param.getName()));
if (param.getType().equals(ParamSpec.SECRET))
item.add(new Label("value", SecretInput.MASK));
else
- item.add(new Label("value", HtmlUtils.formatAsHtml(param.getValue())).setEscapeModelStrings(false));
+ item.add(new MultilineLabel("value", StringUtils.join(param.getValues(), ",")));
}
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getBuild().getParams().isEmpty());
+ setVisible(!getModelObject().isEmpty());
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index a2be2c91ac..0fb82beacd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -48,7 +48,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.CodeCommentQueryBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
@@ -313,7 +313,7 @@ public abstract class CodeCommentListPanel extends Panel {
});
- body.add(new HistoryAwareDataTable<CodeComment, Void>("comments", columns, dataProvider,
+ body.add(new DefaultDataTable<CodeComment, Void>("comments", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java
rename to server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
index dc5713bc78..0f8152768d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
@@ -18,9 +18,9 @@ import org.apache.wicket.model.IModel;
import io.onedev.server.web.util.PagingHistorySupport;
@SuppressWarnings("serial")
-public class HistoryAwareDataTable<T, S> extends DataTable<T, S> {
+public class DefaultDataTable<T, S> extends DataTable<T, S> {
- public HistoryAwareDataTable(final String id, final List<? extends IColumn<T, S>> columns,
+ public DefaultDataTable(final String id, final List<? extends IColumn<T, S>> columns,
final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage,
@Nullable PagingHistorySupport pagingHistorySupport) {
super(id, columns, dataProvider, rowsPerPage);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
index 703cdc7497..9fb8ea2bb4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div wicket:id="content" class="field-values"></div>
+ <div wicket:id="content" class="field-values clearfix"></div>
<wicket:fragment wicket:id="nonEmptyValuesFrag">
- <div wicket:id="values" class="value"><span wicket:id="value"></span></div>
+ <div wicket:id="values" class="value pull-left"><span wicket:id="value"></span></div>
</wicket:fragment>
<wicket:fragment wicket:id="linkFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index f9fb287666..272b616954 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -65,7 +65,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
String value = item.getModelObject();
if (getField().getType().equals(FieldSpec.USER)) {
UserIdent userIdent = UserIdent.of(OneDev.getInstance(UserManager.class).findByName(value), value);
- item.add(new UserIdentPanel("value", userIdent, Mode.AVATAR_AND_NAME));
+ item.add(new UserIdentPanel("value", userIdent, Mode.NAME));
} else if (getField().getType().equals(FieldSpec.ISSUE)) {
Issue issue = OneDev.getInstance(IssueManager.class)
.find(getIssue().getProject(), Long.valueOf(value));
@@ -109,7 +109,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
Label label;
if (getField().getType().equals(ParamSpec.SECRET))
label = new Label("value", SecretInput.MASK);
- else
+ else
label = new Label("value", value);
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());
@@ -118,15 +118,14 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
ComponentContext.push(new ComponentContext(this));
try {
String backgroundColor = choiceProvider.getChoices(false).get(value);
- if (backgroundColor != null) {
- String fontColor = ColorUtils.isLight(backgroundColor)?"black":"white";
- String style = String.format(
- "background-color: %s; color: %s;",
- backgroundColor, fontColor);
- label.add(AttributeAppender.append("style", style));
- label.add(AttributeAppender.append("class", "label"));
- item.add(AttributeAppender.append("class", "has-color"));
- }
+ if (backgroundColor == null)
+ backgroundColor = "#E8E8E8";
+ String fontColor = ColorUtils.isLight(backgroundColor)?"black":"white";
+ String style = String.format(
+ "background-color: %s; color: %s;",
+ backgroundColor, fontColor);
+ label.add(AttributeAppender.append("style", style));
+ label.add(AttributeAppender.append("class", "label"));
} finally {
ComponentContext.pop();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
index 61633b214d..9d799f42eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
@@ -1,6 +1,3 @@
-.field-values .has-color {
- margin-bottom: 4px;
-}
-.field-values .has-color:last-child {
- margin-bottom: 0;
-}
+.field-values>.value {
+ margin-right: 0 !important;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index a1e6bc4c8d..bc1067e5a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -23,28 +23,32 @@
<table wicket:id="issues" class="table"></table>
</div>
</div>
- <wicket:fragment wicket:id="summaryFrag">
- <div class="first-line">
- <span wicket:id="title" class="title"></span>
- <span wicket:id="number" class="number"></span>
- <a wicket:id="copy" title="Copy issue number and title" class="copy"><i class="fa fa-copy"></i></a>
- </div>
- <div class="second-line clearfix">
- <span wicket:id="state" class="state pull-left"></span>
- <div class="submission pull-left">
- submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
+ <wicket:fragment wicket:id="contentFrag">
+ <div class="primary clearfix">
+ <div class="pull-left">
+ <span wicket:id="number" class="number"></span>
+ <span wicket:id="title" class="title"></span>
+ <a wicket:id="copy" title="Copy issue number and title" class="copy"><i class="fa fa-copy"></i></a>
+ </div>
+ <div class="pull-right">
+ <span class="votes" title="Votes">
+ <span class="fa fa-thumbs-o-up"></span> <span wicket:id="votes"></span>
+ </span>
+ <span class="comments" title="Comments">
+ <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
+ </span>
</div>
- <div class="pull-left votes" title="Votes">
- <span class="fa fa-thumbs-o-up"></span> <span wicket:id="votes"></span>
+ </div>
+ <div class="secondary clearfix">
+ <div class="pull-left clearfix">
+ <div wicket:id="state" class="state pull-left"></div>
+ <div wicket:id="fields" class="field pull-left"></div>
</div>
- <div class="pull-left comments" title="Comments">
- <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
+ <div class="submission pull-right">
+ submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
</div>
</div>
</wicket:fragment>
- <wicket:fragment wicket:id="projectFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
<wicket:fragment wicket:id="listFieldsFrag">
<div class="issue-list-fields">
<form wicket:id="form">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 2e6bf5945e..7ca60428a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -22,6 +22,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulato
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -31,11 +33,11 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.OddEvenItem;
+import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -63,7 +65,7 @@ import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
@@ -78,7 +80,6 @@ import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -556,14 +557,14 @@ public abstract class IssueListPanel extends Panel {
});
}
- columns.add(new AbstractColumn<Issue, Void>(Model.of("Summary")) {
+ columns.add(new AbstractColumn<Issue, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
IModel<Issue> rowModel) {
Issue issue = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "summaryFrag", IssueListPanel.this);
- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
+ Fragment fragment = new Fragment(componentId, "contentFrag", IssueListPanel.this);
+ Item<?> row = cellItem.findParent(Item.class);
QueryPosition position;
if (getProject() != null) {
position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),
@@ -574,8 +575,11 @@ public abstract class IssueListPanel extends Panel {
String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
IssueActivitiesPage.paramsOf(issue, position)).toString();
-
- fragment.add(new Label("number", "<a href='" + url + "'>#" + issue.getNumber() + "</a>")
+
+ String label = "#" + issue.getNumber();
+ if (getProject() == null)
+ label = issue.getProject().getName() + label;
+ fragment.add(new Label("number", "<a href='" + url + "'>" + label + "</a>")
.setEscapeModelStrings(false));
String transformed = new ReferenceTransformer(issue.getProject(), url).apply(issue.getTitle());
@@ -584,55 +588,14 @@ public abstract class IssueListPanel extends Panel {
fragment.add(new WebMarkupContainer("copy").add(
new CopyClipboardBehavior(Model.of("#" + issue.getNumber() + ": " + issue.getTitle()))));
- fragment.add(new IssueStateLabel("state", rowModel));
-
- UserIdent submitterIdent = UserIdent.of(issue.getSubmitter(), issue.getSubmitterName());
- fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));
- fragment.add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate())));
-
fragment.add(new Label("votes", issue.getVoteCount()));
fragment.add(new Label("comments", issue.getCommentCount()));
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "summary";
- }
-
- });
-
- if (getProject() == null) {
- columns.add(new AbstractColumn<Issue, Void>(Model.of("Project")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- Issue issue = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "projectFrag", IssueListPanel.this);
- Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class,
- ProjectDashboardPage.paramsOf(issue.getProject()));
- link.add(new Label("label", issue.getProject()));
- fragment.add(link);
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "project";
- }
-
- });
- }
-
- for (String field: getIssueSetting().sortFieldNames(getListFields())) {
- columns.add(new AbstractColumn<Issue, Void>(Model.of(field)) {
+ fragment.add(new IssueStateLabel("state", rowModel));
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new FieldValuesPanel(componentId) {
+ RepeatingView fieldsView = new RepeatingView("fields");
+ for (String field: getIssueSetting().sortFieldNames(getListFields())) {
+ fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {
@Override
protected Issue getIssue() {
@@ -648,19 +611,20 @@ public abstract class IssueListPanel extends Panel {
return null;
}
- }.setRenderBodyOnly(true));
- }
-
- @Override
- public String getCssClass() {
- return "custom-field";
- }
+ });
+ }
+ fragment.add(fieldsView);
- });
- }
+ UserIdent submitterIdent = UserIdent.of(issue.getSubmitter(), issue.getSubmitterName());
+ fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));
+ fragment.add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate())));
+
+ cellItem.add(fragment);
+ }
+
+ });
- body.add(issuesTable = new HistoryAwareDataTable<Issue, Void>("issues", columns, dataProvider,
- WebConstants.PAGE_SIZE, getPagingHistorySupport()) {
+ body.add(issuesTable = new DataTable<Issue, Void>("issues", columns, dataProvider, WebConstants.PAGE_SIZE) {
@Override
protected Item<Issue> newRowItem(String id, int index, IModel<Issue> model) {
@@ -670,7 +634,20 @@ public abstract class IssueListPanel extends Panel {
issue.isVisitedAfter(issue.getUpdateDate())?"issue":"issue new"));
return item;
}
+
+ });
+
+ if (getPagingHistorySupport() != null)
+ issuesTable.setCurrentPage(getPagingHistorySupport().getCurrentPage());
+ issuesTable.addBottomToolbar(new NavigationToolbar(issuesTable) {
+
+ @Override
+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {
+ return new HistoryAwarePagingNavigator(navigatorId, table, getPagingHistorySupport());
+ }
+
});
+ issuesTable.addBottomToolbar(new NoRecordsToolbar(issuesTable));
}
private Collection<String> getListFields() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index 74a9a0f881..e35044de77 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -1,11 +1,3 @@
-@media(max-width: 991px) {
- .issue-list thead,
- .issue-list a.list-fields,
- .issue-list td.custom-field {
- display: none;
- }
-}
-
.issue-list>.head {
position: relative;
}
@@ -34,41 +26,35 @@
.issue-list>.body td a {
color: #444;
}
-.issue-list>.body td.summary .first-line {
- margin-bottom: 8px;
- font-size: 16px;
- font-weight: bold;
-}
-.issue-list>.body td.summary .title {
- margin-right: 8px;
+.issue-list>.body td .number>a {
+ margin-right: 12px;
}
-.issue-list>.body td.summary .number {
+.issue-list>.body td .title>a {
margin-right: 4px;
}
-.issue-list>.body td.summary .copy {
- font-size: 14px;
+.issue-list>.body td .number>a, .issue-list>.body td .title>a {
+ font-weight: bold;
}
-.issue-list>.body td.summary .second-line>* {
- margin-right: 12px;
-}
-.issue-list>.body td.summary .second-line>*:last-child {
- margin-right: 0;
-}
-.issue-list>.body td.summary .state {
+.issue-list>.body td .state {
width: 120px;
padding: 6px 8px;
text-overflow: ellipsis;
overflow: hidden;
}
-.issue-list>.body td.summary .second-line {
+.issue-list>.body td .primary {
+ margin-bottom: 8px;
+}
+.issue-list>.body td .secondary>.pull-left>div {
+ margin-right: 16px;
+}
+.issue-list>.body td .submission, .issue-list>.body td .comments, .issue-list>.body td .votes {
color: #888;
}
-
-.issue-list>.body th.custom-field,
-.issue-list>.body td.custom-field {
- white-space: nowrap;
+.issue-list>.body td .votes {
+ margin-right: 8px;
}
+
.issue-list>.body .new-indicator {
width: 4px;
padding: 0;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index 9cf41f3406..f556606fe7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -97,7 +97,7 @@ public abstract class IssueTitlePanel extends Panel {
@Override
protected String load() {
ReferenceTransformer transformer = new ReferenceTransformer(getIssue().getProject(), null);
- return "#" + getIssue().getNumber() + " - " + transformer.apply(getIssue().getTitle());
+ return "#" + getIssue().getNumber() + "&nbsp;&nbsp;" + transformer.apply(getIssue().getTitle());
}
}).setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 11a9ee6c5a..51f68d4b7e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -46,7 +46,7 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.ProjectQueryBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.project.avatar.ProjectAvatar;
@@ -312,7 +312,7 @@ public class ProjectListPanel extends Panel {
});
- body.add(new HistoryAwareDataTable<Project, Void>("projects", columns, dataProvider,
+ body.add(new DefaultDataTable<Project, Void>("projects", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index eade9e3840..15f4c11f74 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -20,22 +20,28 @@
<table wicket:id="requests" class="table"></table>
</div>
</div>
- <wicket:fragment wicket:id="summaryFrag">
- <div class="first-line">
- <span wicket:id="title" class="title"></span>
- <span wicket:id="number" class="number"></span>
- </div>
- <div class="second-line clearfix">
- <div wicket:id="status" class="status pull-left"></div>
- <div class="submission pull-left">
- submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
- </div>
- <div class="comments pull-left" title="Comments">
- <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
- </div>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="branchFrag">
- <a wicket:id="link"></a>
+ <wicket:fragment wicket:id="contentFrag">
+ <div class="primary clearfix">
+ <div class="pull-left">
+ <span wicket:id="number" class="number"></span>
+ <span wicket:id="title" class="title"></span>
+ </div>
+ <div class="pull-right comments" title="Comments">
+ <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
+ </div>
+ </div>
+ <div class="secondary clearfix">
+ <div class="pull-left clearfix">
+ <div wicket:id="status" class="status pull-left"></div>
+ <div class="branches pull-left">
+ <a wicket:id="target" title="Target"></a>
+ <span class="fa fa-arrow-left"></span>
+ <a wicket:id="source" title="Source"></a>
+ </div>
+ </div>
+ <div class="submission pull-right">
+ submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
+ </div>
+ </div>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index ae2818295b..cd9deb4279 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -19,6 +19,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulato
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -28,10 +30,10 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.OddEvenItem;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -56,7 +58,7 @@ import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.project.selector.ProjectSelector;
@@ -284,16 +286,16 @@ public abstract class PullRequestListPanel extends Panel {
});
- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Summary")) {
+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {
PullRequest request = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "summaryFrag", PullRequestListPanel.this);
+ Fragment fragment = new Fragment(componentId, "contentFrag", PullRequestListPanel.this);
QueryPosition position;
if (getProject() != null) {
- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
+ Item<?> row = cellItem.findParent(Item.class);
position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),
(int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());
} else {
@@ -303,16 +305,36 @@ public abstract class PullRequestListPanel extends Panel {
String url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
PullRequestActivitiesPage.paramsOf(request, position)).toString();
- fragment.add(new Label("number", "<a href='" + url + "'>#" + request.getNumber() + "</a>")
- .setEscapeModelStrings(false));
+ String label = "#" + request.getNumber();
+ if (getProject() == null)
+ label = request.getTargetProject().getName() + label;
+ fragment.add(new Label("number", "<a href='" + url + "'>" + label + "</a>").setEscapeModelStrings(false));
ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), url);
fragment.add(new Label("title", transformer.apply(request.getTitle())).setEscapeModelStrings(false));
+
+ fragment.add(new Label("comments", request.getCommentCount()));
fragment.add(new RequestStatusLabel("status", rowModel));
+
+ fragment.add(new BranchLink("target", request.getTarget(), request));
+
+ if (request.getSource() != null) {
+ fragment.add(new BranchLink("source", request.getSource(), request));
+ } else {
+ fragment.add(new Label("source", "<i>unknown</i>") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ }.setEscapeModelStrings(false));
+ }
+
UserIdent submitterIdent = UserIdent.of(request.getSubmitter(), request.getSubmitterName());
fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));
fragment.add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));
- fragment.add(new Label("comments", request.getCommentCount()));
cellItem.add(fragment);
}
@@ -324,59 +346,6 @@ public abstract class PullRequestListPanel extends Panel {
});
- if (getProject() == null) {
- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Target")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {
- Fragment fragment = new Fragment(componentId, "branchFrag", PullRequestListPanel.this);
- fragment.add(new BranchLink("link", rowModel.getObject().getTarget(), rowModel.getObject()));
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "target expanded";
- }
-
- });
- }
-
- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Source")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {
- if (rowModel.getObject().getSource() != null) {
- Fragment fragment = new Fragment(componentId, "branchFrag", PullRequestListPanel.this);
- fragment.add(new BranchLink("link", rowModel.getObject().getSource(), rowModel.getObject()));
- cellItem.add(fragment);
- } else {
- cellItem.add(new Label(componentId, "<i>Unknown</i>").setEscapeModelStrings(false));
- }
- }
-
- @Override
- public String getCssClass() {
- return "source expanded";
- }
-
- });
-
- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Update")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {
- PullRequest request = rowModel.getObject();
- cellItem.add(new Label(componentId, DateUtils.formatAge(request.getUpdateDate())));
- }
-
- @Override
- public String getCssClass() {
- return "last-update expanded";
- }
-
- });
-
SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {
private Integer count;
@@ -419,19 +388,30 @@ public abstract class PullRequestListPanel extends Panel {
};
- body.add(requestsTable = new HistoryAwareDataTable<PullRequest, Void>("requests", columns, dataProvider,
- WebConstants.PAGE_SIZE, getPagingHistorySupport()) {
+ body.add(requestsTable = new DataTable<PullRequest, Void>("requests", columns, dataProvider, WebConstants.PAGE_SIZE) {
@Override
protected Item<PullRequest> newRowItem(String id, int index, IModel<PullRequest> model) {
Item<PullRequest> item = super.newRowItem(id, index, model);
- PullRequest request = model.getObject();
+ PullRequest issue = model.getObject();
item.add(AttributeAppender.append("class",
- request.isVisitedAfter(request.getUpdateDate())?"request":"request new"));
+ issue.isVisitedAfter(issue.getUpdateDate())?"request":"request new"));
return item;
}
+
});
+ if (getPagingHistorySupport() != null)
+ requestsTable.setCurrentPage(getPagingHistorySupport().getCurrentPage());
+ requestsTable.addBottomToolbar(new NavigationToolbar(requestsTable) {
+
+ @Override
+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {
+ return new HistoryAwarePagingNavigator(navigatorId, table, getPagingHistorySupport());
+ }
+
+ });
+ requestsTable.addBottomToolbar(new NoRecordsToolbar(requestsTable));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
index 2bef5eb1b5..436bb723cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
@@ -23,42 +23,46 @@
.pull-request-list>.head>.others>*:last-child {
margin-right: 0;
}
-.pull-request-list>.body .new-indicator {
- width: 4px;
- padding: 0;
-}
+
.pull-request-list>.body td a {
color: #444;
}
-.pull-request-list>.body tr.request.new td.new-indicator {
- background: #4667EE;
+.pull-request-list>.body td .number>a {
+ margin-right: 12px;
}
-
-.pull-request-list>.body td.summary .first-line {
- margin-bottom: 8px;
+.pull-request-list>.body td .title>a {
+ margin-right: 4px;
+}
+.pull-request-list>.body td .number>a, .pull-request-list>.body td .title>a {
font-weight: bold;
- font-size: 16px;
}
-.pull-request-list>.body td.summary .first-line>.title {
- margin-right: 8px;
- color: #444;
+
+.pull-request-list>.body td .status {
+ width: 100px;
+ padding: 6px 8px;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
-.pull-request-list>.body td.summary .second-line>* {
- margin-right: 12px;
+.pull-request-list>.body td .primary {
+ margin-bottom: 8px;
}
-.pull-request-list>.body td.summary .second-line>*:last-child {
- margin-right: 0;
+.pull-request-list>.body td .secondary>.pull-left>div {
+ margin-right: 16px;
}
-.pull-request-list>.body td.summary .second-line>.status {
- width: 75px;
- padding: 6px 8px;
+.pull-request-list>.body td .branches .fa {
+ color: #666;
+ margin: 0 4px;
}
-.pull-request-list>.body td.summary .second-line {
+.pull-request-list>.body td .submission,
+.pull-request-list>.body td .comments {
color: #888;
}
-@media(max-width: 991px) {
- .pull-request-list thead, .pull-request-list td.expanded {
- display: none;
- }
+.pull-request-list>.body .new-indicator {
+ width: 4px;
+ padding: 0;
+}
+.pull-request-list>.body tr.request.new td.new-indicator {
+ background: #4667EE;
}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html
index 75dafd2ebb..b2808c652d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html
@@ -1,6 +1,6 @@
<wicket:panel>
<span class="project-and-revision">
- <a wicket:id="projectPicker" class="project btn btn-default btn-xs"></a>
- <a wicket:id="revisionPicker" class="revision btn btn-default btn-xs"></a>
+ <a wicket:id="projectPicker" class="project btn btn-default btn-sm"></a>
+ <a wicket:id="revisionPicker" class="revision btn btn-default btn-sm"></a>
</span>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-picker.css b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-picker.css
index a9ae1d8d87..b7f0b34fcd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-picker.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-picker.css
@@ -1,11 +1,3 @@
.project-and-revision {
white-space: nowrap;
}
-.project-and-revision>a {
- color: #444;
- text-decoration: none;
- font-size: 16px;
-}
-.project-and-revision>a.btn {
- font-size: inherit;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index ebcabdc00f..2a28588bbe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
@@ -36,7 +36,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -229,7 +229,7 @@ public class GroupListPage extends AdministrationPage {
};
- add(groupsTable = new HistoryAwareDataTable<>("groups", columns, dataProvider,
+ add(groupsTable = new DefaultDataTable<>("groups", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
index 67baf02c58..edb989543b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
@@ -44,7 +44,7 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -269,7 +269,7 @@ public class GroupMembershipsPage extends GroupPage {
};
- add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,
+ add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
index 58ab6ff7fa..5a0fb24546 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
@@ -35,7 +35,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -208,7 +208,7 @@ public class RoleListPage extends AdministrationPage {
};
- add(rolesTable = new HistoryAwareDataTable<>("roles", columns, dataProvider,
+ add(rolesTable = new DefaultDataTable<>("roles", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index e3ac2ee473..d35a2866ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -36,7 +36,7 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.user.UserDeleteLink;
import io.onedev.server.web.component.user.avatar.UserAvatar;
@@ -218,7 +218,7 @@ public class UserListPage extends AdministrationPage {
};
- add(usersTable = new HistoryAwareDataTable<User, Void>("users", columns, dataProvider,
+ add(usersTable = new DefaultDataTable<User, Void>("users", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
index 221d736370..6de8779fe2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
@@ -42,7 +42,7 @@ import io.onedev.server.model.Membership;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.groupchoice.AbstractGroupChoiceProvider;
import io.onedev.server.web.component.groupchoice.GroupChoiceResourceReference;
@@ -263,7 +263,7 @@ public class UserMembershipsPage extends UserPage {
};
- add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,
+ add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 5170cd553a..71afb1f89e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -418,9 +418,9 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
@Override
public String getObject() {
if (requestModel.getObject().isOpen())
- return "<i class='fa fa-info-circle'></i> This change is already opened for merge by pull request ";
+ return "This change is already opened for merge by pull request ";
else
- return "<i class='fa fa-info-circle'></i> This change is squashed/rebased onto base branch via pull request ";
+ return "This change is squashed/rebased onto base branch via pull request ";
}
}).setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
index e6c1e7d01a..87697fcae9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
@@ -12,7 +12,7 @@
vertical-align: middle;
background: #FAFAFA;
border: 2px solid #E0E0E0;
- padding: 12px;
+ padding: 20px;
}
#revision-compare>.revisions td.action {
text-align: center;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
index a1acaf307e..8f7cfb2ca4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
@@ -36,7 +36,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.util.MilestoneSort;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.menu.MenuItem;
@@ -260,7 +260,7 @@ public class MilestoneListPage extends ProjectIssuesPage {
};
- add(milestonesTable = new HistoryAwareDataTable<Milestone, Void>("milestones", columns, dataProvider,
+ add(milestonesTable = new DefaultDataTable<Milestone, Void>("milestones", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
milestonesTable.setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index c10895f68b..32a0894be5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -13,7 +13,7 @@
</div>
</td>
<td class="action">
- <a wicket:id="swap" class="swap" title="Swap"><i class="fa fa-arrow-left"></i></a>
+ <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-arrow-left"></i></a>
</td>
<td class="source branch">
<div class="title">
@@ -45,7 +45,6 @@
<wicket:fragment wicket:id="mergedFrag">
<div class="alert alert-success">
<div class="summary">
- <span class="fa fa-lg fa-check-circle"></span>
<a wicket:id="targetBranch"></a> is up to date with all commits from <a wicket:id="sourceBranch"></a>.
Try <a wicket:id="swapBranches">swap source and target</a> for the comparison.
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 8d78d6b7d0..13aea7cc53 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -505,9 +505,9 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public String getObject() {
if (requestModel.getObject().isOpen())
- return "<i class='fa fa-info-circle'></i> This change is already opened for merge by pull request";
+ return "This change is already opened for merge by pull request";
else
- return "<i class='fa fa-info-circle'></i> This change is squashed/rebased onto base branch via pull request";
+ return "This change is squashed/rebased onto base branch via pull request";
}
}).setEscapeModelStrings(false));
@@ -521,8 +521,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public String getObject() {
- PullRequest request = getPullRequest();
- return "#" + request.getNumber() + " - " + request.getTitle();
+ return "#" + getPullRequest().getNumber();
}
}));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
index bcffc39cc6..5187e4c08e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
@@ -17,9 +17,9 @@
#new-request>.branches td {
vertical-align: middle;
background: #F5F5F5;
- border: 1px solid #DDD;
+ border: 2px solid #DDD;
border-radius: 4px;
- padding: 12px;
+ padding: 20px;
}
#new-request>.branches td.action {
text-align: center;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 29b05fca3c..36687a60dd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -52,9 +52,15 @@
margin-bottom: 8px;
}
#request-detail>.main>.status-and-branches>.status {
+ width: 100px;
+ padding: 6px 8px;
+ text-overflow: ellipsis;
+ overflow: hidden;
font-size: 16px;
margin-right: 8px;
+ margin-top: -4px;
}
+
#request-detail>.main>.status-and-branches>.more-info {
position: absolute;
right: 0;