Skip to content

The Unified and Autonomous Development Platform

chore: Show workspaces and some other icons on hover to avoid cluttering the page

Robin Shen885df5570465
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.html
index f95af5f12c..0960a5fe65 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
@@ -45,15 +45,15 @@
<a wicket:id="compare" t:data-tippy-content="Compare with base revision" class="mr-2"><wicket:svg href="diff" class="icon"></wicket:svg></a>
</wicket:enclosure>
<a wicket:id="signature" class="mr-2"></a>
- <a wicket:id="buildStatus" class="build-status mr-2"></a>
- <a wicket:id="workspaces" class="mr-2 text-nowrap" t:data-tippy-content="Workspaces at this commit"><wicket:svg href="workspace" class="icon"/> <wicket:svg href="arrow" class="icon rotate-90"/></a>
</div>
<div class="labels">
<wicket:container wicket:id="labels">
<span wicket:id="label" class="badge badge-info badge-sm mr-2"></span>
</wicket:container>
</div>
- </div>
+ <a wicket:id="buildStatus" class="build-status mr-2"></a>
+ <a wicket:id="workspaces" class="mr-2 text-nowrap workspaces" t:data-tippy-content="Workspaces at this commit"><wicket:svg href="workspace" class="icon"/> <wicket:svg href="arrow" class="icon rotate-90"/></a>
+ </div>
<div wicket:id="contribution"></div>
</div>
<div class="btn-group hash d-none d-xl-flex ml-auto actions">
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.css
index fe5875b153..4997efdcad 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
@@ -44,6 +44,13 @@
padding-left: 0.6rem;
padding-right: 0.6rem;
}
+ .commit-list li.commit .workspaces, .commit-list li.commit .no-builds {
+ display: none;
+ }
+ .commit-list li.commit:hover .workspaces,
+ .commit-list li.commit:hover .no-builds {
+ display: inline-block;
+ }
.commit-list li.commit:hover, .commit-list li.commit.hover {
background: var(--light);
}
@@ -176,4 +183,4 @@
min-width: 360px;
max-width: 420px;
padding: 1rem;
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
index 79f002574a..5ce459e24b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
@@ -118,6 +118,8 @@ public abstract class CommitStatusLink extends DropdownLink {
}));
add(AttributeAppender.append("class", "commit-status text-nowrap"));
+ if (statusModel.getObject() == null)
+ add(AttributeAppender.append("class", "no-builds"));
}
protected Collection<String> getChangeObservables() {
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 a333dae9c4..e249e4e0ee 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
@@ -54,35 +54,41 @@
</div>
</div>
<wicket:fragment wicket:id="contentFrag">
- <div class="primary d-flex mb-3">
- <div class="mr-4 flex-grow-1 d-flex flex-wrap row-gap-2">
- <span wicket:id="numberAndTitle" class="mr-2"></span>
- <a wicket:id="copy" t:data-tippy-content="Copy issue number and title" class="copy mr-2 btn btn-icon btn-xs btn-light btn-hover-primary">
- <wicket:svg href="copy" class="icon"/>
- </a>
- <a wicket:id="workspaces" class="workspaces mr-2 btn btn-icon btn-xs btn-light btn-hover-primary" t:data-tippy-content="Workspaces on this issue"><wicket:svg href="workspace" class="icon"/></a>
- <a wicket:id="pin" t:data-tippy-content="Pin this issue" class="pin mr-2 btn btn-icon btn-xs btn-light btn-hover-primary">
- <wicket:svg href="pin" class="icon"/>
- </a>
- <span wicket:id="progress" class="d-flex align-items-center mr-2"></span>
- <span wicket:id="links" class="d-flex align-items-center links"></span>
- </div>
- <div class="flex-shrink-0 d-none d-lg-block text-muted">
- <span class="votes mr-2" t:data-tippy-content="Votes">
- <wicket:svg href="thumb-up" class="icon"></wicket:svg> <span wicket:id="votes"></span>
- </span>
- <span class="comments" t:data-tippy-content="Comments">
- <wicket:svg href="comments" class="icon"></wicket:svg> <span wicket:id="comments"></span>
- </span>
+ <div class="issue-item">
+ <div class="primary d-flex mb-3">
+ <div class="mr-4 flex-grow-1 d-flex flex-wrap row-gap-2">
+ <span wicket:id="numberAndTitle" class="mr-2"></span>
+ <a wicket:id="copy" t:data-tippy-content="Copy issue number and title" class="copy mr-2 btn btn-icon btn-xs btn-light btn-hover-primary">
+ <wicket:svg href="copy" class="icon"/>
+ </a>
+ <span wicket:id="progress" class="d-flex align-items-center mr-2"></span>
+ <a wicket:id="workspaces" class="workspaces mr-2 btn btn-icon btn-xs btn-light btn-hover-primary" t:data-tippy-content="Workspaces on this issue"><wicket:svg href="workspace" class="icon"/></a>
+ <a wicket:id="pin" t:data-tippy-content="Pin this issue" class="pin mr-2 btn btn-icon btn-xs btn-light btn-hover-primary">
+ <wicket:svg href="pin" class="icon"/>
+ </a>
+ </div>
+ <div class="flex-shrink-0 d-none d-lg-block text-muted">
+ <span class="votes mr-2" t:data-tippy-content="Votes">
+ <wicket:svg href="thumb-up" class="icon"></wicket:svg> <span wicket:id="votes"></span>
+ </span>
+ <span class="comments" t:data-tippy-content="Comments">
+ <wicket:svg href="comments" class="icon"></wicket:svg> <span wicket:id="comments"></span>
+ </span>
+ </div>
</div>
- </div>
- <div class="secondary d-flex flex-wrap">
- <div class="flex-grow-1 d-flex flex-wrap">
- <div wicket:id="fields" class="field mr-1 mr-last-child-0"></div>
+ <div class="secondary d-flex flex-wrap">
+ <div class="flex-grow-1 d-flex flex-wrap">
+ <div wicket:id="fields" class="field mr-1 mr-last-child-0"></div>
+ </div>
+ <div class="last-update d-none d-lg-block text-muted font-size-sm">
+ <a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
+ </div>
</div>
- <div class="last-update d-none d-lg-block text-muted font-size-sm">
- <a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
+ <wicket:enclosure child="links">
+ <div class="links-row d-flex flex-wrap mt-2">
+ <span wicket:id="links" class="d-flex align-items-center links"></span>
</div>
+ </wicket:enclosure>
</div>
<wicket:enclosure child="linkedIssues">
<div class="linked-issues pl-4">
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 6e4c7089fd..0411999264 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
@@ -59,4 +59,17 @@
}
.dark-mode .issue-list .linked-issue {
border-top-color: var(--dark-mode-light-dark);
+}
+
+@media(min-width: 992px) {
+ .issue-list>div>.body tr.issue .issue-item .no-estimate,
+ .issue-list>div>.body tr.issue .issue-item .workspaces,
+ .issue-list>div>.body tr.issue .issue-item .pin {
+ display: none !important;
+ }
+ .issue-list>div>.body tr.issue .issue-item:hover .no-estimate,
+ .issue-list>div>.body tr.issue .issue-item:hover .workspaces,
+ .issue-list>div>.body tr.issue .issue-item:hover .pin {
+ display: inline-flex !important;
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/IssueProgressPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/IssueProgressPanel.java
index 75ff4d5fb5..c2be45a295 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/IssueProgressPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/IssueProgressPanel.java
@@ -1,19 +1,11 @@
package io.onedev.server.web.component.issue.progress;
-import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
-import io.onedev.server.service.StopwatchService;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Stopwatch;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.behavior.CompletionRateBehavior;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.util.WicketUtils;
+import java.util.Collection;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -22,7 +14,18 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import java.util.Collection;
+import com.google.common.collect.Sets;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Stopwatch;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.StopwatchService;
+import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.behavior.CompletionRateBehavior;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.util.WicketUtils;
public abstract class IssueProgressPanel extends Panel {
@@ -133,6 +136,13 @@ public abstract class IssueProgressPanel extends Panel {
return OneDev.getInstance(StopwatchService.class);
}
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (getIssue().getTotalEstimatedTime() == 0 && getStopWatch() == null)
+ tag.append("class", "no-estimate", " ");
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
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 59eef8907e..877dfc7ef7 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
@@ -45,8 +45,8 @@
<span wicket:id="number" class="number ml-1 text-muted"></span>
<a wicket:id="link" class="d-none"></a>
</span>
- <a wicket:id="workspaces" class="workspaces mr-2 btn btn-icon btn-xs btn-light btn-hover-primary" t:data-tippy-content="Workspaces on source branch"><wicket:svg href="workspace" class="icon"/></a>
<span wicket:id="labels" class="d-flex align-items-center mr-2"></span>
+ <a wicket:id="workspaces" class="workspaces mr-2 btn btn-icon btn-xs btn-light btn-hover-primary" t:data-tippy-content="Workspaces on source branch"><wicket:svg href="workspace" class="icon"/></a>
</div>
<div class="flex-shrink-0 d-none d-lg-block text-muted">
<span class="comments" t:data-tippy-content="Comments">
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 e180693b48..5e6d3f933f 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
@@ -30,4 +30,13 @@
.pull-request-list .number, .pull-request-list .title {
font-size: 1.175rem;
font-weight: 500;
+}
+
+@media(min-width: 992px) {
+ .pull-request-list>div>.body tr.request .workspaces {
+ display: none !important;
+ }
+ .pull-request-list>div>.body tr.request:hover .workspaces {
+ display: inline-flex !important;
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index b5761539d4..4c9a87d03e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -729,21 +729,11 @@ table>thead>tr>th.minimum:last-child, table>tbody>tr>td.minimum:last-child {
}
.pressable:not(.btn):not(.input-group-addon) {
- color: var(--gray);
position: relative;
}
.dark-mode .pressable:not(.btn):not(.input-group-addon) {
- color: var(--dark-mode-gray);
position: relative;
}
-.pressable:hover:not(.btn):not(.input-group-addon),
-.pressable:active:not(.btn):not(.input-group-addon) {
- color: var(--dark);
-}
-.dark-mode .pressable:hover:not(.btn):not(.input-group-addon),
-.dark-mode .pressable:active:not(.btn):not(.input-group-addon) {
- color: var(--dark-mode-light-gray);
-}
.pressable:active:not(.btn):not(.input-group-addon) {
left: 1px;
top: 1px;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
index 212f0142ee..9cfe3c7bd7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -20,9 +20,9 @@
<wicket:fragment wicket:id="branchFrag">
<div class="title my-2">
<a wicket:id="branchLink" class="name mr-2"><span wicket:id="name"></span></a>
- <a wicket:id="buildStatus" class="build-status mr-2"></a>
- <a wicket:id="workspaces" t:data-tippy-content="Workspaces on this branch" class="mr-2"><wicket:svg href="workspace" class="icon"/> <wicket:svg href="arrow" class="icon rotate-90"/></a>
<span class="badge badge-info badge-sm mr-2" wicket:id="default"><wicket:t>default</wicket:t></span>
+ <a wicket:id="buildStatus" class="build-status mr-2"></a>
+ <a wicket:id="workspaces" t:data-tippy-content="Workspaces on this branch" class="mr-2 workspaces"><wicket:svg href="workspace" class="icon"/> <wicket:svg href="arrow" class="icon rotate-90"/></a>
</div>
<div class="commit-message mb-2">
<span wicket:id="message"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 888d2ac4b4..1757846965 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -752,6 +752,13 @@ public class ProjectBranchesPage extends ProjectPage {
add(branchesTable = new DefaultDataTable<RefFacade, Void>("branches", columns, dataProvider,
PAGE_SIZE, pagingHistorySupport) {
+ @Override
+ protected Item<RefFacade> newRowItem(String id, int index, IModel<RefFacade> model) {
+ Item<RefFacade> item = super.newRowItem(id, index, model);
+ item.add(AttributeAppender.append("class", "branch-item"));
+ return item;
+ }
+
@Override
protected void onBeforeRender() {
buildService.queryStatus(getProject(), getCommitIdsToDisplay());
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.css
index 5996cff540..7fe23ee38f 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
@@ -64,6 +64,15 @@
padding-right: 0;
}
}
+@media(min-width: 992px) {
+ .project-branches .body>table tr .workspaces, .project-branches .body>table tr .no-builds {
+ display: none;
+ }
+ .project-branches .body>table tr:hover .workspaces,
+ .project-branches .body>table tr:hover .no-builds {
+ display: inline-block;
+ }
+}
#searching-branches {
background: url(/~img/ajax-indicator-big.png) no-repeat scroll center center;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
index 80ce651ec0..45dab4d911 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
@@ -1,19 +1,25 @@
<wicket:panel>
<div wicket:id="content"></div>
<wicket:fragment wicket:id="contentFrag">
- <div class="primary d-flex align-items-center flex-wrap row-gap-2 mb-3">
- <span wicket:id="numberAndTitle" class="font-weight-bold mr-1"></span>
- <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-2" t:data-tippy-content="Copy issue number and title"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- <a wicket:id="workspaces" class="btn btn-xs btn-icon btn-light btn-hover-primary workspaces flex-shrink-0 mr-2" t:data-tippy-content="Workspaces on this issue"><wicket:svg href="workspace" class="icon"></wicket:svg></a>
- <span wicket:id="links" class="links mr-2"></span>
- <a wicket:id="showDetail" t:data-tippy-content="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a>
- </div>
- <div class="secondary d-flex align-items-center flex-wrap mb-n2">
- <div wicket:id="fields" class="field mr-1 mr-last-child-0"></div>
- <div class="avatars-and-progress ml-auto d-flex align-items-center flex-wrap">
- <div wicket:id="avatars" class="avatar"></div>
- <div wicket:id="progress" class="d-flex align-items-center mr-2 mb-2"></div>
+ <div class="issue-item">
+ <div class="primary d-flex align-items-center flex-wrap row-gap-2 mb-3">
+ <span wicket:id="numberAndTitle" class="font-weight-bold mr-1"></span>
+ <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-2" t:data-tippy-content="Copy issue number and title"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <div wicket:id="progress" class="d-flex align-items-center mr-2"></div>
+ <a wicket:id="workspaces" class="btn btn-xs btn-icon btn-light btn-hover-primary workspaces flex-shrink-0 mr-2" t:data-tippy-content="Workspaces on this issue"><wicket:svg href="workspace" class="icon"></wicket:svg></a>
+ <a wicket:id="showDetail" t:data-tippy-content="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a>
+ </div>
+ <div class="secondary d-flex align-items-center flex-wrap mb-n2">
+ <div wicket:id="fields" class="field mr-1 mr-last-child-0"></div>
+ <div class="avatars ml-auto d-flex align-items-center flex-wrap">
+ <div wicket:id="avatars" class="avatar"></div>
+ </div>
+ </div>
+ <wicket:enclosure child="links">
+ <div class="links-row d-flex flex-wrap mt-3">
+ <span wicket:id="links" class="d-flex align-items-center links"></span>
</div>
+ </wicket:enclosure>
</div>
<wicket:enclosure child="linkedIssues">
<div class="linked-issues pl-3">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
index 88a498e11f..ee85bfc62f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
@@ -158,3 +158,14 @@
display: none;
}
+@media(min-width: 992px) {
+ .board-card .issue-item .no-estimate,
+ .board-card .issue-item .workspaces {
+ display: none !important;
+ }
+ .board-card .issue-item:hover .no-estimate,
+ .board-card .issue-item:hover .workspaces {
+ display: inline-flex !important;
+ }
+}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
index 480043664a..d386f06e0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
@@ -8,18 +8,19 @@ import java.util.List;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
-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.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
import com.google.common.collect.Sets;
+import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -33,7 +34,7 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.PersonIdentPanel;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
class PullRequestUpdatePanel extends Panel {
@@ -106,12 +107,12 @@ class PullRequestUpdatePanel extends Panel {
});
Project project = getUpdate().getRequest().getTarget().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);
- item.add(hashLink);
+ BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TREE.getBits());
+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
+ PageParameters params = ProjectBlobPage.paramsOf(project, browseState);
+ var hashLink = new ViewStateAwarePageLink<Void>("hashLink", ProjectBlobPage.class, params);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
+ item.add(hashLink);
item.add(new CopyToClipboardLink("copyHash", Model.of(commit.name())));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
index bf427a0817..e4d26737db 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
@@ -18,9 +18,9 @@
<div class="title my-2">
<a wicket:id="tagLink" class="name mr-2"><span wicket:id="name"></span></a>
<a wicket:id="signature" class="mr-2"></a>
+ <span wicket:id="annotated" class="annotated mr-2"></span>
<a wicket:id="buildStatus" class="build-status mr-2"></a>
- <a wicket:id="workspaces" t:data-tippy-content="Workspaces at this tag" class="mr-2"><wicket:svg href="workspace" class="icon"/> <wicket:svg href="arrow" class="icon rotate-90"/></a>
- <span wicket:id="annotated" class="annotated"></span>
+ <a wicket:id="workspaces" t:data-tippy-content="Workspaces at this tag" class="mr-2 workspaces"><wicket:svg href="workspace" class="icon"/> <wicket:svg href="arrow" class="icon rotate-90"/></a>
</div>
<div class="commit-message mb-2">
<span wicket:id="message"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css b/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css
index 7df2487a11..e58eae006c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css
@@ -22,3 +22,12 @@
border-left-color: var(--dark-mode-lighter-dark);
}
+@media(min-width: 992px) {
+ .project-tags .body>table tr .workspaces, .project-tags .body>table tr .no-builds {
+ display: none;
+ }
+ .project-tags .body>table tr:hover .workspaces,
+ .project-tags .body>table tr:hover .no-builds {
+ display: inline-block;
+ }
+}