The Unified and Autonomous Development Platform
feat: update workspace section in issue and pull request side panels
Robin Shen4dad085a22ee
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex 0725a663a8..6039939735 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -48,6 +48,14 @@<a wicket:id="create" class="btn btn-outline-secondary btn-sm flex-shrink-0"><wicket:svg href="plus" class="icon mr-2"></wicket:svg><wicket:t>Create</wicket:t></a></div></div>+ <wicket:enclosure child="workspaces">+ <div class="workspaces">+ <div class="head"><wicket:t>Workspaces</wicket:t></div>+ <div class="body">+ <a wicket:id="workspaces" class="btn btn-outline-secondary btn-sm"><wicket:svg href="workspace" class="icon mr-2"/><wicket:t>Show / Create</wicket:t> <wicket:svg href="arrow" class="icon rotate-90"/></a>+ </div>+ </div>+ </wicket:enclosure><div wicket:id="votes" class="votes"><div class="head"><wicket:t>Issue Votes</wicket:t> (<span wicket:id="count"></span>)@@ -61,11 +69,6 @@<a wicket:id="vote" class="btn btn-outline-secondary btn-sm vote"><wicket:svg href="thumb-up" class="icon mr-2"></wicket:svg> <span wicket:id="label"></span></a></div></div>- <wicket:enclosure child="workspaces">- <div class="workspaces">- <a wicket:id="workspaces" t:data-tippy-content="Workspaces on this issue" class="btn btn-outline-secondary btn-sm"><wicket:t>Workspaces</wicket:t> <wicket:svg href="arrow" class="icon rotate-90"/></a>- </div>- </wicket:enclosure><div wicket:id="watches" class="watches"></div><div wicket:id="externalParticipants" class="external-participants"><div class="head"><wicket:t>External Participants</wicket:t></div>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 f690c33325..b077f0f24c 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@@ -159,6 +159,14 @@</tr></table></div>+ <wicket:enclosure child="workspaces">+ <div class="workspaces">+ <div class="head"><wicket:t>Workspaces</wicket:t></div>+ <div class="body">+ <a wicket:id="workspaces" class="btn btn-outline-secondary btn-sm"><wicket:svg href="workspace" class="icon mr-2"/><wicket:t>Show / Create</wicket:t> <wicket:svg href="arrow" class="icon rotate-90"/></a>+ </div>+ </div>+ </wicket:enclosure><wicket:enclosure child="reviews"><div class="reviews"><div class="head"><wicket:t>Reviewers</wicket:t></div>@@ -166,11 +174,6 @@<div wicket:id="reviewerHelp" class="font-size-sm text-muted form-text"><wicket:t>Pull request can only be merged after getting approvals from all reviewers</wicket:t></div></div></wicket:enclosure>- <wicket:enclosure child="workspaces">- <div class="workspaces">- <a wicket:id="workspaces" t:data-tippy-content="Workspaces on source branch" class="btn btn-outline-secondary btn-sm"><wicket:t>Workspaces</wicket:t> <wicket:svg href="arrow" class="icon rotate-90"/></a>- </div>- </wicket:enclosure><wicket:enclosure child="jobs"><div class="jobs"><div class="head">