The Unified and Autonomous Development Platform
Tune some ui elements
Robin Shenac60c2c332e7
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.htmlindex b9f643fe11..b11e29a178 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html@@ -1,18 +1,24 @@<wicket:panel>- <div class="simple-build-list">- <wicket:enclosure child="showInList">- <div class="head">- <span>Builds</span>- <a wicket:id="showInList" class="show-in-list" title="Show in build list"><i class="fa fa-list-ul"></i></a>- </div>- </wicket:enclosure>- <div class="body">- <div wicket:id="builds">- <a wicket:id="build" class="build">- <span wicket:id="status" class="status"></span>- <span wicket:id="title" class="title"></span>- </a>- </div>- </div>- </div>+ <div wicket:id="content" class="simple-build-list"></div>+ <wicket:fragment wicket:id="hasBuildsFrag">+ <div class="has-builds">+ <wicket:enclosure child="showInList">+ <div class="head">+ <span>Builds</span>+ <a wicket:id="showInList" class="show-in-list" title="Show in build list"><i class="fa fa-list-ul"></i></a>+ </div>+ </wicket:enclosure>+ <div class="body">+ <div wicket:id="builds">+ <a wicket:id="build" class="build">+ <span wicket:id="status" class="status"></span>+ <span wicket:id="title" class="title"></span>+ </a>+ </div>+ </div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="noBuildsFrag">+ <div class="no-builds">No builds</div>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.javaindex 08d18e3830..c7a0f5e250 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java@@ -11,6 +11,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -37,44 +38,42 @@ public class SimpleBuildListPanel extends GenericPanel<List<Build>> {protected void onInitialize() {super.onInitialize();- add(newListLink("showInList"));-- add(new ListView<Build>("builds", getModel()) {-- @Override- protected void populateItem(ListItem<Build> item) {- Build build = item.getModelObject();-- Link<Void> buildLink = new BookmarkablePageLink<Void>("build",- BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));-- Long buildId = build.getId();- buildLink.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {+ Fragment fragment;+ if (!getBuilds().isEmpty()) {+ fragment = new Fragment("content", "hasBuildsFrag", this);+ fragment.add(newListLink("showInList"));++ fragment.add(new ListView<Build>("builds", getModel()) {- @Override- protected Status load() {- return OneDev.getInstance(BuildManager.class).load(buildId).getStatus();- }+ @Override+ protected void populateItem(ListItem<Build> item) {+ Build build = item.getModelObject();- }));+ Link<Void> buildLink = new BookmarkablePageLink<Void>("build",+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));++ Long buildId = build.getId();+ buildLink.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {- StringBuilder builder = new StringBuilder("#" + build.getNumber());- if (build.getVersion() != null)- builder.append(" (" + build.getVersion() + ")");- buildLink.add(new Label("title", builder.toString()));- item.add(buildLink);- }-- });- add(new WebMarkupContainer("noBuilds") {+ @Override+ protected Status load() {+ return OneDev.getInstance(BuildManager.class).load(buildId).getStatus();+ }++ }));- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getBuilds().isEmpty());- }-- });+ StringBuilder builder = new StringBuilder("#" + build.getNumber());+ if (build.getVersion() != null)+ builder.append(" (" + build.getVersion() + ")");+ buildLink.add(new Label("title", builder.toString()));+ item.add(buildLink);+ }++ });+ } else {+ fragment = new Fragment("content", "noBuildsFrag", this);+ }+ add(fragment);}protected Component newListLink(String componentId) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.cssindex 2121466286..e11e319f58 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css@@ -1,35 +1,34 @@.simple-build-list {padding: 12px;}-.simple-build-list>.head {+.simple-build-list>.has-builds>.head {padding: 4px 0;border-bottom: 1px solid #DDD;margin-bottom: 4px;min-width: 100px;white-space: nowrap;}-.simple-build-list>.head>span {+.simple-build-list>.has-builds>.head>span {font-weight: bold;font-size: 15px;display: inline-block;margin-right: 8px;}-.simple-build-list>.head>a {+.simple-build-list>.has-builds>.head>a {color: #666;}-.simple-build-list>.body>div>.build {+.simple-build-list>.has-builds>.body>div>.build {padding: 4px 0;display: block;text-decoration: none;white-space: nowrap;}-.simple-build-list>.body>div>.build>.status {+.simple-build-list>.has-builds>.body>div>.build>.status {margin-right: 8px;}-.simple-build-list>.body>div>.build:hover {+.simple-build-list>.has-builds>.body>div>.build:hover {background: #F0F0F0;}-.simple-build-list>.body>.no-builds {+.simple-build-list>.no-builds {font-style: italic;- padding: 12px;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.htmlindex c9762b7339..07c11aaddd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html@@ -9,7 +9,6 @@<a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play"></i></a></div><div wicket:id="detail" class="body"></div>- <div wicket:id="noBuilds" class="body"><i>No builds</i></div></div></div></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex 05dbb7f253..1b038ff1cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -146,24 +146,7 @@ public abstract class CommitStatusPanel extends Panel {}};- jobItem.add(new SimpleBuildListPanel("detail", buildsModel) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!buildsModel.getObject().isEmpty());- }-- });- jobItem.add(new WebMarkupContainer("noBuilds") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(buildsModel.getObject().isEmpty());- }-- });+ jobItem.add(new SimpleBuildListPanel("detail", buildsModel));jobItem.setOutputMarkupId(true);jobsView.add(jobItem);diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css b/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.cssindex e91a43daad..447ba66893 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css@@ -26,4 +26,7 @@}.commit-status-detail>.job>.body .simple-build-list {padding: 0;+}+.commit-status-detail>.job>.body .no-builds {+ padding: 0;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex a77acf081b..ca94a3fdcf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -60,7 +60,7 @@ public class CISpecBlobViewPanel extends BlobViewPanel {protected Project getProject() {return context.getProject();}-+});navsView.add(nav);jobsView.add(BeanContext.view(jobsView.newChildId(), job));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.cssindex 8e90e16196..99fa5a3223 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css@@ -49,6 +49,8 @@.ci-spec>.valid>div>.body>.side>.navs>.nav {position: relative;background: #444;+ border-radius: 4px;+ margin-bottom: 8px;}.ci-spec>.valid>div>.body>.side>.navs>.nav a {color: #BBB;@@ -65,12 +67,6 @@.ci-spec>.valid>div>.body>.side>.navs>.nav.active {background: #080808;}-.ci-spec>.valid>div>.body>.side>.navs>.nav:first-child {- border-radius: 4px 4px 0 0;-}-.ci-spec>.valid>div>.body>.side>.navs>.nav:last-child {- border-radius: 0 0 4px 4px;-}.ci-spec>.valid>div>.body>.side>.navs>.nav:first-child:last-child {border-radius: 4px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 3ef97f0b3b..20fddff8a6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -269,7 +269,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new SimpleBuildListPanel(id, new LoadableDetachableModel<List<Build>>() {+ IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {@@ -279,7 +279,9 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {return builds;}- }) {+ };++ return new SimpleBuildListPanel(id, buildsModel) {@Overrideprotected Component newListLink(String componentId) {@@ -318,12 +320,6 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {tag.put("class", cssClasses);tag.put("title", title);}-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(getProject().getCommitStatus(commitId).get(job.getName()) != null);- }};detailLink.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.cssindex be731e7651..a2316b9610 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css@@ -88,6 +88,3 @@#commit-detail>.jobs>.job {margin-right: 20px;}-#commit-detail>.jobs>.job .no-builds i {- display: none;-}\ No newline at end of file