The Unified and Autonomous Development Platform
chore: Use profile instead of overview for user nav
Robin Shenb5c5489501cd
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex a8f4beb9b8..09c1c1358e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -86,35 +86,35 @@ public class UserResource {this.emailAddressManager = emailAddressManager;}- private ProfileData getProfileData(User user) {- var profile = new ProfileData();- profile.setDisabled(user.isDisabled());- profile.setServiceAccount(user.isServiceAccount());- profile.setName(user.getName());- profile.setFullName(user.getFullName());+ private BasicSetting getBasicSetting(User user) {+ var basicSetting = new BasicSetting();+ basicSetting.setDisabled(user.isDisabled());+ basicSetting.setServiceAccount(user.isServiceAccount());+ basicSetting.setName(user.getName());+ basicSetting.setFullName(user.getFullName());if (!user.isServiceAccount())- profile.setNotifyOwnEvents(user.isNotifyOwnEvents());- return profile;+ basicSetting.setNotifyOwnEvents(user.isNotifyOwnEvents());+ return basicSetting;}- @Api(order=100)+ @Api(order=100, name="Get Basic Settings")@Path("/{userId}")@GET- public ProfileData getProfile(@PathParam("userId") Long userId) {+ public BasicSetting getBasicSetting(@PathParam("userId") Long userId) {User user = userManager.load(userId);if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getAuthUser()))throw new UnauthorizedException();- return getProfileData(user);+ return getBasicSetting(user);}- @Api(order=200)+ @Api(order=200, name="Get Basic Settings of Current User")@Path("/me")@GET- public ProfileData getMyProfile() {+ public BasicSetting getMyBasicSetting() {User user = SecurityUtils.getAuthUser();if (user == null)throw new UnauthorizedException();- return getProfileData(user);+ return getBasicSetting(user);}@Api(order=250)@@ -283,16 +283,16 @@ public class UserResource {return queriesAndWatches;}- @Api(order=1800)+ @Api(order=1800, name="Query Basic Settings")@GET- public List<ProfileData> queryProfile(+ public List<BasicSetting> queryBasicSetting(@QueryParam("term") @Api(description="Any string in login name, full name or email address") String term,@QueryParam("offset") @Api(example="0") int offset,@QueryParam("count") @Api(example="100") int count) {if (!SecurityUtils.isAdministrator())throw new UnauthorizedException();- return userManager.query(term, offset, count).stream().map(this::getProfileData).collect(toList());+ return userManager.query(term, offset, count).stream().map(this::getBasicSetting).collect(toList());}@Api(order=1850)@@ -339,10 +339,10 @@ public class UserResource {}}- @Api(order=1950, description="Update user profile")+ @Api(order=1950, name="Update Basic Settings")@Path("/{userId}")@POST- public Response updateProfile(@PathParam("userId") Long userId, @NotNull @Valid ProfileUpdateData data) {+ public Response updateBasicSetting(@PathParam("userId") Long userId, @NotNull @Valid BasicSettingUpdateData data) {User user = userManager.load(userId);if (SecurityUtils.isAdministrator() || user.equals(SecurityUtils.getAuthUser())) {User existingUser = userManager.findByName(data.getName());@@ -577,7 +577,7 @@ public class UserResource {}}- public static class ProfileData implements Serializable {+ public static class BasicSetting implements Serializable {private static final long serialVersionUID = 1L;@Api(order=10, description="Whether or not the user is disabled")@@ -636,7 +636,7 @@ public class UserResource {}}- public static class ProfileUpdateData implements Serializable {+ public static class BasicSettingUpdateData implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/info.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/info.svgnew file mode 100644index 0000000000..f5ec659dec--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/info.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1749007233543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6110" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M288.3 415.9h446.61c17.63 0 31.92-14.3 31.92-31.94s-14.29-31.94-31.92-31.94H288.3c-17.64 0-31.9 14.29-31.9 31.94 0 17.65 14.26 31.94 31.9 31.94z m127.6-223.59h191.42c52.86-0.02 95.7-42.91 95.69-95.8 0-52.94-42.87-95.82-95.69-95.82H415.9a95.69 95.69 0 0 0-67.68 28.08 95.796 95.796 0 0 0-28.01 67.74c-0.01 52.9 42.82 95.78 95.69 95.8z m0-127.74h191.42c17.63 0 31.93 14.3 31.93 31.94s-14.29 31.94-31.93 31.94H415.9c-17.63 0-31.93-14.3-31.93-31.94s14.29-31.94 31.93-31.94z m350.92 511.01c-0.01-17.62-14.29-31.91-31.9-31.92H288.3c-17.62 0-31.91 14.29-31.91 31.93 0 17.63 14.29 31.93 31.91 31.93h446.61c17.62-0.01 31.91-14.3 31.91-31.94z m95.71-511.01h-95.71v63.88h95.71c17.62 0.01 31.9 14.31 31.9 31.94v766.54c0 17.63-14.28 31.93-31.9 31.94H160.69c-17.62-0.01-31.9-14.31-31.9-31.94V160.39c0-17.63 14.28-31.93 31.9-31.94h95.71V64.57h-95.71c-52.86 0.03-95.7 42.93-95.69 95.82v766.54c0 52.93 42.86 95.82 95.69 95.82h701.84a95.707 95.707 0 0 0 67.68-28.08 95.779 95.779 0 0 0 28.01-67.74V160.39c0-52.91-42.86-95.82-95.69-95.82zM288.3 735.29c-17.64 0-31.9 14.29-31.9 31.94 0 17.65 14.26 31.94 31.9 31.94h255.21c17.63 0 31.92-14.3 31.92-31.94s-14.29-31.94-31.92-31.94H288.3z m0 0" p-id="6111"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/mail.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/mail.svgindex 4869370992..5e86b95bcc 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/mail.svg+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/mail.svg@@ -1,4 +1 @@-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">- <path d='M970.56 267.52a85.76 85.76 0 0 0 0-10.24v-2.88l-17.92 1.6 15.68-3.84v-3.52A141.44 141.44 0 0 0 960 227.2a128 128 0 0 0-11.2-20.48 123.84 123.84 0 0 0-103.04-54.72H176.96a123.84 123.84 0 0 0-102.72 55.36 128 128 0 0 0-11.84 22.72 124.8 124.8 0 0 0-6.72 22.72l16 3.2h-16.64a81.92 81.92 0 0 0-1.6 11.84v512a124.48 124.48 0 0 0 124.16 124.16h668.8a124.48 124.48 0 0 0 124.16-124.16v-512zM883.2 304v448a64 64 0 0 1-64 64H205.12a64 64 0 0 1-64-64v-448a64 64 0 0 1 1.92-16l334.4 267.84 2.56 3.2a48.96 48.96 0 0 0 26.88 11.84h6.08a42.24 42.24 0 0 0 31.04-11.84L880.96 288a62.08 62.08 0 0 1 2.24 16zM512 472.96l-290.88-233.6h581.76z' />-</svg>\ No newline at end of file+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1749007443681" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10722" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1024.00144 220.64v574.32c0 5.76-0.736 11.456-1.824 17.072v0.064l-0.224 0.944A84.336 84.336 0 0 1 939.29744 880H101.08944a102.72 102.72 0 0 1-82.512-40.832 95.904 95.904 0 0 1-18.56-57.248V236.256a74.08 74.08 0 0 1 52.064-70.784l0.736-0.208 0.208-0.08A127.648 127.648 0 0 1 89.66544 160h883.424c1.328 0.512 2.64 1.232 4.032 1.44 25.52 4.32 40.592 19.152 45.344 44.496v0.08c0.88 4.816 1.536 9.712 1.536 14.608zM512.00144 591.232l451.152-379.472c-66.272-3.888-888.48-1.728-897.84 2.368L512.00144 591.2v0.064z m133.856-45.152l-114.112 96.144c-13.76 11.52-25.6 11.664-39.2 0.208l-48.272-40.752-63.84-53.936L81.02544 825.28l1.024 2.304h873.328L645.79344 546.08h0.064z m-304.864-31.68L51.79344 270.032v512.48l289.28-268.096h-0.08z m344.352-1.648l287.088 260.96V270.944L685.34544 512.768z" p-id="10723"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/work-log.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/work-log.svgdeleted file mode 100644index 9e2edfcc93..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/work-log.svg+++ /dev/null@@ -1 +0,0 @@-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1695195266711" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1481" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M811.993 992l-599.988 0c-66.289 0-119.988-53.746-119.988-119.988l0-599.989c0-66.289 53.699-120.035 119.988-120.035l89.979 0 0-59.972 80.828 0c25.968-35.722 73.813-60.017 129.186-60.017s103.22 24.295 129.187 60.017l80.782 0 0 59.972 90.025 0c66.243 0 119.989 53.746 119.989 120.035l0 599.989c0.001 66.242-53.745 119.988-119.988 119.988l0 0zM661.997 151.989l-66.661 0c0-33.122-37.301-59.972-83.337-59.972-46.035 0-83.337 26.85-83.337 59.972l-66.659 0 0 120.035 299.994 0 0-120.035zM871.964 272.023c0-33.168-26.85-60.017-59.971-60.017l-90.025 0 0 119.988-419.982 0 0-119.988-89.979 0c-33.121 0-60.018 26.85-60.018 60.017l0 599.989c0 33.12 26.898 59.97 60.018 59.97l599.988 0c33.121 0 59.971-26.85 59.971-59.97l0-599.989-0.001 0zM721.968 811.993l-419.982 0c-16.537 0-29.963-13.425-29.963-30.008 0-16.584 13.425-30.009 29.963-30.009l419.982 0c16.583 0 30.008 13.425 30.008 30.009-0.001 16.583-13.426 30.008-30.008 30.008l0 0zM721.968 661.996l-419.982 0c-16.537 0-29.963-13.425-29.963-30.008 0-16.537 13.425-30.008 29.963-30.008l419.982 0c16.583 0 30.008 13.471 30.008 30.008-0.001 16.584-13.426 30.008-30.008 30.008l0 0zM721.968 512l-419.982 0c-16.537 0-29.963-13.425-29.963-30.009s13.425-30.009 29.963-30.009l419.982 0c16.583 0 30.008 13.425 30.008 30.009s-13.426 30.009-30.008 30.009l0 0z" p-id="1482"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.htmlindex 26e5d95945..916fee015a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html@@ -21,7 +21,7 @@<div class="issue-activity-options"><a wicket:id="showComments" t:data-tippy-content="Toggle comments" class="btn btn-xs text-muted btn-active-secondary btn-icon"><wicket:svg href="comments" class="icon"></wicket:svg></a><a wicket:id="showChangeHistory" t:data-tippy-content="Toggle change history" class="btn btn-xs text-muted btn-active-secondary btn-icon"><wicket:svg href="history" class="icon"></wicket:svg></a>- <a wicket:id="showWorkLog" t:data-tippy-content="Toggle work log" class="btn btn-xs text-muted btn-active-secondary btn-icon"><wicket:svg href="work-log" class="icon"></wicket:svg></a>+ <a wicket:id="showWorkLog" t:data-tippy-content="Toggle work log" class="btn btn-xs text-muted btn-active-secondary btn-icon"><wicket:svg href="info" class="icon"></wicket:svg></a></div></wicket:fragment></wicket:panel>\ No newline at end of filediff --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 7c438e220b..ef4f96f4b3 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@@ -1,6 +1,6 @@<wicket:panel><div>- <wicket:svg href="work-log" class="icon text-gray"></wicket:svg>+ <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>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.javaindex 2a866eabba..77a4f60cc9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java@@ -57,7 +57,7 @@ import io.onedev.server.web.component.select2.SelectToActChoice;import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;-import io.onedev.server.web.page.user.profile.UserProfilePage;+import io.onedev.server.web.page.user.basicsetting.UserBasicSettingPage;public abstract class IssueAuthorizationsPanel extends Panel {@@ -172,8 +172,8 @@ public abstract class IssueAuthorizationsPanel extends Panel {IModel<IssueAuthorization> rowModel) {User user = rowModel.getObject().getUser();Fragment fragment = new Fragment(componentId, "nameFrag", IssueAuthorizationsPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", UserProfilePage.class,- UserProfilePage.paramsOf(user));+ Link<Void> link = new BookmarkablePageLink<Void>("link", UserBasicSettingPage.class,+ UserBasicSettingPage.paramsOf(user));link.add(new UserAvatar("avatar", user));link.add(new Label("name", user.getDisplayName()));fragment.add(link);diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.javaindex 72cb949762..c5ea41744b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.profileedit;+package io.onedev.server.web.component.user.basicsetting;import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;import static io.onedev.server.web.translation.Translation._T;@@ -21,13 +21,13 @@ import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-public class ProfileEditPanel extends GenericPanel<User> {+public class BasicSettingPanel extends GenericPanel<User> {private BeanEditor editor;private String oldName;- public ProfileEditPanel(String id, IModel<User> model) {+ public BasicSettingPanel(String id, IModel<User> model) {super(id, model);}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 9a78ba5bd2..c92576140d 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@@ -20,7 +20,7 @@ import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.component.user.card.PersonCardPanel;-import io.onedev.server.web.page.user.overview.UserOverviewPage;+import io.onedev.server.web.page.user.profile.UserProfilePage;public class PersonIdentPanel extends Panel {@@ -80,7 +80,7 @@ public class PersonIdentPanel extends Panel {tag.setName("a");var user = userModel.getObject();if (user != null) {- var url = RequestCycle.get().urlFor(UserOverviewPage.class, UserOverviewPage.paramsOf(user));+ var url = RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user));tag.put("href", url.toString());}}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 6306ce4e36..50f90c34ec 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@@ -17,7 +17,7 @@ import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.component.user.card.UserCardPanel;-import io.onedev.server.web.page.user.overview.UserOverviewPage;+import io.onedev.server.web.page.user.profile.UserProfilePage;public class UserIdentPanel extends GenericPanel<User> {@@ -65,7 +65,7 @@ public class UserIdentPanel extends GenericPanel<User> {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);tag.setName("a");- var url = RequestCycle.get().urlFor(UserOverviewPage.class, UserOverviewPage.paramsOf(getUser()));+ var url = RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(getUser()));tag.put("href", url.toString());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.htmlsimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.htmlindex 1a4b754719..a5e960bade 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="user-overview d-flex m-n5 no-autofocus">+ <div class="user-profile d-flex m-n5 no-autofocus"><div class="flex-shrink-0 info p-5 border-right d-none d-lg-block text-center"><img wicket:id="avatar"><div wicket:id="name" class="mt-4"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.javaindex 5bebc802df..2d5afaf0b0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview;+package io.onedev.server.web.component.user.profile;import static io.onedev.server.web.translation.Translation._T;@@ -72,29 +72,29 @@ import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.component.taskbutton.TaskResult;import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.component.user.UserDeleteLink;-import io.onedev.server.web.component.user.overview.activity.ApprovePullRequest;-import io.onedev.server.web.component.user.overview.activity.CommentIssue;-import io.onedev.server.web.component.user.overview.activity.CommentPullRequest;-import io.onedev.server.web.component.user.overview.activity.CommitCode;-import io.onedev.server.web.component.user.overview.activity.CreateCodeComment;-import io.onedev.server.web.component.user.overview.activity.DiscardPullRequest;-import io.onedev.server.web.component.user.overview.activity.MergePullRequest;-import io.onedev.server.web.component.user.overview.activity.OpenIssue;-import io.onedev.server.web.component.user.overview.activity.OpenPullRequest;-import io.onedev.server.web.component.user.overview.activity.ReopenPullRequest;-import io.onedev.server.web.component.user.overview.activity.ReplyCodeComment;-import io.onedev.server.web.component.user.overview.activity.RequestChangesToPullRequest;-import io.onedev.server.web.component.user.overview.activity.ResolveCodeComment;-import io.onedev.server.web.component.user.overview.activity.TransitIssue;-import io.onedev.server.web.component.user.overview.activity.UnresolveCodeComment;-import io.onedev.server.web.component.user.overview.activity.UserActivity;+import io.onedev.server.web.component.user.profile.activity.ApprovePullRequest;+import io.onedev.server.web.component.user.profile.activity.CommentIssue;+import io.onedev.server.web.component.user.profile.activity.CommentPullRequest;+import io.onedev.server.web.component.user.profile.activity.CommitCode;+import io.onedev.server.web.component.user.profile.activity.CreateCodeComment;+import io.onedev.server.web.component.user.profile.activity.DiscardPullRequest;+import io.onedev.server.web.component.user.profile.activity.MergePullRequest;+import io.onedev.server.web.component.user.profile.activity.OpenIssue;+import io.onedev.server.web.component.user.profile.activity.OpenPullRequest;+import io.onedev.server.web.component.user.profile.activity.ReopenPullRequest;+import io.onedev.server.web.component.user.profile.activity.ReplyCodeComment;+import io.onedev.server.web.component.user.profile.activity.RequestChangesToPullRequest;+import io.onedev.server.web.component.user.profile.activity.ResolveCodeComment;+import io.onedev.server.web.component.user.profile.activity.TransitIssue;+import io.onedev.server.web.component.user.profile.activity.UnresolveCodeComment;+import io.onedev.server.web.component.user.profile.activity.UserActivity;import io.onedev.server.web.page.user.password.UserPasswordPage;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.TextUtils;import io.onedev.server.web.util.WicketUtils;import io.onedev.server.xodus.CommitInfoManager;-public abstract class UserOverviewPanel extends GenericPanel<User> {+public abstract class UserProfilePanel extends GenericPanel<User> {private static final int PAGE_SIZE = 100;@@ -118,7 +118,7 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {private final Map<String, String> translations = new HashMap<>();- public UserOverviewPanel(String id, IModel<User> model, @Nullable DateRange dateRange) {+ public UserProfilePanel(String id, IModel<User> model, @Nullable DateRange dateRange) {super(id, model);translations.put("user-activities-commits-note", _T("Commits are taken from default branch of non-forked repositories"));@@ -339,7 +339,7 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {@Overrideprotected User getUser() {- return UserOverviewPanel.this.getUser();+ return UserProfilePanel.this.getUser();}@Override@@ -360,11 +360,11 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {dateRangePicker.add(new AjaxFormComponentUpdatingBehavior("change") {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- var newPanel = new UserOverviewPanel("overview", getModel(), dateRangePicker.getModelObject()) {+ var newPanel = new UserProfilePanel("overview", getModel(), dateRangePicker.getModelObject()) {@Overrideprotected void onDateRangeChanged(AjaxRequestTarget target, DateRange dateRange) {- UserOverviewPanel.this.onDateRangeChanged(target, dateRange);+ UserProfilePanel.this.onDateRangeChanged(target, dateRange);}};@@ -542,12 +542,12 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new UserOverviewResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new UserProfileResourceReference()));var mapper = OneDev.getInstance(ObjectMapper.class);try {response.render(OnDomReadyHeaderItem.forScript(String.format(- "onedev.server.userOverview.onDomReady(%s, %d, %d, %s, %s, %s);",+ "onedev.server.userProfile.onDomReady(%s, %d, %d, %s, %s, %s);",mapper.writeValueAsString(activityStatsByDay),fromDate.toEpochDay(),toDate.toEpochDay(),diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfileResourceReference.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfileResourceReference.javaindex 3e75aa3268..e56d60c96c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfileResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview;+package io.onedev.server.web.component.user.profile;import java.util.List;@@ -10,10 +10,10 @@ import io.onedev.server.web.asset.echarts.EChartsResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class UserOverviewResourceReference extends BaseDependentResourceReference {+public class UserProfileResourceReference extends BaseDependentResourceReference {- public UserOverviewResourceReference() {- super(UserOverviewResourceReference.class, "user-overview.js");+ public UserProfileResourceReference() {+ super(UserProfileResourceReference.class, "user-profile.js");}@Override@@ -21,7 +21,7 @@ public class UserOverviewResourceReference extends BaseDependentResourceReferencvar dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new EChartsResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(- UserOverviewResourceReference.class, "user-overview.css")));+ UserProfileResourceReference.class, "user-profile.css")));return dependencies;}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ApprovePullRequest.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ApprovePullRequest.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ApprovePullRequest.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ApprovePullRequest.javaindex f1623b680a..fa34937c5a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ApprovePullRequest.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ApprovePullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;import static org.unbescape.html.HtmlEscape.escapeHtml5;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CodeCommentActivity.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CodeCommentActivity.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CodeCommentActivity.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CodeCommentActivity.javaindex a89d4dba5b..a90f81bc2f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CodeCommentActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CodeCommentActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommentIssue.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommentIssue.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommentIssue.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommentIssue.javaindex a4713d92f1..40b0c87cfe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommentIssue.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommentIssue.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommentPullRequest.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommentPullRequest.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommentPullRequest.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommentPullRequest.javaindex fa78a76d82..50fba6afe8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommentPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommentPullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommitCode.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommitCode.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommitCode.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommitCode.javaindex 76dd458154..406e88c273 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CommitCode.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CommitCode.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;import static org.unbescape.html.HtmlEscape.escapeHtml5;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CreateCodeComment.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CreateCodeComment.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CreateCodeComment.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CreateCodeComment.javaindex bf106f7bea..837ce167a0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/CreateCodeComment.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/CreateCodeComment.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/DiscardPullRequest.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/DiscardPullRequest.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/DiscardPullRequest.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/DiscardPullRequest.javaindex 11a6f9a6e8..d91a979725 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/DiscardPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/DiscardPullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/IssueActivity.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/IssueActivity.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/IssueActivity.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/IssueActivity.javaindex 5e5fe80e6e..7d007252fe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/IssueActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/IssueActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/MergePullRequest.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/MergePullRequest.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/MergePullRequest.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/MergePullRequest.javaindex a5d3130284..3c2b32661a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/MergePullRequest.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/MergePullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/OpenIssue.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/OpenIssue.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/OpenIssue.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/OpenIssue.javaindex 8a7f0f133b..c9d55ec247 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/OpenIssue.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/OpenIssue.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/OpenPullRequest.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/OpenPullRequest.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/OpenPullRequest.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/OpenPullRequest.javaindex 8b1e14998f..7d0c7ca871 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/OpenPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/OpenPullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/PullRequestActivity.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/PullRequestActivity.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/PullRequestActivity.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/PullRequestActivity.javaindex aedadb3498..87cf1e8b16 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/PullRequestActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/PullRequestActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ReopenPullRequest.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ReopenPullRequest.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ReopenPullRequest.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ReopenPullRequest.javaindex 13b8813325..d6847e91b0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ReopenPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ReopenPullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ReplyCodeComment.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ReplyCodeComment.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ReplyCodeComment.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ReplyCodeComment.javaindex d817dd9c3a..dc79b27311 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ReplyCodeComment.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ReplyCodeComment.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/RequestChangesToPullRequest.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/RequestChangesToPullRequest.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/RequestChangesToPullRequest.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/RequestChangesToPullRequest.javaindex 8787c6c50b..0d8e78aa7e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/RequestChangesToPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/RequestChangesToPullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ResolveCodeComment.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ResolveCodeComment.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ResolveCodeComment.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ResolveCodeComment.javaindex e58ce54e35..12ff9e59ba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/ResolveCodeComment.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/ResolveCodeComment.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/TransitIssue.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/TransitIssue.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/TransitIssue.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/TransitIssue.javaindex f97256bcd2..8019031f01 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/TransitIssue.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/TransitIssue.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UnresolveCodeComment.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/UnresolveCodeComment.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UnresolveCodeComment.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/UnresolveCodeComment.javaindex 5276df0fdb..1f2ed72f14 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UnresolveCodeComment.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/UnresolveCodeComment.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UserActivity.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/UserActivity.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UserActivity.javarename to server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/UserActivity.javaindex a12654f2f4..0d54c22630 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UserActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/activity/UserActivity.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.user.overview.activity;+package io.onedev.server.web.component.user.profile.activity;import java.io.Serializable;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.css b/server-core/src/main/java/io/onedev/server/web/component/user/profile/user-profile.csssimilarity index 62%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.cssrename to server-core/src/main/java/io/onedev/server/web/component/user/profile/user-profile.cssindex c07a80e10d..63fa818328 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.css+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/user-profile.css@@ -1,23 +1,23 @@-.user-overview .info {+.user-profile .info {width: 240px;}-.user-overview>.info .avatar {+.user-profile>.info .avatar {width: 160px;height: 160px;}-.user-overview .activities, .user-overview .daily-stats {+.user-profile .activities, .user-profile .daily-stats {min-width: 0;max-width: 100%;width: fit-content;}-.user-overview .date-range {+.user-profile .date-range {width: 200px;}/* Contribution Calendar Styles */-.user-overview .contribution-calendar {+.user-profile .contribution-calendar {font-size: 12px;width: 100%;max-width: 100%;@@ -27,7 +27,7 @@box-sizing: border-box;}-.user-overview .calendar-months {+.user-profile .calendar-months {position: relative; /* For absolute positioning of month labels */height: 12px; /* Fixed height for month row */margin-left: 25px; /* ADDED - to align with week columns after day labels */@@ -35,7 +35,7 @@white-space: nowrap;}-.user-overview .month-label {+.user-profile .month-label {position: absolute; /* Will be positioned by JS */text-align: left;font-size: 10px;@@ -44,17 +44,17 @@text-overflow: ellipsis;}-.dark-mode .user-overview .month-label {+.dark-mode .user-profile .month-label {color: #8b949e;}-.user-overview .calendar-body {+.user-profile .calendar-body {display: inline-flex; /* Changed from flex to inline-flex */white-space: nowrap; /* Prevent wrapping */padding: 1px; /* Add padding to make hover outlines visible */}-.user-overview .calendar-day-labels {+.user-profile .calendar-day-labels {width: 24px; /* ADDED - explicit width for day labels like 'Wed' */flex-shrink: 0; /* ADDED - prevent shrinking */display: flex;@@ -66,7 +66,7 @@font-family: monospace;}-.user-overview .day-label {+.user-profile .day-label {height: 12px; /* Match day-cell height */line-height: 12px;font-size: 10px;@@ -75,28 +75,28 @@margin-bottom: 2px; /* Add margin to match gap between cells */}-.user-overview .day-label:last-child {+.user-profile .day-label:last-child {margin-bottom: 0; /* Remove margin from last label */}-.dark-mode .user-overview .day-label {+.dark-mode .user-profile .day-label {color: #8b949e;}-.user-overview .calendar-week-columns {+.user-profile .calendar-week-columns {display: inline-flex; /* Changed from flex to inline-flex */gap: 2px; /* Horizontal gap between weeks */flex-wrap: nowrap; /* Explicitly prevent wrapping */padding-right: 1px; /* Add padding to make rightmost hover outlines visible */}-.user-overview .calendar-week {+.user-profile .calendar-week {display: flex;flex-direction: column;gap: 2px; /* Vertical gap between days in a week */}-.user-overview .calendar-day-cell {+.user-profile .calendar-day-cell {width: 12px;height: 12px;background-color: #ebedf0; /* Default, no activity */@@ -104,71 +104,71 @@box-sizing: border-box;}-.dark-mode .user-overview .calendar-day-cell {+.dark-mode .user-profile .calendar-day-cell {background-color: #36364F; /* Dark mode default */}-.user-overview .calendar-day-cell.disabled {+.user-profile .calendar-day-cell.disabled {background-color: #f8f9fa; /* Lighter than default, or transparent *//* No hover effects for disabled cells */}-.dark-mode .user-overview .calendar-day-cell.disabled {+.dark-mode .user-profile .calendar-day-cell.disabled {background-color: #29293e; /* Slightly darker than previous value */}-.user-overview .calendar-day-cell:not(.disabled):hover {+.user-profile .calendar-day-cell:not(.disabled):hover {outline: 1px solid #9899ac;}-.dark-mode .user-overview .calendar-day-cell:not(.disabled):hover {+.dark-mode .user-profile .calendar-day-cell:not(.disabled):hover {outline: 1px solid #7E8299;}-.user-overview .calendar-day-cell.selected {+.user-profile .calendar-day-cell.selected {outline: 2px solid #9899ac;}-.dark-mode .user-overview .calendar-day-cell.selected {+.dark-mode .user-profile .calendar-day-cell.selected {outline: 2px solid #7E8299;}/* Contribution levels */-.user-overview .calendar-day-cell[data-level="0"]:not(.disabled) {+.user-profile .calendar-day-cell[data-level="0"]:not(.disabled) {background-color: #ebedf0;}-.user-overview .calendar-day-cell[data-level="1"]:not(.disabled) {+.user-profile .calendar-day-cell[data-level="1"]:not(.disabled) {background-color: #9be9a8;}-.user-overview .calendar-day-cell[data-level="2"]:not(.disabled) {+.user-profile .calendar-day-cell[data-level="2"]:not(.disabled) {background-color: #40c463;}-.user-overview .calendar-day-cell[data-level="3"]:not(.disabled) {+.user-profile .calendar-day-cell[data-level="3"]:not(.disabled) {background-color: #30a14e;}-.user-overview .calendar-day-cell[data-level="4"]:not(.disabled) {+.user-profile .calendar-day-cell[data-level="4"]:not(.disabled) {background-color: #216e39;}/* Dark mode contribution levels */-.dark-mode .user-overview .calendar-day-cell[data-level="0"]:not(.disabled) {+.dark-mode .user-profile .calendar-day-cell[data-level="0"]:not(.disabled) {background-color: #36364F;}-.dark-mode .user-overview .calendar-day-cell[data-level="1"]:not(.disabled) {+.dark-mode .user-profile .calendar-day-cell[data-level="1"]:not(.disabled) {background-color: #0e4429;}-.dark-mode .user-overview .calendar-day-cell[data-level="2"]:not(.disabled) {+.dark-mode .user-profile .calendar-day-cell[data-level="2"]:not(.disabled) {background-color: #006d32;}-.dark-mode .user-overview .calendar-day-cell[data-level="3"]:not(.disabled) {+.dark-mode .user-profile .calendar-day-cell[data-level="3"]:not(.disabled) {background-color: #26a641;}-.dark-mode .user-overview .calendar-day-cell[data-level="4"]:not(.disabled) {+.dark-mode .user-profile .calendar-day-cell[data-level="4"]:not(.disabled) {background-color: #39d353;}/* Legend styles */-.user-overview .contribution-legend {+.user-profile .contribution-legend {display: flex;align-items: center;justify-content: space-between;@@ -177,75 +177,75 @@color: #535370;}-.dark-mode .user-overview .contribution-legend {+.dark-mode .user-profile .contribution-legend {color: #8b949e;}/* Note styles */-.user-overview .contribution-note {+.user-profile .contribution-note {font-size: 10px;color: #535370;text-align: left;margin-left: 29px; /* Match the margin-left of calendar-months */}-.dark-mode .user-overview .contribution-note {+.dark-mode .user-profile .contribution-note {color: #8b949e;}-.user-overview .legend-elements {+.user-profile .legend-elements {display: flex;align-items: center;gap: 4px;}-.user-overview .legend-color-box {+.user-profile .legend-color-box {width: 12px;height: 12px;border-radius: 2px;box-sizing: border-box;}-.user-overview .legend-color-box[data-level="0"] {+.user-profile .legend-color-box[data-level="0"] {background-color: #ebedf0;}-.user-overview .legend-color-box[data-level="1"] {+.user-profile .legend-color-box[data-level="1"] {background-color: #9be9a8;}-.user-overview .legend-color-box[data-level="2"] {+.user-profile .legend-color-box[data-level="2"] {background-color: #40c463;}-.user-overview .legend-color-box[data-level="3"] {+.user-profile .legend-color-box[data-level="3"] {background-color: #30a14e;}-.user-overview .legend-color-box[data-level="4"] {+.user-profile .legend-color-box[data-level="4"] {background-color: #216e39;}/* Dark mode legend colors */-.dark-mode .user-overview .legend-color-box[data-level="0"] {+.dark-mode .user-profile .legend-color-box[data-level="0"] {background-color: #36364F;}-.dark-mode .user-overview .legend-color-box[data-level="1"] {+.dark-mode .user-profile .legend-color-box[data-level="1"] {background-color: #0e4429;}-.dark-mode .user-overview .legend-color-box[data-level="2"] {+.dark-mode .user-profile .legend-color-box[data-level="2"] {background-color: #006d32;}-.dark-mode .user-overview .legend-color-box[data-level="3"] {+.dark-mode .user-profile .legend-color-box[data-level="3"] {background-color: #26a641;}-.dark-mode .user-overview .legend-color-box[data-level="4"] {+.dark-mode .user-profile .legend-color-box[data-level="4"] {background-color: #39d353;}/* Timeline styles for activities */-.user-overview .detail {+.user-profile .detail {position: relative;padding-left: 20px;}-.user-overview .detail::before {+.user-profile .detail::before {content: '';position: absolute;left: 0;@@ -255,16 +255,16 @@background-color: var(--secondary);}-.dark-mode .user-overview .detail::before {+.dark-mode .user-profile .detail::before {background-color: var(--dark-mode-lighter-dark);}-.user-overview .detail li {+.user-profile .detail li {position: relative;margin-bottom: 1.5rem;}-.user-overview .detail li.activity::before {+.user-profile .detail li.activity::before {content: '';position: absolute;left: -24px;@@ -278,32 +278,32 @@box-shadow: 0 0 0 2px var(--secondary);}-.dark-mode .user-overview .detail li::before {+.dark-mode .user-profile .detail li::before {background-color: var(--dark-mode-lighter-dark);border-color: var(--dark-mode-darker);box-shadow: 0 0 0 2px var(--dark-mode-lighter-dark);}-.user-overview .detail li:last-child {+.user-profile .detail li:last-child {margin-bottom: 0;}-.user-overview .detail li[wicket\:id="more"]::before {+.user-profile .detail li[wicket\:id="more"]::before {background-color: var(--secondary);box-shadow: 0 0 0 2px var(--secondary);}-.dark-mode .user-overview .detail li[wicket\:id="more"]::before {+.dark-mode .user-profile .detail li[wicket\:id="more"]::before {background-color: var(--dark-mode-lighter-dark);box-shadow: 0 0 0 2px var(--dark-mode-lighter-dark);}-.user-overview .detail li[wicket\:id="inaccessibles"]::before {+.user-profile .detail li[wicket\:id="inaccessibles"]::before {background-color: var(--secondary);box-shadow: 0 0 0 2px var(--secondary);}-.dark-mode .user-overview .detail li[wicket\:id="inaccessibles"]::before {+.dark-mode .user-profile .detail li[wicket\:id="inaccessibles"]::before {background-color: var(--dark-mode-lighter-dark);box-shadow: 0 0 0 2px var(--dark-mode-lighter-dark);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.js b/server-core/src/main/java/io/onedev/server/web/component/user/profile/user-profile.jssimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.jsrename to server-core/src/main/java/io/onedev/server/web/component/user/profile/user-profile.jsindex f077d4b5ae..bed5064771 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.js+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/user-profile.js@@ -1,6 +1,6 @@-onedev.server.userOverview = {+onedev.server.userProfile = {onDomReady: function(activityStatsByDay, fromDay, toDay, activityStatsByType, types, translations) {- const graphContainer = $(".user-overview .daily-stats")[0];+ const graphContainer = $(".user-profile .daily-stats")[0];const DAY_IN_MS = 24 * 60 * 60 * 1000;const monthNames = [translations["jan"], translations["feb"], translations["mar"], translations["apr"], translations["may"], translations["jun"], translations["jul"], translations["aug"], translations["sep"], translations["oct"], translations["nov"], translations["dec"]];@@ -250,7 +250,7 @@ onedev.server.userOverview = {});// Add radar chart for actual activity stats- const typeStatsContainer = $(".user-overview .type-stats")[0];+ const typeStatsContainer = $(".user-profile .type-stats")[0];const chartDiv = document.createElement("div");chartDiv.style.width = "100%";chartDiv.style.height = "240px";diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 1ddcebcf9f..18a8d8f7c0 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -69,10 +69,10 @@ import io.onedev.server.web.page.admin.usermanagement.NewUserPage;import io.onedev.server.web.page.admin.usermanagement.UserListPage;import io.onedev.server.web.page.user.accesstoken.UserAccessTokensPage;import io.onedev.server.web.page.user.avatar.UserAvatarPage;+import io.onedev.server.web.page.user.basicsetting.UserBasicSettingPage;import io.onedev.server.web.page.user.emailaddresses.UserEmailAddressesPage;import io.onedev.server.web.page.user.gpgkeys.UserGpgKeysPage;import io.onedev.server.web.page.user.membership.UserMembershipsPage;-import io.onedev.server.web.page.user.overview.UserOverviewPage;import io.onedev.server.web.page.user.password.UserPasswordPage;import io.onedev.server.web.page.user.profile.UserProfilePage;import io.onedev.server.web.page.user.querywatch.UserQueryWatchesPage;@@ -86,9 +86,9 @@ import io.onedev.server.web.page.help.ResourceListPage;import io.onedev.server.web.page.issues.IssueListPage;import io.onedev.server.web.page.my.accesstoken.MyAccessTokensPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;+import io.onedev.server.web.page.my.basicsetting.MyBasicSettingPage;import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;-import io.onedev.server.web.page.my.overview.MyOverviewPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.querywatch.MyQueryWatchesPage;@@ -216,8 +216,8 @@ public class BaseUrlMapper extends CompoundRequestMapper {}private void addMyPages() {- add(new BasePageMapper("~my", MyOverviewPage.class));- add(new BasePageMapper("~my/profile", MyProfilePage.class));+ add(new BasePageMapper("~my", MyProfilePage.class));+ add(new BasePageMapper("~my/basic-setting", MyBasicSettingPage.class));add(new BasePageMapper("~my/email-addresses", MyEmailAddressesPage.class));add(new BasePageMapper("~my/avatar", MyAvatarPage.class));add(new BasePageMapper("~my/password", MyPasswordPage.class));@@ -270,8 +270,8 @@ public class BaseUrlMapper extends CompoundRequestMapper {}private void addUserPages() {- add(new BasePageMapper("~users/${user}", UserOverviewPage.class));- add(new BasePageMapper("~users/${user}/profile", UserProfilePage.class));+ add(new BasePageMapper("~users/${user}", UserProfilePage.class));+ add(new BasePageMapper("~users/${user}/basic-setting", UserBasicSettingPage.class));add(new BasePageMapper("~users/${user}/email-setting", UserEmailAddressesPage.class));add(new BasePageMapper("~users/${user}/groups", UserMembershipsPage.class));add(new BasePageMapper("~users/${user}/authorizations",diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.javaindex 8ac76defbc..c44c3101e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java@@ -62,7 +62,7 @@ import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;import io.onedev.server.web.page.admin.groupmanagement.GroupPage;-import io.onedev.server.web.page.user.profile.UserProfilePage;+import io.onedev.server.web.page.user.basicsetting.UserBasicSettingPage;public class GroupMembershipsPage extends GroupPage {@@ -317,8 +317,8 @@ public class GroupMembershipsPage extends GroupPage {IModel<Membership> rowModel) {User user = rowModel.getObject().getUser();Fragment fragment = new Fragment(componentId, "nameFrag", GroupMembershipsPage.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", UserProfilePage.class,- UserProfilePage.paramsOf(user));+ Link<Void> link = new BookmarkablePageLink<Void>("link", UserBasicSettingPage.class,+ UserBasicSettingPage.paramsOf(user));link.add(new UserAvatar("avatar", user));link.add(new Label("name", user.getDisplayName()));fragment.add(link);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.javaindex 3ab62a611b..5f7ac47795 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java@@ -31,7 +31,7 @@ import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.user.UserCssResourceReference;-import io.onedev.server.web.page.user.profile.UserProfilePage;+import io.onedev.server.web.page.user.basicsetting.UserBasicSettingPage;import io.onedev.server.web.util.editbean.NewUserBean;public class NewUserPage extends AdministrationPage {@@ -106,7 +106,7 @@ public class NewUserPage extends AdministrationPage {bean = new NewUserBean();replace(BeanContext.edit("editor", bean));} else {- setResponsePage(UserProfilePage.class, UserProfilePage.paramsOf(user));+ setResponsePage(UserBasicSettingPage.class, UserBasicSettingPage.paramsOf(user));}}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.javaindex 7a7c5f769d..eb5d43fc8c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java@@ -63,7 +63,7 @@ import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.user.UserCssResourceReference;-import io.onedev.server.web.page.user.overview.UserOverviewPage;+import io.onedev.server.web.page.user.profile.UserProfilePage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.WicketUtils;import io.onedev.server.web.util.paginghistory.PagingHistorySupport;@@ -644,7 +644,7 @@ public class UserListPage extends AdministrationPage {IModel<User> rowModel) {User user = rowModel.getObject();Fragment fragment = new Fragment(componentId, "nameFrag", UserListPage.this);- WebMarkupContainer link = new ActionablePageLink("link", UserOverviewPage.class, UserOverviewPage.paramsOf(user)) {+ WebMarkupContainer link = new ActionablePageLink("link", UserProfilePage.class, UserProfilePage.paramsOf(user)) {@Overrideprotected void doBeforeNav(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.javaindex bced0a50fe..6a501c52ed 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java@@ -59,7 +59,12 @@ public abstract class ApiHelpPage extends LayoutPage {}protected String getMethodTitle(Method resourceMethod) {- return WordUtils.capitalize(WordUtils.uncamel(resourceMethod.getName()));+ var api = resourceMethod.getAnnotation(Api.class);+ if (api != null && api.name().length() != 0) {+ return api.name();+ } else {+ return WordUtils.capitalize(WordUtils.uncamel(resourceMethod.getName()));+ }}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 72fbb8a6e8..e02462d5f8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -67,14 +67,14 @@<wicket:t>Primary <a wicket:id="noPrimaryAddressLink">email address</a> not specified</wicket:t></div></wicket:enclosure>- <a wicket:id="myOverview" class="dropdown-item">- <wicket:svg href="grid" class="icon mr-2"></wicket:svg>- <wicket:t>Overview</wicket:t>- </a><a wicket:id="myProfile" class="dropdown-item"><wicket:svg href="profile" class="icon mr-2"></wicket:svg><wicket:t>Profile</wicket:t></a>+ <a wicket:id="myBasicSetting" class="dropdown-item">+ <wicket:svg href="info" class="icon mr-2"></wicket:svg>+ <wicket:t>Basic Settings</wicket:t>+ </a><a wicket:id="myEmailSetting" class="dropdown-item"><wicket:svg href="mail" class="icon mr-2"></wicket:svg><wicket:t>Email Addresses</wicket:t>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 5fb32270a0..fa63886651 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -153,9 +153,9 @@ import io.onedev.server.web.page.help.IncompatibilitiesPage;import io.onedev.server.web.page.my.MyPage;import io.onedev.server.web.page.my.accesstoken.MyAccessTokensPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;+import io.onedev.server.web.page.my.basicsetting.MyBasicSettingPage;import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;-import io.onedev.server.web.page.my.overview.MyOverviewPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.querywatch.MyQueryWatchesPage;@@ -906,14 +906,14 @@ public abstract class LayoutPage extends BasePage {}WebMarkupContainer item;- userInfo.add(item = new ViewStateAwarePageLink<Void>("myOverview", MyOverviewPage.class));- if (getPage() instanceof MyOverviewPage)- item.add(AttributeAppender.append("class", "active"));-userInfo.add(item = new ViewStateAwarePageLink<Void>("myProfile", MyProfilePage.class));if (getPage() instanceof MyProfilePage)item.add(AttributeAppender.append("class", "active"));+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myBasicSetting", MyBasicSettingPage.class));+ if (getPage() instanceof MyBasicSettingPage)+ item.add(AttributeAppender.append("class", "active"));+if (getLoginUser() != null && !getLoginUser().isServiceAccount()) {userInfo.add(item = new ViewStateAwarePageLink<Void>("myEmailSetting", MyEmailAddressesPage.class));if (getPage() instanceof MyEmailAddressesPage)diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.htmlnew file mode 100644index 0000000000..d93f935cce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.javanew file mode 100644index 0000000000..7443ca5638--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.java@@ -0,0 +1,38 @@+package io.onedev.server.web.page.my.basicsetting;++import static io.onedev.server.web.translation.Translation._T;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.User;+import io.onedev.server.web.component.user.basicsetting.BasicSettingPanel;+import io.onedev.server.web.page.my.MyPage;++public class MyBasicSettingPage extends MyPage {++ public MyBasicSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new BasicSettingPanel("content", new AbstractReadOnlyModel<>() {++ @Override+ public User getObject() {+ return getUser();+ }++ }));+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, _T("My Basic Settings"));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/overview/MyOverviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/overview/MyOverviewPage.htmldeleted file mode 100644index 35330e3833..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/overview/MyOverviewPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="overview"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/overview/MyOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/overview/MyOverviewPage.javadeleted file mode 100644index 9ea5f8c163..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/overview/MyOverviewPage.java+++ /dev/null@@ -1,80 +0,0 @@-package io.onedev.server.web.page.my.overview;--import static io.onedev.server.web.translation.Translation._T;--import java.io.Serializable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.User;-import io.onedev.server.util.DateRange;-import io.onedev.server.web.component.user.overview.UserOverviewPanel;-import io.onedev.server.web.page.my.MyPage;--public class MyOverviewPage extends MyPage {-- private static final String PARAM_ACTIVITY_DATE_RANGE = "activityDateRange";-- private DateRange activityDateRange;-- public MyOverviewPage(PageParameters params) {- super(params);-- var activityDateRangeString = params.get(PARAM_ACTIVITY_DATE_RANGE).toString();- if (activityDateRangeString != null)- activityDateRange = DateRange.fromString(activityDateRangeString);- }-- @Override- protected Component newTopbarTitle(String componentId) {- return new Label(componentId, _T("My Overview"));- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(newUserOverview());- }-- private Component newUserOverview() {- return new UserOverviewPanel("overview", new AbstractReadOnlyModel<User>() {-- @Override- public User getObject() {- return getUser();- }-- }, activityDateRange) {-- @Override- protected void onDateRangeChanged(AjaxRequestTarget target, DateRange dateRange) {- activityDateRange = dateRange;- var url = RequestCycle.get().urlFor(MyOverviewPage.class, paramsOf(activityDateRange));- pushState(target, url.toString(), activityDateRange);- }-- };- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- super.onPopState(target, data);- activityDateRange = (DateRange) data;- var overview = newUserOverview();- replace(overview);- target.add(overview);- }-- public static PageParameters paramsOf(DateRange activityDateRange) {- var params = new PageParameters();- params.add(PARAM_ACTIVITY_DATE_RANGE, activityDateRange.toString());- return params;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.htmlindex d93f935cce..4f545cab92 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html@@ -1,3 +1,3 @@<wicket:extend>- <div wicket:id="content"></div>+ <div wicket:id="profile"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.javaindex df9fb1ce8d..ed6c6e5a0b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java@@ -2,37 +2,79 @@ package io.onedev.server.web.page.my.profile;import static io.onedev.server.web.translation.Translation._T;+import java.io.Serializable;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;-import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;+import io.onedev.server.util.DateRange;+import io.onedev.server.web.component.user.profile.UserProfilePanel;import io.onedev.server.web.page.my.MyPage;public class MyProfilePage extends MyPage {- public MyProfilePage(PageParameters params) {- super(params);- }+ private static final String PARAM_ACTIVITY_DATE_RANGE = "activityDateRange";++ private DateRange activityDateRange;++ public MyProfilePage(PageParameters params) {+ super(params);++ var activityDateRangeString = params.get(PARAM_ACTIVITY_DATE_RANGE).toString();+ if (activityDateRangeString != null)+ activityDateRange = DateRange.fromString(activityDateRangeString);+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, _T("My Profile"));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newUserProfile());+ }++ private Component newUserProfile() {+ return new UserProfilePanel("profile", new AbstractReadOnlyModel<User>() {++ @Override+ public User getObject() {+ return getUser();+ }- @Override- protected void onInitialize() {- super.onInitialize();- add(new ProfileEditPanel("content", new AbstractReadOnlyModel<>() {+ }, activityDateRange) {- @Override- public User getObject() {- return getUser();- }+ @Override+ protected void onDateRangeChanged(AjaxRequestTarget target, DateRange dateRange) {+ activityDateRange = dateRange;+ var url = RequestCycle.get().urlFor(MyProfilePage.class, paramsOf(activityDateRange));+ pushState(target, url.toString(), activityDateRange);+ }++ };+ }- }));- }+ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);+ activityDateRange = (DateRange) data;+ var profile = newUserProfile();+ replace(profile);+ target.add(profile);+ }- @Override- protected Component newTopbarTitle(String componentId) {- return new Label(componentId, _T("My Profile"));- }+ public static PageParameters paramsOf(DateRange activityDateRange) {+ var params = new PageParameters();+ params.add(PARAM_ACTIVITY_DATE_RANGE, activityDateRange.toString());+ return params;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.javaindex 26cb1ed0da..b59b5287b8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java@@ -31,10 +31,10 @@ import io.onedev.server.web.page.admin.usermanagement.UserListPage;import io.onedev.server.web.page.user.accesstoken.UserAccessTokensPage;import io.onedev.server.web.page.user.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.user.avatar.UserAvatarPage;+import io.onedev.server.web.page.user.basicsetting.UserBasicSettingPage;import io.onedev.server.web.page.user.emailaddresses.UserEmailAddressesPage;import io.onedev.server.web.page.user.gpgkeys.UserGpgKeysPage;import io.onedev.server.web.page.user.membership.UserMembershipsPage;-import io.onedev.server.web.page.user.overview.UserOverviewPage;import io.onedev.server.web.page.user.password.UserPasswordPage;import io.onedev.server.web.page.user.profile.UserProfilePage;import io.onedev.server.web.page.user.querywatch.UserQueryWatchesPage;@@ -81,8 +81,8 @@ public abstract class UserPage extends LayoutPage implements UserAware {List<PageTab> tabs = new ArrayList<>();var params = paramsOf(getUser());- tabs.add(new PageTab(Model.of(_T("Overview")), Model.of("grid"), UserOverviewPage.class, params));tabs.add(new PageTab(Model.of(_T("Profile")), Model.of("profile"), UserProfilePage.class, params));+ tabs.add(new PageTab(Model.of(_T("Basic Settings")), Model.of("info"), UserBasicSettingPage.class, params));if (!getUser().isServiceAccount())tabs.add(new PageTab(Model.of(_T("Email Addresses")), Model.of("mail"), UserEmailAddressesPage.class, params));tabs.add(new PageTab(Model.of(_T("Edit Avatar")), Model.of("avatar"), UserAvatarPage.class, params));diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/basicsetting/UserBasicSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/user/basicsetting/UserBasicSettingPage.htmlnew file mode 100644index 0000000000..d93f935cce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/user/basicsetting/UserBasicSettingPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/user/basicsetting/UserBasicSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/basicsetting/UserBasicSettingPage.javanew file mode 100644index 0000000000..2235f6de8f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/user/basicsetting/UserBasicSettingPage.java@@ -0,0 +1,20 @@+package io.onedev.server.web.page.user.basicsetting;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.component.user.basicsetting.BasicSettingPanel;+import io.onedev.server.web.page.user.UserPage;++public class UserBasicSettingPage extends UserPage {++ public UserBasicSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new BasicSettingPanel("content", userModel));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/overview/UserOverviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/user/overview/UserOverviewPage.htmldeleted file mode 100644index 35330e3833..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/user/overview/UserOverviewPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="overview"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/user/overview/UserOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/overview/UserOverviewPage.javadeleted file mode 100644index 8c829644b4..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/user/overview/UserOverviewPage.java+++ /dev/null@@ -1,85 +0,0 @@-package io.onedev.server.web.page.user.overview;--import static io.onedev.server.web.translation.Translation._T;--import java.io.Serializable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.User;-import io.onedev.server.util.DateRange;-import io.onedev.server.web.component.user.overview.UserOverviewPanel;-import io.onedev.server.web.page.user.UserPage;--public class UserOverviewPage extends UserPage {-- private static final String PARAM_ACTIVITY_DATE_RANGE = "activityDateRange";-- private DateRange activityDateRange;-- public UserOverviewPage(PageParameters params) {- super(params);-- var activityDateRangeString = params.get(PARAM_ACTIVITY_DATE_RANGE).toString();- if (activityDateRangeString != null)- activityDateRange = DateRange.fromString(activityDateRangeString);- }-- @Override- protected boolean isPermitted() {- return true;- }-- @Override- protected Component newTopbarTitle(String componentId) {- return new Label(componentId, _T("User Overview"));- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(newUserOverview());- }-- private Component newUserOverview() {- return new UserOverviewPanel("overview", new AbstractReadOnlyModel<User>() {-- @Override- public User getObject() {- return getUser();- }-- }, activityDateRange) {-- @Override- protected void onDateRangeChanged(AjaxRequestTarget target, DateRange dateRange) {- activityDateRange = dateRange;- var url = RequestCycle.get().urlFor(UserOverviewPage.class, paramsOf(getUser(), activityDateRange));- pushState(target, url.toString(), activityDateRange);- }-- };- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- super.onPopState(target, data);- activityDateRange = (DateRange) data;- var overview = newUserOverview();- replace(overview);- target.add(overview);- }-- public static PageParameters paramsOf(User user, DateRange activityDateRange) {- var params = paramsOf(user);- params.add(PARAM_ACTIVITY_DATE_RANGE, activityDateRange.toString());- return params;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.htmlindex d93f935cce..4f545cab92 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.html@@ -1,3 +1,3 @@<wicket:extend>- <div wicket:id="content"></div>+ <div wicket:id="profile"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.javaindex b6af7f28ec..885585c727 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java@@ -1,20 +1,85 @@package io.onedev.server.web.page.user.profile;+import static io.onedev.server.web.translation.Translation._T;++import java.io.Serializable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;+import io.onedev.server.model.User;+import io.onedev.server.util.DateRange;+import io.onedev.server.web.component.user.profile.UserProfilePanel;import io.onedev.server.web.page.user.UserPage;public class UserProfilePage extends UserPage {- public UserProfilePage(PageParameters params) {- super(params);- }+ private static final String PARAM_ACTIVITY_DATE_RANGE = "activityDateRange";++ private DateRange activityDateRange;++ public UserProfilePage(PageParameters params) {+ super(params);++ var activityDateRangeString = params.get(PARAM_ACTIVITY_DATE_RANGE).toString();+ if (activityDateRangeString != null)+ activityDateRange = DateRange.fromString(activityDateRangeString);+ }++ @Override+ protected boolean isPermitted() {+ return true;+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, _T("User Profile"));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newUserProfile());+ }++ private Component newUserProfile() {+ return new UserProfilePanel("profile", new AbstractReadOnlyModel<User>() {++ @Override+ public User getObject() {+ return getUser();+ }++ }, activityDateRange) {++ @Override+ protected void onDateRangeChanged(AjaxRequestTarget target, DateRange dateRange) {+ activityDateRange = dateRange;+ var url = RequestCycle.get().urlFor(UserProfilePage.class, paramsOf(getUser(), activityDateRange));+ pushState(target, url.toString(), activityDateRange);+ }++ };+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);+ activityDateRange = (DateRange) data;+ var profile = newUserProfile();+ replace(profile);+ target.add(profile);+ }- @Override- protected void onInitialize() {- super.onInitialize();- add(new ProfileEditPanel("content", userModel));- }-+ public static PageParameters paramsOf(User user, DateRange activityDateRange) {+ var params = paramsOf(user);+ params.add(PARAM_ACTIVITY_DATE_RANGE, activityDateRange.toString());+ return params;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex 36ce50ce20..38595b1e2c 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java@@ -30,6 +30,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {"<a wicket:id=\"author\" class=\"name link-gray\"></a> 于 <span wicket:id=\"date\"></span> 提交");m.put("<a wicket:id=\"author\" class=\"name link-gray\"></a> committed with <a wicket:id=\"committer\" class=\"name link-gray\"></a> <span wicket:id=\"date\"></span>","<a wicket:id=\"author\" class=\"name link-gray\"></a> 于 <span wicket:id=\"date\"></span> 由 <a wicket:id=\"committer\" class=\"name link-gray\"></a> 提交");+ m.put("<a wicket:id=\"removePassword\">Remove password</a> to force the user to authenticate via external system",+ "<a wicket:id=\"removePassword\">移除密码</a> 以强制用户通过外部系统进行身份验证");m.put("<a wicket:id=\"verifyRecoveryCode\">Verify by recovery code</a> if you can not access your TOTP authenticator","<a wicket:id=\"verifyRecoveryCode\">通过恢复代码验证</a>(如果您无法访问 TOTP 认证器)");m.put("<b class='text-danger'>NOTE: </b> This requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",@@ -49,6 +51,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("<span class='keycap'>Tab</span> or <span class='keycap'>Enter</span> to complete.","按 <span class='keycap'>Tab</span> 或 <span class='keycap'>Enter</span> 完成。");m.put("<span class='keycap'>Tab</span> to complete.", "按 <span class='keycap'>Tab</span> 完成。");+ m.put("<span wicket:id=\"activityCount\"></span> activities", "<span wicket:id=\"activityCount\"></span> 个活动");m.put("<span wicket:id=\"submitterName\" class=\"user\"></span> opened <span wicket:id=\"submitDate\"></span>","<span wicket:id=\"submitterName\" class=\"user\"></span> 于 <span wicket:id=\"submitDate\"></span> 创建");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java pattern</a> is expected here",@@ -1480,8 +1483,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Multiple On the Other Side", "多行在另一侧");m.put("Must not be empty", "不能为空");m.put("My Access Tokens", "我的访问令牌");+ m.put("My Email Addresses", "我的电子邮件地址");m.put("My GPG Keys", "我的 GPG 密钥");- m.put("My Overview", "我的概览");m.put("My Profile", "我的个人资料");m.put("My SSH Keys", "我的 SSH 密钥");m.put("Mypy Report", "Mypy 报告");@@ -1919,7 +1922,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Output", "输出");m.put("Overall Estimated Time:", "总体预计时间:");m.put("Overall Spent Time:", "总体已用时间:");- m.put("Overview", "概览");m.put("Own:", "自身");m.put("Ownered By", "拥有者");m.put("PEM private key begins with '-----BEGIN RSA PRIVATE KEY-----'", "PEM 私钥以 '-----BEGIN RSA PRIVATE KEY-----' 开头");@@ -3047,6 +3049,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {"此触发器仅在标记的提交可从此处指定的分支访问时适用。多个分支应以空格分隔。使用 '**'、'*' 或 '?' 进行 <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>路径通配符匹配</a>。以 '-' 为前缀表示排除。留空表示匹配所有分支");m.put("This user is authenticating via external system.", "此用户通过外部系统进行身份验证。");m.put("This user is authenticating via internal database.", "此用户通过内部数据库进行身份验证。");+ m.put("This user is currently authenticating via external system. Setting password will switch to use internal database",+ "该用户当前通过外部系统进行身份验证。设置密码将切换到使用内部数据库");m.put("Threads", "线程");m.put("Time Estimate Issue Field", "工单时间估算字段");m.put("Time Range", "时间范围");@@ -3063,6 +3067,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("To Everyone", "对所有人");m.put("To State", "到状态");m.put("To States", "到状态");+ m.put("To authenticate via internal database, <a wicket:id=\"setPasswordForUser\">set password for user</a> or <a wicket:id=\"tellUserToResetPassword\">tell user to reset password</a>",+ "通过内部数据库进行身份验证,<a wicket:id=\"setPasswordForUser\">设置用户密码</a> 或 <a wicket:id=\"tellUserToResetPassword\">告诉用户重置密码</a>");m.put("Toggle change history", "切换更改历史");m.put("Toggle comments", "切换评论");m.put("Toggle commits", "切换提交");@@ -3218,7 +3224,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("User Management", "用户管理");m.put("User Match Criteria", "用户匹配条件");m.put("User Name", "用户名");- m.put("User Overview", "用户概览");m.put("User Principal Name", "用户主体名称");m.put("User SSH Key Attribute", "用户 SSH 密钥属性");m.put("User Search Bases", "用户搜索基础");@@ -3504,14 +3509,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");- m.put("<a wicket:id=\"removePassword\">Remove password</a> to force the user to authenticate via external system",- "<a wicket:id=\"removePassword\">移除密码</a> 以强制用户通过外部系统进行身份验证");- m.put("To authenticate via internal database, <a wicket:id=\"setPasswordForUser\">set password for user</a> or <a wicket:id=\"tellUserToResetPassword\">tell user to reset password</a>",- "通过内部数据库进行身份验证,<a wicket:id=\"setPasswordForUser\">设置用户密码</a> 或 <a wicket:id=\"tellUserToResetPassword\">告诉用户重置密码</a>");- m.put("This user is currently authenticating via external system. Setting password will switch to use internal database",- "该用户当前通过外部系统进行身份验证。设置密码将切换到使用内部数据库");- m.put("My Email Addresses", "我的电子邮件地址");- m.put("<span wicket:id=\"activityCount\"></span> activities", "<span wicket:id=\"activityCount\"></span> 个活动");+ m.put("Basic Settings", "基本设置");+ m.put("User Profile", "用户概况");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");diff --git a/server-ee b/server-eeindex 142f8d8e30..5769a54d45 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 142f8d8e30471ae7e439ba849462b8cdf1ab6b43+Subproject commit 5769a54d4570fdf9957b7dbe7a2a4a806ac1770d