The Unified and Autonomous Development Platform
fix issue #8: A few UI nits and better support for mobile devices
robin shen730cfc9b7e33
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.javaindex 24b66f1bd2..bab518b0f3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java@@ -28,7 +28,7 @@ public class PullRequestReferencedFromIssueData implements PullRequestChangeData@Overridepublic String getDescription() {- return "referenced from issue";+ return "Referenced from issue";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/TitleAndStatusCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/TitleAndStatusCssResourceReference.javanew file mode 100644index 0000000000..a61e98da8c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/TitleAndStatusCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.asset.titleandstatus;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class TitleAndStatusCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public TitleAndStatusCssResourceReference() {+ super(TitleAndStatusCssResourceReference.class, "title-and-status.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/title-and-status.css b/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/title-and-status.cssnew file mode 100644index 0000000000..374c402f08--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/title-and-status.css@@ -0,0 +1,15 @@+.title-and-status {+ position: relative;+}++.title-and-status>.title {+ padding-right: 48px;+}+.title-and-status>.status {+ position: absolute;+ right: 0;+ top: 0;+}+.title-and-status .label {+ line-height: inherit;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 78dfdf001f..a971b5646d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -20,15 +20,20 @@<table wicket:id="builds" class="table"></table></div></div>- <wicket:fragment wicket:id="linkFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>+ <wicket:fragment wicket:id="buildFrag">+ <a wicket:id="link">+ <span wicket:id="icon"></span>+ <span wicket:id="label"></span>+ </a></wicket:fragment>- <wicket:fragment wicket:id="statusFrag">- <span wicket:id="icon"></span>+ <wicket:fragment wicket:id="jobFrag"><a wicket:id="link">- <span wicket:id="name"></span>- <span wicket:id="date"></span>- </a>+ <span wicket:id="label"></span>+ </a>+ </wicket:fragment>+ <wicket:fragment wicket:id="dateFrag">+ <span wicket:id="name"></span>+ <span wicket:id="date"></span></wicket:fragment><wicket:fragment wicket:id="commitFrag"><a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>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.javaindex d69344d5ac..2a76bea168 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,6 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;-import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;@@ -419,12 +418,20 @@ public abstract class BuildListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId, IModel<Build> rowModel) {- Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);+ Fragment fragment = new Fragment(componentId, "buildFrag", BuildListPanel.this);Build build = rowModel.getObject();Long buildId = build.getId();Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDashboardPage.class,BuildDashboardPage.paramsOf(build, getQueryPosition(cellItem)));+ link.add(new BuildStatusIcon("icon", new LoadableDetachableModel<Status>() {++ @Override+ protected Status load() {+ return getBuildManager().load(buildId).getStatus();+ }++ }));link.add(new Label("label", new AbstractReadOnlyModel<String>() {@Override@@ -439,26 +446,49 @@ public abstract class BuildListPanel extends Panel {return builder.toString();}- }) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(newBuildObserver(buildId));- setOutputMarkupId(true);- }-- });+ }));fragment.add(link);+ fragment.add(newBuildObserver(buildId));+ fragment.setOutputMarkupId(true);cellItem.add(fragment);}});- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildQueryConstants.FIELD_STATUS)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(BuildQueryConstants.FIELD_JOB)) {@Overridepublic String getCssClass() {- return "status";+ return "job";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();+ if (SecurityUtils.canReadCode(build.getProject())) {+ Fragment fragment = new Fragment(componentId, "jobFrag", BuildListPanel.this);+ Link<Void> link = new JobDefLink("link", build.getCommitId(), build.getJobName()) {++ @Override+ protected Project getProject() {+ return rowModel.getObject().getProject();+ }++ };+ link.add(new Label("label", build.getJobName()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, build.getJobName()));+ }+ }+ });++ columns.add(new AbstractColumn<Build, Void>(Model.of("Date")) {++ @Override+ public String getCssClass() {+ return "date expanded";}@Override@@ -466,20 +496,8 @@ public abstract class BuildListPanel extends Panel {Build build = rowModel.getObject();Long buildId = build.getId();- Fragment fragment = new Fragment(componentId, "statusFrag", BuildListPanel.this);- fragment.add(new BuildStatusIcon("icon", new LoadableDetachableModel<Status>() {-- @Override- protected Status load() {- return getBuildManager().load(buildId).getStatus();- }-- }));-- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDashboardPage.class,- BuildDashboardPage.paramsOf(build, getQueryPosition(cellItem)));-- link.add(new Label("name", new AbstractReadOnlyModel<String>() {+ Fragment fragment = new Fragment(componentId, "dateFrag", BuildListPanel.this);+ fragment.add(new Label("name", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -496,7 +514,7 @@ public abstract class BuildListPanel extends Panel {}});- link.add(new Label("date", new LoadableDetachableModel<String>() {+ fragment.add(new Label("date", new LoadableDetachableModel<String>() {@Overrideprotected String load() {@@ -504,42 +522,11 @@ public abstract class BuildListPanel extends Panel {}}));- fragment.add(link);fragment.add(newBuildObserver(buildId));fragment.setOutputMarkupId(true);cellItem.add(fragment);}- });-- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildQueryConstants.FIELD_JOB)) {-- @Override- public String getCssClass() {- return "job";- }-- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {- Build build = rowModel.getObject();- if (SecurityUtils.canReadCode(build.getProject())) {- Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);- Link<Void> link = new JobDefLink("link", build.getCommitId(), build.getJobName()) {-- @Override- protected Project getProject() {- return rowModel.getObject().getProject();- }-- };- link.add(new Label("label", build.getJobName()));- fragment.add(link);- cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, build.getJobName()));- }- }- });+ });columns.add(new AbstractColumn<Build, Void>(Model.of(BuildQueryConstants.FIELD_COMMIT)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.htmlindex ae7f39a186..ad9fec0392 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html@@ -27,10 +27,10 @@</div></div><wicket:fragment wicket:id="commitFrag">- <div class="avatar pull-left">+ <div class="avatar"><span wicket:id="avatar"></span></div>- <div class="detail pull-left">+ <div class="detail"><div class="message-and-labels clearfix"><div wicket:id="message" class="message pull-left"></div><div wicket:id="labels" class="pull-left">@@ -39,17 +39,19 @@</div><div wicket:id="contribution"></div></div>- <span class="btn-group browse pull-right">- <a wicket:id="browseCode" title="Browse code" class="btn btn-default"><i class="fa fa-file-text-o"></i></a>- <wicket:enclosure>- <a wicket:id="compare" class="compare btn btn-default" title="Compare with base revision"><i class="fa fa-ext fa-file-diff"></i></a>- </wicket:enclosure>- </span>- <span class="btn-group hash pull-right">- <a wicket:id="hashLink" class="btn btn-default hash"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a>- </span>- <span wicket:id="buildStatus" class="build-status pull-right"></span>+ <div class="actions">+ <span wicket:id="buildStatus" class="build-status"></span>+ <span class="btn-group hash">+ <a wicket:id="hashLink" class="btn btn-default hash"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a>+ </span>+ <span class="btn-group browse">+ <a wicket:id="browseCode" title="Browse code" class="btn btn-default"><i class="fa fa-file-text-o"></i></a>+ <wicket:enclosure>+ <a wicket:id="compare" class="compare btn btn-default" title="Compare with base revision"><i class="fa fa-ext fa-file-diff"></i></a>+ </wicket:enclosure>+ </span>+ </div></wicket:fragment><wicket:fragment wicket:id="dateFrag"><i class="fa fa-calendar"></i> <span wicket:id="date"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex e5e2a4783a..858ba1d936 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -593,7 +593,7 @@ public abstract class CommitListPanel extends Panel {item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));getCommitIdsToQueryStatus().add(commit.copy());- item.add(new CommitStatusPanel("buildStatus", commit.copy()) {+ CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy()) {@Overrideprotected String getCssClasses() {@@ -605,9 +605,21 @@ public abstract class CommitListPanel extends Panel {return CommitListPanel.this.getProject();}- });+ };+ item.add(commitStatus);++ item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {- item.add(AttributeAppender.append("class", "commit clearfix"));+ @Override+ protected String load() {+ commitStatus.configure();+ if (commitStatus.isVisible())+ return "commit with-status";+ else+ return "commit";+ }++ }));} else {item = new Fragment(itemId, "dateFrag", this);DateTime dateTime = new DateTime(current.get(index+1).getCommitterIdent().getWhen());diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.cssindex 7bc7115c90..410cb4b1a9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css@@ -1,8 +1,3 @@-@media(max-width: 991px) {- .commit-list li.commit>.actions {- display: none;- }-}.commit-list {position: relative;}@@ -27,11 +22,12 @@font-size: 16px;}.commit-list>.body>ul>li {- padding: 4px 0;+ padding: 4px 8px;position: relative;}.commit-list>.body li.commit>.avatar {- margin-top: 4px;+ left: 8px;+ top: 8px;position: absolute;}.commit-list>.body .label {@@ -44,7 +40,16 @@}.commit-list>.body .commit>.detail {padding-left: 48px;- padding-right: 8px;+ padding-right: 180px;+ word-break: break-all;+}+.commit-list>.body .commit.with-status>.detail {+ padding-right: 240px;+}+.commit-list>.body .commit>.actions {+ position: absolute;+ right: 8px;+ top: 8px;}.commit-list>.body li.commit:hover, .commit-list>.body li.commit.hover {@@ -62,10 +67,7 @@.commit-list>.body .message-and-labels .commit-message {margin-right: 8px;}-.commit-list>.body .commit>.pull-right {- margin: 6px 0 0 8px;-}-.commit-list>.body .commit>.pull-right.hash {+.commit-list>.body .commit>.actions>span {margin-left: 4px;}.commit-list>.body>.list {@@ -85,3 +87,14 @@border-bottom: 1px solid #EEE;}+@media(max-width: 991px) {+ .commit-list li.commit .hash, .commit-list li.commit .browse {+ display: none;+ }+ .commit-list>.body .commit>.detail {+ padding-right: 0;+ }+ .commit-list>.body .commit.with-status>.detail {+ padding-right: 60px;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex c8d6c949a6..23550d6d63 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -169,10 +169,12 @@ public abstract class IssueActivitiesPanel extends Panel {if (anchor != null)row.setMarkupId(anchor);- if (activity.getUser() != null)+ if (activity.getUser() != null) {row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));- else+ row.add(AttributeAppender.append("class", "with-avatar"));+ } else {row.add(new WebMarkupContainer("avatar").setVisible(false));+ }row.add(activity.render("content", new DeleteCallback() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.htmlindex 8153866db6..98ce2380ed 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html@@ -1,14 +1,16 @@<wicket:panel>- <div class="commit clearfix">- <div wicket:id="author" class="author pull-left"></div>- <div wicket:id="message" class="message pull-left"></div>- <div class="btn-group pull-right browse">- <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>- </div>- <div class="btn-group pull-right hash">- <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>- </div>- <div wicket:id="buildStatus" class="build-status pull-right"></div>+ <div wicket:id="commit">+ <div wicket:id="author" class="author"></div>+ <div wicket:id="message" class="message"></div>+ <div class="actions">+ <span wicket:id="buildStatus" class="build-status"></span>+ <span class="btn-group hash">+ <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>+ </span>+ <span class="btn-group browse">+ <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>+ </span>+ </div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.javaindex 687d1af600..97a98fd62c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.issue.activities.activity;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;@@ -49,9 +50,12 @@ public abstract class IssueCommittedPanel extends GenericPanel<RevCommit> {RevCommit commit = getModelObject();- add(new PersonIdentPanel("author", commit.getAuthorIdent(), "Author", Mode.AVATAR));+ WebMarkupContainer container = new WebMarkupContainer("commit");+ add(container);++ container.add(new PersonIdentPanel("author", commit.getAuthorIdent(), "Author", Mode.AVATAR));- add(new CommitMessagePanel("message", getModel()) {+ container.add(new CommitMessagePanel("message", getModel()) {@Overrideprotected Project getProject() {@@ -60,7 +64,7 @@ public abstract class IssueCommittedPanel extends GenericPanel<RevCommit> {});- add(new CommitStatusPanel("buildStatus", ObjectId.fromString(commitHash)) {+ CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", ObjectId.fromString(commitHash)) {@Overrideprotected String getCssClasses() {@@ -72,21 +76,36 @@ public abstract class IssueCommittedPanel extends GenericPanel<RevCommit> {return getIssue().getProject();}- });+ };+ container.add(commitStatus);Project project = getIssue().getProject();CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();PageParameters params = CommitDetailPage.paramsOf(project, commitState);Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);- add(hashLink);+ container.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));- add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));+ container.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);params = ProjectBlobPage.paramsOf(project, browseState);- add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));+ container.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));++ container.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ commitStatus.configure();+ if (commitStatus.isVisible())+ return "commit with-status";+ else+ return "commit";+ }++ }));+}protected abstract Issue getIssue();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.htmlindex 6b1f170428..95d4b0c904 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.html@@ -1,6 +1,6 @@<wicket:panel>- <div class="pull-request clearfix">- <span wicket:id="title" class="title pull-left"></span>- <span wicket:id="state" class="state pull-right"></span>+ <div class="pull-request title-and-status">+ <div wicket:id="title" class="title"></div>+ <div wicket:id="state" class="status"></div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.cssindex bccec3da44..8cf2ccea64 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css@@ -39,11 +39,6 @@.issue-activities .activity>.content>.body {margin-top: 8px;}-.issue-activities .activity>.content>.body>.referenced-from .label,-.issue-activities .activity>.content>.body>.pull-request .label {- line-height: inherit;- margin-left: 8px;-}.issue-activities .activity>.content>.body>.actions {margin-top: 8px;@@ -60,16 +55,22 @@}.issue-activities .activity>.content>.body>.commit {color: #888;+ position: relative;}.issue-activities .activity>.content>.body>.commit .author {width: 28px;+ position: absolute;}.issue-activities .activity>.content>.body>.commit .message {- margin-right: 8px;+ padding: 0 128px 0 28px;+}+.issue-activities .activity>.content>.body>.commit.with-status .message {+ padding-right: 175px;}-.issue-activities .activity>.content>.body>.commit .pull-right {- margin-left: 4px;- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+.issue-activities .activity>.content>.body>.commit .actions {+ position: absolute;+ right: 0;+ top: 0;}.issue-activities .activity>.content>.head a {color: #999;@@ -88,15 +89,14 @@border-radius: 4px;}@media(max-width: 991px) {- .issue-activities>table>tbody>tr>td.avatar .avatar {- width: 24px;- height: 24px;- }- .issue-activities>table>tbody>tr>td.content {- padding-left: 6px;- }- .issue-activities .activity>.content>.body {- margin-top: 12px;- margin-left: -24px;+ .issue-activities .activity>.content>.body>.commit .browse,+ .issue-activities .activity>.content>.body>.commit .hash {+ display: none;}+ .issue-activities .activity>.content>.body>.commit .message {+ padding-right: 0;+ }+ .issue-activities .activity>.content>.body>.commit.with-status .message {+ padding-right: 45px;+ }}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.cssindex 765b282766..b02d027d4d 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,3 +1,9 @@+@media(max-width: 991px) {+ .issue-list>.body .pull-right {+ display: none;+ }+}+.issue-list>.head {position: relative;}@@ -37,11 +43,12 @@.issue-list>.body td .issue-state {font-size: 12px;}-.issue-list>.body td .primary {- margin-bottom: 8px;-}.issue-list>.body td .secondary>.pull-left>div {margin-right: 20px;+ margin-top: 8px;+}+.issue-list>.body td .secondary>.pull-right {+ margin-top: 8px;}.issue-list>.body td .submission, .issue-list>.body td .comments, .issue-list>.body td .votes {color: #888;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.htmlindex 0a7210fd8b..8114f86924 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html@@ -1,6 +1,6 @@<wicket:panel>- <div class="referenced-from clearfix">- <span wicket:id="title" class="pull-left"></span>- <span wicket:id="state" class="pull-right"></span>+ <div class="referenced-from title-and-status">+ <div wicket:id="title" class="title"></div>+ <div wicket:id="state" class="status"></div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.javaindex fb35e37851..3a442c056c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.issue.referencedfrom;+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.GenericPanel;import org.apache.wicket.model.LoadableDetachableModel;@@ -10,6 +12,7 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;@@ -64,4 +67,10 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {}}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TitleAndStatusCssResourceReference()));+ }+}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.cssindex e3b50d2d31..634aad505b 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@@ -1,3 +1,8 @@+@media(max-width: 991px) {+ .pull-request-list>.body .pull-right {+ display: none;+ }+}.pull-request-list>.head {position: relative;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.htmlindex 0a7210fd8b..609dabe0e7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html@@ -1,6 +1,6 @@<wicket:panel>- <div class="referenced-from clearfix">- <span wicket:id="title" class="pull-left"></span>- <span wicket:id="state" class="pull-right"></span>+ <div class="referenced-from title-and-status">+ <span wicket:id="title" class="title"></span>+ <span wicket:id="state" class="status"></span></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.javaindex 4172e59d01..4e0c5a1672 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.pullrequest.referencedfrom;+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.GenericPanel;import org.apache.wicket.model.LoadableDetachableModel;@@ -10,6 +12,7 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;import io.onedev.server.web.component.pullrequest.RequestStatusLabel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@@ -64,4 +67,10 @@ public class ReferencedFromPullRequestPanel extends GenericPanel<PullRequest> {}}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TitleAndStatusCssResourceReference()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.cssindex eb5aee9691..e0a7dc42e7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css@@ -122,7 +122,6 @@}.nav-context-dropdown.floating .menu li:hover a {background: #EEE;- color: black;}.page-title {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.cssindex 54c3c4a0c2..1612fdaae1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css@@ -1,6 +1,9 @@.build-spec {padding: 20px;}+.build-spec>.valid {+ min-width: 800px;+}.build-spec.not-defined {font-style: italic;font-size: 16px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css b/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.cssindex 3e1843cb11..c2c44c88f0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css@@ -1,3 +1,8 @@+@media(max-width: 991px) {+ #project-branches>.list>table .behind-ahead {+ display: none;+ }+}#project-branches>.list>.head>.base {width: 240px;}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.javaindex 8f7cfb2ca4..6600b8ade0 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@@ -188,7 +188,7 @@ public class MilestoneListPage extends ProjectIssuesPage {});if (SecurityUtils.canManage(getProject())) {- columns.add(new AbstractColumn<Milestone, Void>(Model.of("Actions")) {+ columns.add(new AbstractColumn<Milestone, Void>(Model.of("")) {@Overridepublic String getCssClass() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/project.css b/server-core/src/main/java/io/onedev/server/web/page/project/project.cssindex 26d6d5f474..217ba5cc4e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/project.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/project.css@@ -59,7 +59,7 @@}.project-nav-context-dropdown .info {- margin: -20px;+ margin: -20px -20px 0 -20px;}.project-nav-context-dropdown .setting ul {display: none;@@ -75,7 +75,6 @@}.project-nav-context-dropdown .setting li:hover a {background: #EEE !important;- color: black !important;}.project-nav-context-dropdown .setting li.active a {font-weight: bold !important;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex c999dc40a4..6fb60c39dd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -65,12 +65,12 @@</div><div wicket:id="operations" class="operations"><div class="buttons">- <a wicket:id="approve" class="btn btn-primary">Approve</a>- <a wicket:id="requestForChanges" class="btn btn-primary">Request for changes</a>- <a wicket:id="discard" class="btn btn-danger">Discard</a>- <a wicket:id="reopen" class="btn btn-primary">Reopen</a>- <a wicket:id="deleteSourceBranch" class="btn btn-primary">Delete source branch</a>- <a wicket:id="restoreSourceBranch" class="btn btn-primary">Restore source branch</a>+ <a wicket:id="approve" class="btn btn-sm btn-primary">Approve</a>+ <a wicket:id="requestForChanges" class="btn btn-sm btn-primary">Request for changes</a>+ <a wicket:id="discard" class="btn btn-sm btn-danger">Discard</a>+ <a wicket:id="reopen" class="btn btn-sm btn-primary">Reopen</a>+ <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-primary">Delete source branch</a>+ <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-primary">Restore source branch</a></div><div wicket:id="confirm" class="confirm"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.javaindex c848bd8d16..3f0d9c7edb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java@@ -10,7 +10,6 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.User;import io.onedev.server.util.DateUtils;import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;@@ -26,7 +25,14 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {super.onInitialize();PullRequestChange change = getModelObject();- add(new Label("user", User.from(change.getUser(), change.getUserName()).getDisplayName()));++ if (change.getUser() != null)+ add(new Label("user", change.getUser().getDisplayName()));+ else if (change.getUserName() != null)+ add(new Label("user", change.getUserName()));+ else+ add(new WebMarkupContainer("user").setVisible(false));+add(new Label("description", change.getData().getDescription()));add(new Label("age", DateUtils.formatAge(change.getDate())));add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.htmlindex 68d2701f7d..c75720e936 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html@@ -4,23 +4,21 @@</div><div class="body"><div wicket:id="tooManyCommits" class="alert alert-warning"></div>- <table>- <tr wicket:id="commits">- <td class="author"><span wicket:id="author"></span></td>- <td class="message">- <div wicket:id="message"></div>- </td>- <td class="hash-and-status clearfix">- <span class="btn-group pull-right browse">- <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>- </span>- <span class="btn-group pull-right hash">- <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>- </span>- <span wicket:id="buildStatus" class="build-status pull-right"></span>- </td>- </tr>- </table>+ <div wicket:id="commits">+ <div class="author"><span wicket:id="author"></span></div>+ <div class="message">+ <div wicket:id="message"></div>+ </div>+ <div class="actions">+ <span wicket:id="buildStatus" class="build-status"></span>+ <span class="btn-group hash">+ <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>+ </span>+ <span class="btn-group browse">+ <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>+ </span>+ </div>+ </div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex 7fa644ec45..5aacb98e01 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -81,7 +81,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {});- item.add(new CommitStatusPanel("buildStatus", commit.copy()) {+ CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy()) {@Overrideprotected String getCssClasses() {@@ -93,7 +93,8 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {return getUpdate().getRequest().getTarget().getProject();}- });+ };+ item.add(commitStatus);Project project = getUpdate().getRequest().getTarget().getProject();CommitDetailPage.State commitState = new CommitDetailPage.State();@@ -110,15 +111,18 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {params = ProjectBlobPage.paramsOf(project, browseState);item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));- if (getUpdate().getRequest().getTarget().getObjectId(false) != null) {- if (getUpdate().getRequest().getMergedCommits().contains(commit)) {- item.add(AttributeAppender.append("class", " merged"));- item.add(AttributeAppender.append("title", "This commit has been merged"));- } else if (!getUpdate().getRequest().getPendingCommits().contains(commit)) {- item.add(AttributeAppender.append("class", " rebased"));- item.add(AttributeAppender.append("title", "This commit has been rebased"));+ item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ commitStatus.configure();+ if (commitStatus.isVisible())+ return "commit with-status";+ else+ return "commit";}- }++ }));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.cssindex ab8f69b9b9..532e3efcd7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css@@ -31,23 +31,25 @@#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content .alert {margin: 16px 0;}-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td {- color: #888;- padding: 4px 0;+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit {+ position: relative;+ padding: 6px 0;}-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content tr:hover td {- background: #F5F5F5;+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.author {+ position: absolute;+ left: 0;+ top: 6px;}-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.author {- width: 28px;+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.message {+ padding: 0 130px 0 30px;}-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status {- width: 170px;- /* in order align embedded buttons */- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.with-status>.message {+ padding-right: 175px;}-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status>span {- margin-left: 4px;+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.actions {+ position: absolute;+ top: 6px;+ right: 0;}#request-detail>.main>.activities .activity>td>.content {@@ -69,10 +71,6 @@#request-detail>.main>.activities .activity>td>.body {margin-top: 8px;}-#request-detail>.main>.activities .activity>td>.body>.referenced-from .label {- line-height: inherit;- margin-left: 8px;-}#request-detail>.main>.activities .activity>td.no-body>.head {margin-top: 10px;}@@ -114,20 +112,14 @@}@media(max-width: 991px) {- #request-detail>.main>.activities .activity>td.avatar .avatar {- width: 24px;- height: 24px;- }- #request-detail>.main>.activities .activity>td.content {- padding-left: 6px;+ #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit .hash,+ #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit .browse {+ display: none;}- #request-detail>.main>.activities .activity>td>.body {- margin-top: 12px;- margin-left: -24px;+ #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.message {+ padding-right: 0;}- #request-detail>.main>.activities .activity td.hash-and-status {- display: none;+ #request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.with-status>.message {+ padding-right: 45px;}-}--+}\ No newline at end of filediff --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.cssindex 210eaa5bdf..dce9efec8c 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@@ -94,7 +94,7 @@}#request-detail>.main>.summary>.operations>.buttons>a,#request-detail>.main>.summary>.operations>.confirm>form>input {- margin-right: 12px;+ margin-right: 8px;}#request-detail>.main>.summary>.operations>.confirm>form .markdown-editor {margin-bottom: 16px;