The Unified and Autonomous Development Platform
chore: Some usability improvements
Robin Shenc514e1be9953
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.htmlindex d8a52f1138..e3f917186f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html@@ -2,8 +2,8 @@<div><wicket:svg href="history" class="icon text-gray"></wicket:svg><div class="head">- <span wicket:id="avatar" class="mr-1"></span>- <span wicket:id="name"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>+ <span wicket:id="user"></span>+ <span wicket:id="description"></span> <span wicket:id="age"></span></div><div wicket:id="body" class="body mt-3"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.javaindex 76e43eb817..2c7d2dad4c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java@@ -23,8 +23,7 @@ class IssueChangePanel extends Panel {IssueChange change = getChange();- add(new UserIdentPanel("avatar", change.getUser(), Mode.AVATAR));- add(new Label("name", change.getUser().getDisplayName()));+ add(new UserIdentPanel("user", change.getUser(), Mode.AVATAR_AND_NAME));add(new Label("description", change.getData().getActivity()));add(new Label("age", DateUtils.formatAge(change.getDate()))diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.javaindex a0d1ba940e..f2764a5903 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java@@ -49,7 +49,7 @@ class IssueCommentPanel extends Panel {super.onInitialize();add(new UserIdentPanel("avatar", getComment().getUser(), Mode.AVATAR));- add(new Label("name", getComment().getUser().getDisplayName()));+ add(new UserIdentPanel("name", getComment().getUser(), Mode.NAME));add(new Label("age", DateUtils.formatAge(getComment().getDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(getComment().getDate()))));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.htmlindex ef4f96f4b3..65f0f82eb7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html@@ -2,8 +2,8 @@<div><wicket:svg href="info" class="icon text-gray"></wicket:svg><div class="head">- <span wicket:id="avatar" class="mr-1"></span>- <span wicket:id="name"></span> logged work (<span wicket:id="workingPeriod"></span>) <span wicket:id="age"></span>+ <span wicket:id="user"></span>+ logged work (<span wicket:id="workingPeriod"></span>) <span wicket:id="age"></span></div><div wicket:id="body" class="body mt-3"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.javaindex b36a57159d..b5c3ba1f62 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java@@ -39,8 +39,7 @@ class IssueWorkPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new UserIdentPanel("avatar", getWork().getUser(), Mode.AVATAR));- add(new Label("name", getWork().getUser().getDisplayName()));+ add(new UserIdentPanel("user", getWork().getUser(), Mode.AVATAR_AND_NAME));var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();add(new Label("workingPeriod", timeTrackingSetting.formatWorkingPeriod(getWork().getMinutes())));add(new Label("age", DateUtils.formatAge(getWork().getDate()))diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.htmlindex 9fb4330da7..5cb27f59ef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="issue-primary border border-dashed border-primary rounded p-4"><div class="mb-3">- <span wicket:id="submitterAvatar" class="mr-1"></span>- <wicket:t><span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span></wicket:t>+ <span wicket:id="submitter"></span>+ <wicket:t>opened <span wicket:id="submitDate"></span></wicket:t><span wicket:id="submitOnBehalfOf"></span></div><div wicket:id="description"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.javaindex c811dec460..c1db721c81 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java@@ -147,8 +147,7 @@ public abstract class IssuePrimaryPanel extends Panel {super.onInitialize();Issue issue = getIssue();- add(new UserIdentPanel("submitterAvatar", issue.getSubmitter(), Mode.AVATAR));- add(new Label("submitterName", issue.getSubmitter().getDisplayName()));+ add(new UserIdentPanel("submitter", issue.getSubmitter(), Mode.AVATAR_AND_NAME));add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(issue.getSubmitDate()))));diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.javaindex c92576140d..1ed9f68c86 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/PersonIdentPanel.java@@ -77,11 +77,13 @@ public class PersonIdentPanel extends Panel {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- tag.setName("a");var user = userModel.getObject();- if (user != null) {+ if (user != null && user.getId() > 0) {+ tag.setName("a");var url = RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user));tag.put("href", url.toString());+ } else {+ tag.setName("span");}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.javaindex 50f90c34ec..e91942f67b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java@@ -64,9 +64,14 @@ public class UserIdentPanel extends GenericPanel<User> {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- tag.setName("a");- var url = RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(getUser()));- tag.put("href", url.toString());+ if (getUser().getId() > 0) {+ tag.setName("a");+ tag.put("onclick", "event.stopPropagation()");+ var url = RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(getUser()));+ tag.put("href", url.toString());+ } else {+ tag.setName("span");+ }}@Overridediff --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 6233a75b73..e20b7a7e26 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@@ -28,7 +28,7 @@<div class="primary border border-dashed border-primary rounded p-4 mb-4"><div wicket:id="description" class="description"><div class="mb-3">- <span wicket:id="submitterAvatar" class="mr-1"></span> <wicket:t><span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span></wicket:t>+ <span wicket:id="submitter"></span> <wicket:t>opened <span wicket:id="submitDate"></span></wicket:t></div><div wicket:id="content"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex b171f9cbfe..bdd928e1e3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -1634,8 +1634,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();var descriptionContainer = new WebMarkupContainer("description");- descriptionContainer.add(new UserIdentPanel("submitterAvatar", request.getSubmitter(), Mode.AVATAR));- descriptionContainer.add(new Label("submitterName", request.getSubmitter().getDisplayName()));+ descriptionContainer.add(new UserIdentPanel("submitter", request.getSubmitter(), Mode.AVATAR_AND_NAME));descriptionContainer.add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(request.getSubmitDate()))));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.htmlindex cf5e2cc782..f850b5d3c7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html@@ -2,8 +2,8 @@<div><wicket:svg href="history" class="icon text-gray"></wicket:svg><div class="head">- <span wicket:id="avatar" class="mr-1"></span>- <span wicket:id="name"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>+ <span wicket:id="user"></span>+ <span wicket:id="description"></span> <span wicket:id="age"></span><a wicket:id="changes" class="since-changes ml-2" t:data-tippy-content="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a></div><div wicket:id="body" class="body mt-3"></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 58648d1181..e0e4a8f208 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@@ -26,8 +26,7 @@ class PullRequestChangePanel extends Panel {PullRequestChange change = getChange();- add(new UserIdentPanel("avatar", change.getUser(), Mode.AVATAR));- add(new Label("name", change.getUser().getDisplayName()));+ add(new UserIdentPanel("user", change.getUser(), Mode.AVATAR_AND_NAME));add(new Label("description", change.getData().getActivity()));add(new Label("age", DateUtils.formatAge(change.getDate()))diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.javaindex e35b75d8f3..c4c705c537 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java@@ -54,7 +54,7 @@ class PullRequestCommentPanel extends Panel {super.onInitialize();add(new UserIdentPanel("avatar", getComment().getUser(), Mode.AVATAR));- add(new Label("name", getComment().getUser().getDisplayName()));+ add(new UserIdentPanel("name", getComment().getUser(), Mode.NAME));add(new Label("age", DateUtils.formatAge(getComment().getDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(getComment().getDate()))));