The Unified and Autonomous Development Platform
Add project avatar and re-designed main layout
Robin Shen82f4f2f06317
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex cbf9fb54e5..c302c796b6 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -228,7 +228,7 @@ import io.onedev.server.web.editable.DefaultEditSupportRegistry;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EditSupportLocator;import io.onedev.server.web.editable.EditSupportRegistry;-import io.onedev.server.web.page.layout.LayoutMenuContribution;+import io.onedev.server.web.page.layout.MainNavContribution;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;import io.onedev.server.web.util.avatar.AvatarManager;@@ -459,7 +459,7 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestEventBroadcaster.class);bind(IssueEventBroadcaster.class);- contribute(LayoutMenuContribution.class, new LayoutMenuContribution() {+ contribute(MainNavContribution.class, new MainNavContribution() {@Overridepublic boolean isAuthorized() {diff --git a/core/src/main/java/io/onedev/server/OneDev.java b/core/src/main/java/io/onedev/server/OneDev.javaindex 06a6613263..2adeb10e4c 100644--- a/core/src/main/java/io/onedev/server/OneDev.java+++ b/core/src/main/java/io/onedev/server/OneDev.java@@ -202,7 +202,7 @@ public class OneDev extends AbstractPlugin implements Serializable {Matcher matcher = DOCLINK_PATTERN.matcher(productVersion);if (!matcher.find())throw new RuntimeException("Unexpected product version format: " + productVersion);- return "https://go.onedev.io/projects/onedev-docs/blob/" + matcher.group();+ return "https://code.onedev.io/projects/onedev-docs/blob/" + matcher.group();}}diff --git a/core/src/main/java/io/onedev/server/web/component/avatar/AvatarResourceReference.java b/core/src/main/java/io/onedev/server/web/component/avatar/AvatarResourceReference.javadeleted file mode 100644index 13109feacc..0000000000--- a/core/src/main/java/io/onedev/server/web/component/avatar/AvatarResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.avatar;--import org.apache.wicket.request.resource.CssResourceReference;--public class AvatarResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public AvatarResourceReference() {- super(AvatarResourceReference.class, "avatar.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex ae7ba35fb4..e6115a40b7 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -49,11 +49,11 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.asset.caret.CaretResourceReference;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;@@ -103,7 +103,7 @@ public abstract class CodeCommentPanel extends Panel {}));User userForDisplay = User.getForDisplay(getComment().getUser(), getComment().getUserName());- commentContainer.add(new AvatarLink("userAvatar", userForDisplay));+ commentContainer.add(new UserAvatarLink("userAvatar", userForDisplay));commentContainer.add(new UserLink("userName", userForDisplay));commentContainer.add(new Label("action", "commented"));commentContainer.add(new Label("date", DateUtils.formatAge(getComment().getCreateDate())));@@ -246,7 +246,7 @@ public abstract class CodeCommentPanel extends Panel {replyContainer.add(AttributeAppender.append("name", reply.getAnchor()));User userForDisplay = User.getForDisplay(reply.getUser(), reply.getUserName());- replyContainer.add(new AvatarLink("userAvatar", userForDisplay));+ replyContainer.add(new UserAvatarLink("userAvatar", userForDisplay));replyContainer.add(new UserLink("userName", userForDisplay));replyContainer.add(new Label("action", "replied"));diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 665768c75e..d32ef11c4e 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -35,13 +35,13 @@ import io.onedev.server.model.Project;import io.onedev.server.util.Constants;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.avatar.ContributorAvatars;import io.onedev.server.web.component.build.status.BuildsStatusPanel;import io.onedev.server.web.component.commit.graph.CommitGraphResourceReference;import io.onedev.server.web.component.commit.graph.CommitGraphUtils;import io.onedev.server.web.component.commit.message.ExpandableCommitMessagePanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.user.avatar.ContributorAvatars;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.model.CommitRefsModel;diff --git a/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.javaindex dad5cc49e6..1c20868884 100644--- a/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java@@ -20,7 +20,7 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.watch.WatchStatus;-import io.onedev.server.web.component.avatar.AvatarLink;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.component.user.list.UserListLink;import io.onedev.server.web.component.watchstatus.WatchStatusLink;@@ -78,7 +78,7 @@ public abstract class EntityWatchesPanel extends Panel {@Overrideprotected void populateItem(ListItem<EntityWatch> item) {User user = item.getModelObject().getUser();- item.add(new AvatarLink("watcher", user, user.getDisplayName()));+ item.add(new UserAvatarLink("watcher", user, user.getDisplayName()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex 601527c522..d6b79ff43f 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -45,13 +45,13 @@ import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueDimport io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;import io.onedev.server.web.component.issue.activities.activity.IssueCommentedActivity;import io.onedev.server.web.component.issue.activities.activity.IssueActivity;import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.DeleteCallback;import io.onedev.server.web.util.ProjectAttachmentSupport;@@ -183,7 +183,7 @@ public abstract class IssueActivitiesPanel extends Panel {if (anchor != null)row.setMarkupId(anchor);- row.add(new AvatarLink("avatar", activity.getUser()));+ row.add(new UserAvatarLink("avatar", activity.getUser()));row.add(activity.render("content", new DeleteCallback() {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 7af936fd98..1562ce1d9d 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -32,8 +32,8 @@ import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;@@ -67,7 +67,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {User user = User.getForDisplay(OneDev.getInstance(UserManager.class).findByName(value), value);Fragment userFrag = new Fragment("value", "userFrag", FieldValuesPanel.this);userFrag.add(new UserLink("name", user));- userFrag.add(new AvatarLink("avatar", user));+ userFrag.add(new UserAvatarLink("avatar", user));item.add(userFrag);} else if (getField().getType().equals(InputSpec.ISSUE)) {Issue issue = OneDev.getInstance(IssueManager.class).find(project, Long.valueOf(value));diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex e4f994adb5..f8b27899ba 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -53,7 +53,6 @@ import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueField;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.IssueQueryBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;@@ -62,6 +61,7 @@ import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;@@ -502,7 +502,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {Issue issue = rowModel.getObject();Fragment fragment = new Fragment(componentId, "userFrag", IssueListPanel.this);User submitter = User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName());- fragment.add(new AvatarLink("avatar", submitter));+ fragment.add(new UserAvatarLink("avatar", submitter));fragment.add(new UserLink("name", submitter));cellItem.add(fragment);}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex ab623d1ae0..30695e1d45 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -53,12 +53,12 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.IssueField;import io.onedev.server.util.IssueUtils;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;import io.onedev.server.web.component.stringchoice.StringSingleChoice;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.component.user.list.UserListLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;@@ -383,7 +383,7 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected void populateItem(ListItem<IssueVote> item) {User user = item.getModelObject().getUser();- item.add(new AvatarLink("voter", user, user.getDisplayName()));+ item.add(new UserAvatarLink("voter", user, user.getDisplayName()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java b/core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.javaindex c4f7b94fb8..39d4864c2b 100644--- a/core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java+++ b/core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java@@ -6,6 +6,7 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;+import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;import io.onedev.server.model.Project;@@ -53,7 +54,7 @@ public abstract class ProjectPicker extends DropdownLink {public IModel<?> getBody() {Project currentProject = OneDev.getInstance(Dao.class).load(Project.class, currentProjectId);return Model.of(String.format("<i class='fa fa-ext fa-repo'></i> <span>%s</span> <i class='fa fa-caret-down'></i>",- currentProject.getName()));+ HtmlEscape.escapeHtml5(currentProject.getName())));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.javanew file mode 100644index 0000000000..2b0ea2dee6--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java@@ -0,0 +1,63 @@+package io.onedev.server.web.component.project.avatar;++import org.apache.wicket.event.IEvent;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebComponent;++import io.onedev.server.OneDev;+import io.onedev.server.model.Project;+import io.onedev.server.web.util.avatar.AvatarManager;++@SuppressWarnings("serial")+public class ProjectAvatar extends WebComponent {++ private final Long projectId;++ private String url;++ public ProjectAvatar(String id, Project project) {+ super(id);++ AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);+ projectId = project.getId();+ url = avatarManager.getAvatarUrl(project.getFacade());+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof ProjectAvatarChanged) {+ ProjectAvatarChanged avatarChanged = (ProjectAvatarChanged) event.getPayload();+ if (avatarChanged.getProject().getId().equals(projectId)) {+ AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);+ url = avatarManager.getAvatarUrl(avatarChanged.getProject().getFacade());+ avatarChanged.getHandler().add(this);+ }+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectAvatarResourceReference()));+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ tag.setName("img");+ tag.append("class", "project-avatar", " ");+ tag.put("src", url);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarChanged.java b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarChanged.javanew file mode 100644index 0000000000..d3f3ec8ae2--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarChanged.java@@ -0,0 +1,21 @@+package io.onedev.server.web.component.project.avatar;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.model.Project;+import io.onedev.server.web.util.AjaxPayload;++public class ProjectAvatarChanged extends AjaxPayload {++ private final Project project;++ public ProjectAvatarChanged(AjaxRequestTarget target, Project project) {+ super(target);+ this.project = project;+ }++ public Project getProject() {+ return project;+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.javanew file mode 100644index 0000000000..965298f04d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java@@ -0,0 +1,88 @@+package io.onedev.server.web.component.project.avatar;++import org.apache.wicket.event.IEvent;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.model.Project;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.util.avatar.AvatarManager;++@SuppressWarnings("serial")+public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {++ private final Long projectId;++ private final PageParameters params;++ private String url;++ private String tooltip;++ public ProjectAvatarLink(String id, Project project) {+ super(id, ProjectBlobPage.class);++ AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);+ projectId = project.getId();+ params = ProjectPage.paramsOf(project);+ url = avatarManager.getAvatarUrl(project.getFacade());+ tooltip = project.getName();+ }++ @Override+ public PageParameters getPageParameters() {+ return params;+ }++ @Override+ public IModel<?> getBody() {+ return Model.of("<img src='" + url + "' class='project-avatar'></img>");+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof ProjectAvatarChanged) {+ ProjectAvatarChanged avatarChanged = (ProjectAvatarChanged) event.getPayload();+ if (avatarChanged.getProject().getId().equals(projectId)) {+ AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);+ url = avatarManager.getAvatarUrl(avatarChanged.getProject().getFacade());+ avatarChanged.getHandler().add(this);+ }+ }+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ configure();+ if (!isEnabled())+ tag.setName("span");+ tag.put("title", tooltip);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectAvatarResourceReference()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setEnabled(!params.isEmpty());+ setEscapeModelStrings(false);++ setOutputMarkupId(true);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarResourceReference.java b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarResourceReference.javanew file mode 100644index 0000000000..93ce596667--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.project.avatar;++import org.apache.wicket.request.resource.CssResourceReference;++public class ProjectAvatarResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectAvatarResourceReference() {+ super(ProjectAvatarResourceReference.class, "project-avatar.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/project/avatar/project-avatar.css b/core/src/main/java/io/onedev/server/web/component/project/avatar/project-avatar.cssnew file mode 100644index 0000000000..348cb7fbb1--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/project/avatar/project-avatar.css@@ -0,0 +1,5 @@+img.project-avatar {+ border-radius: 1000px;+ height: 24px;+ width: 24px;+}diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex aee5e05313..5b48f87382 100644--- a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -1,7 +1,7 @@<wicket:panel><table wicket:id="projects" class="table project-list"></table><wicket:fragment wicket:id="projectFrag">- <i class="fa fa-ext fa-repo"></i> <a wicket:id="link"><span wicket:id="name"></span></a>+ <a wicket:id="link"><img wicket:id="avatar"></img> <span wicket:id="name"></span></a></wicket:fragment><wicket:fragment wicket:id="authorFrag"><a wicket:id="avatar" class="avatar"></a> <a wicket:id="name" class="name"></a>diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 14270cebe5..25dee04e08 100644--- a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -34,11 +34,12 @@ import io.onedev.server.model.Project;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.link.ProjectLink;import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.PagingHistorySupport;@@ -70,6 +71,7 @@ public class ProjectListPanel extends Panel {Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPanel.this);Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId());Link<Void> link = new ProjectLink("link", project);+ link.add(new ProjectAvatar("avatar", project));link.add(new Label("name", project.getName()));fragment.add(link);cellItem.add(fragment);@@ -86,7 +88,7 @@ public class ProjectListPanel extends Panel {RevCommit lastCommit = project.getLastCommit();if (lastCommit != null) {Fragment fragment = new Fragment(componentId, "authorFrag", ProjectListPanel.this);- fragment.add(new AvatarLink("avatar", lastCommit.getAuthorIdent()));+ fragment.add(new UserAvatarLink("avatar", lastCommit.getAuthorIdent()));fragment.add(new UserLink("name", lastCommit.getAuthorIdent()));cellItem.add(fragment);} else {diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.cssindex 0b22c92d75..8fa18b252e 100644--- a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css+++ b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css@@ -11,10 +11,6 @@ table.project-list a {table.project-list td.project, table.project-list td.author {white-space: nowrap;}-table.project-list td.author img.avatar {- width: 20px;- height: 20px;-}table.project-list td.author span, table.project-list td.commit-date {color: #888;}diff --git a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex 8ad582a0c1..57475dcf52 100644--- a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java+++ b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java@@ -31,6 +31,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.InputChangeBehavior;import io.onedev.server.web.component.link.PreventDefaultAjaxLink;+import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.utils.matchscore.MatchScoreProvider;import io.onedev.utils.matchscore.MatchScoreUtils;@@ -154,6 +155,7 @@ public abstract class ProjectSelector extends Panel {};if (project.getId().equals(currentProjectId))link.add(AttributeAppender.append("class", " current"));+ link.add(new ProjectAvatar("avatar", project));link.add(new Label("name", project.getName()));item.add(link);diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.javaindex e294a14cec..c512e25f55 100644--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java@@ -34,8 +34,8 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.JsoupUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.behavior.dropdown.DropdownHover;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import io.onedev.server.web.websocket.PageDataChanged;@@ -113,7 +113,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {@Overrideprotected void populateItem(ListItem<PullRequestReview> item) {PullRequestReview review = item.getModelObject();- item.add(new AvatarLink("avatar", review.getUser()));+ item.add(new UserAvatarLink("avatar", review.getUser()));item.add(new UserLink("name", review.getUser()));PullRequest request = getPullRequest();diff --git a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.cssindex fbd0697971..5b2f693bbb 100644--- a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css+++ b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css@@ -48,7 +48,7 @@}.minimizable.sidebar>.tabs {- bottom: 36px;+ bottom: 40px;}.minimizable.sidebar>a.mini-toggle {display: block;diff --git a/core/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.html b/core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.htmlrename to core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.htmldiff --git a/core/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.javasimilarity index 80%rename from core/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.javarename to core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.javaindex e0659722c0..127a2a9b6b 100644--- a/core/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.java+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/ContributorAvatars.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.avatar;+package io.onedev.server.web.component.user.avatar;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -23,19 +23,19 @@ public class ContributorAvatars extends Panel {protected void onInitialize() {super.onInitialize();- add(new AvatarLink("author", author));+ add(new UserAvatarLink("author", author));if (committer.getEmailAddress().equals(author.getEmailAddress())&& committer.getName().equals(author.getName())) {add(new WebMarkupContainer("committer").setVisible(false));} else {- add(new AvatarLink("committer", committer));+ add(new UserAvatarLink("committer", committer));}}@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new AvatarResourceReference()));+ response.render(CssHeaderItem.forReference(new UserAvatarResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/component/avatar/Avatar.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/web/component/avatar/Avatar.javarename to core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.javaindex ee83495ac6..541c50f469 100644--- a/core/src/main/java/io/onedev/server/web/component/avatar/Avatar.java+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.avatar;+package io.onedev.server.web.component.user.avatar;import javax.annotation.Nullable;@@ -15,13 +15,13 @@ import io.onedev.server.model.User;import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")-public class Avatar extends WebComponent {+public class UserAvatar extends WebComponent {private final Long userId;private String url;- public Avatar(String id, @Nullable User user) {+ public UserAvatar(String id, @Nullable User user) {super(id);AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);@@ -35,7 +35,7 @@ public class Avatar extends WebComponent {url = avatarManager.getAvatarUrl(user!=null?user.getFacade():null);}- public Avatar(String id, PersonIdent person) {+ public UserAvatar(String id, PersonIdent person) {super(id);AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);@@ -54,8 +54,8 @@ public class Avatar extends WebComponent {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof AvatarChanged) {- AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();+ if (event.getPayload() instanceof UserAvatarChanged) {+ UserAvatarChanged avatarChanged = (UserAvatarChanged) event.getPayload();if (avatarChanged.getUser().getId().equals(userId)) {AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);url = avatarManager.getAvatarUrl(avatarChanged.getUser().getFacade());@@ -73,7 +73,7 @@ public class Avatar extends WebComponent {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new AvatarResourceReference()));+ response.render(CssHeaderItem.forReference(new UserAvatarResourceReference()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/avatar/AvatarChanged.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarChanged.javasimilarity index 59%rename from core/src/main/java/io/onedev/server/web/component/avatar/AvatarChanged.javarename to core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarChanged.javaindex 2a2af0cef5..fdfdd68c93 100644--- a/core/src/main/java/io/onedev/server/web/component/avatar/AvatarChanged.java+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarChanged.java@@ -1,15 +1,15 @@-package io.onedev.server.web.component.avatar;+package io.onedev.server.web.component.user.avatar;import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.model.User;import io.onedev.server.web.util.AjaxPayload;-public class AvatarChanged extends AjaxPayload {+public class UserAvatarChanged extends AjaxPayload {private final User user;- public AvatarChanged(AjaxRequestTarget target, User user) {+ public UserAvatarChanged(AjaxRequestTarget target, User user) {super(target);this.user = user;diff --git a/core/src/main/java/io/onedev/server/web/component/avatar/AvatarLink.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarLink.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/web/component/avatar/AvatarLink.javarename to core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarLink.javaindex 43941e9a76..70ca61d8cd 100644--- a/core/src/main/java/io/onedev/server/web/component/avatar/AvatarLink.java+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarLink.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.avatar;+package io.onedev.server.web.component.user.avatar;import javax.annotation.Nullable;@@ -22,7 +22,7 @@ import io.onedev.server.web.page.user.UserProfilePage;import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")-public class AvatarLink extends ViewStateAwarePageLink<Void> {+public class UserAvatarLink extends ViewStateAwarePageLink<Void> {private final Long userId;@@ -32,11 +32,11 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {private String url;- public AvatarLink(String id, @Nullable User user) {+ public UserAvatarLink(String id, @Nullable User user) {this(id, user, null);}- public AvatarLink(String id, @Nullable User user, @Nullable String tooltip) {+ public UserAvatarLink(String id, @Nullable User user, @Nullable String tooltip) {super(id, UserProfilePage.class);AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);@@ -54,11 +54,11 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {url = avatarManager.getAvatarUrl(user!=null?user.getFacade():null);}- public AvatarLink(String id, PersonIdent person) {+ public UserAvatarLink(String id, PersonIdent person) {this(id, person, null);}- public AvatarLink(String id, PersonIdent person, @Nullable String tooltip) {+ public UserAvatarLink(String id, PersonIdent person, @Nullable String tooltip) {super(id, UserProfilePage.class);AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);@@ -91,8 +91,8 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof AvatarChanged) {- AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();+ if (event.getPayload() instanceof UserAvatarChanged) {+ UserAvatarChanged avatarChanged = (UserAvatarChanged) event.getPayload();if (avatarChanged.getUser().getId().equals(userId)) {AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);url = avatarManager.getAvatarUrl(avatarChanged.getUser().getFacade());@@ -112,7 +112,7 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new AvatarResourceReference()));+ response.render(CssHeaderItem.forReference(new UserAvatarResourceReference()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarResourceReference.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarResourceReference.javanew file mode 100644index 0000000000..6514467a85--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatarResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.user.avatar;++import org.apache.wicket.request.resource.CssResourceReference;++public class UserAvatarResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public UserAvatarResourceReference() {+ super(UserAvatarResourceReference.class, "user-avatar.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/avatar/avatar.css b/core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.csssimilarity index 100%rename from core/src/main/java/io/onedev/server/web/component/avatar/avatar.cssrename to core/src/main/java/io/onedev/server/web/component/user/avatar/user-avatar.cssdiff --git a/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java b/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.javaindex 0025bf16d2..be53b2d903 100644--- a/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import io.onedev.server.model.User;-import io.onedev.server.web.component.avatar.Avatar;+import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.user.UserProfilePage;@SuppressWarnings("serial")@@ -27,7 +27,7 @@ abstract class UserListPanel extends Panel {for (User user: getUsers()) {Link<Void> link = new BookmarkablePageLink<Void>(usersView.newChildId(),UserProfilePage.class, UserProfilePage.paramsOf(user));- link.add(new Avatar("avatar", user));+ link.add(new UserAvatar("avatar", user));link.add(new Label("name", user.getDisplayName()));usersView.add(link);}diff --git a/core/src/main/java/io/onedev/server/web/img/apple-touch-icon.png b/core/src/main/java/io/onedev/server/web/img/apple-touch-icon.pngindex 507616361d..a21f7379f5 100644Binary files a/core/src/main/java/io/onedev/server/web/img/apple-touch-icon.png and b/core/src/main/java/io/onedev/server/web/img/apple-touch-icon.png differdiff --git a/core/src/main/java/io/onedev/server/web/img/favicon.ico b/core/src/main/java/io/onedev/server/web/img/favicon.icoindex 227fcbaeed..218c007602 100644Binary files a/core/src/main/java/io/onedev/server/web/img/favicon.ico and b/core/src/main/java/io/onedev/server/web/img/favicon.ico differdiff --git a/core/src/main/java/io/onedev/server/web/img/logo.png b/core/src/main/java/io/onedev/server/web/img/logo.pngnew file mode 100644index 0000000000..a21f7379f5Binary files /dev/null and b/core/src/main/java/io/onedev/server/web/img/logo.png differdiff --git a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.javaindex b6c8f7115a..c730470836 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java@@ -3,15 +3,10 @@ package io.onedev.server.web.page.admin;import java.util.ArrayList;import java.util.List;-import org.apache.wicket.Component;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;@@ -62,27 +57,4 @@ public abstract class AdministrationPage extends LayoutPage {response.render(CssHeaderItem.forReference(new AdministrationResourceReference()));}- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, SystemSettingPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Administration");- }-- };- }-- });-- return breadcrumbs;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 1b59ca5453..7844287732 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -358,6 +358,11 @@ form>.test-feedback {margin-bottom: 50px;color: #333;}+.center-box .logo {+ width: 36px;+ height: 36px;+ margin-bottom: 8px;+}@media(max-width: 738px) {.center-box {border: none;diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 0d13f3fc15..f3110651aa 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -1,60 +1,60 @@<wicket:extend><div id="layout">- <div wicket:id="head" class="head clearfix">- <div class="nav pull-left">- <a wicket:id="nav" title="Navigation" class="fa fa-bars"></a>+ <nav class="navbar navbar-fixed-top navbar-inverse">+ <div class="container-fluid">+ <div class="navbar-header">+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">+ <span class="sr-only">Toggle navigation</span>+ <span class="icon-bar"></span>+ <span class="icon-bar"></span>+ <span class="icon-bar"></span>+ </button>+ <a class="navbar-brand" href="https://onedev.io">+ <img alt="Brand" src="/img/logo.png">+ </a>+ </div>+ <div class="collapse navbar-collapse" id="navbar-collapse">+ <ul class="nav navbar-nav">+ <li wicket:id="navProjects"><a wicket:id="link">Projects</a></li>+ <li wicket:id="navContributions"><a wicket:id="link"><span wicket:id="label"></span></a></li>+ <li wicket:id="navUsers"><a wicket:id="link">Users</a></li>+ <li wicket:id="navAdministration"><a wicket:id="link">Administration</a></li>+ </ul>+ <ul class="nav navbar-nav navbar-right">+ <li class="dropdown">+ <a href="#" class="dropdown-toggle expanded" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle"></i> <i class="fa fa-angle-down"></i></a>+ <a href="#" class="dropdown-toggle collapsed" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help <i class="fa fa-angle-down"></i></a>+ <ul class="dropdown-menu">+ <li wicket:id="productVersion" class="dropdown-header"></li>+ <li role="separator" class="divider"></li>+ <li><a wicket:id="docLink">Documentation</a></li>+ <li><a href="mailto:[email protected]">Support & Bug Report</a></li>+ </ul>+ </li>+ <wicket:container wicket:id="notSignedIn">+ <li><a wicket:id="signIn">Sign in</a></li>+ <wicket:enclosure child="signUp">+ <li><a wicket:id="signUp">Sign Up</a></li>+ </wicket:enclosure>+ </wicket:container>+ <wicket:container wicket:id="signedIn">+ <li class="dropdown">+ <a href="#" class="dropdown-toggle avatar expanded" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img wicket:id="avatar"></img> <i class="fa fa-angle-down"></i></a>+ <a href="#" class="dropdown-toggle collapsed" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span wicket:id="userNameCollapsed"></span> <i class="fa fa-angle-down"></i></a>+ <ul class="dropdown-menu">+ <li wicket:id="userNameExpanded" class="dropdown-header expanded"></li>+ <li role="separator" class="divider expanded"></li>+ <li><a wicket:id="profile">My Setting</a></li>+ <li><a wicket:id="signOut">Sign Out</a></li>+ </ul>+ </li>+ </wicket:container>+ </ul>+ </div></div>- <div wicket:id="breadcrumbs" class="breadcrumb pull-left clearfix">- <a wicket:id="nav" class="nav pull-left"></a>- <div wicket:id="separator" class="separator pull-left">></div>- </div>- <div class="user pull-right">- <wicket:enclosure child="login">- <div class="logged-out">- <a wicket:id="login" class="login">Log in</a>- <a wicket:id="register" class="register">Sign up</a>- </div>- </wicket:enclosure>- <wicket:enclosure child="user">- <div class="logged-in">- <a wicket:id="user" class="current"></a>- <a wicket:id="userMenuTrigger" class="menu"><i class="fa fa-angle-down"></i></a>- </div>- </wicket:enclosure>- </div>- <wicket:enclosure child="pushDisabled">- <div class="push-disabled pull-right">- <span wicket:id="pushDisabled" class="label label-danger">Git Push Disabled</span>- </div>- </wicket:enclosure>- </div>+ </nav><div class="body"><wicket:child></wicket:child></div></div>- <wicket:fragment wicket:id="userMenuFrag">- <div class="user-menu">- <a wicket:id="profile"><i class="fa fa-fw fa-gear"></i> My profile</a>- <a wicket:id="logout"><i class="fa fa-fw fa-sign-out"></i> Logout</a>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="navFrag">- <div class="main-nav">- <h4>OneDev <span wicket:id="productVersion"></span></h4>- <ul>- <li><a wicket:id="projects">Projects</a></li>- <wicket:enclosure child="users">- <li><a wicket:id="users">Users</a></li>- </wicket:enclosure>- <li wicket:id="extensions"><a wicket:id="link"><span wicket:id="label"></span></a></li>- <wicket:enclosure child="administration">- <li><a wicket:id="administration">Administration</a></li>- </wicket:enclosure>- <li class="divider"></li>- <li><a href="https://www.onedev.io">Product Home</a></li>- <li><a wicket:id="docLink">Documentation</a></li>- <li><a href="mailto:[email protected]">Support & Bug Report</a></li>- </ul>- </div>- </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 4db5477b55..d617e5ebd3 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -5,54 +5,40 @@ import java.util.Collections;import java.util.Comparator;import java.util.List;-import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;+import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.request.mapper.parameter.PageParameters;-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;import io.onedev.launcher.loader.AppLoader;import io.onedev.launcher.loader.Plugin;import io.onedev.server.OneDev;import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-import io.onedev.server.web.behavior.TooltipBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;-import io.onedev.server.web.component.floating.AlignPlacement;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.user.avatar.UserAvatar;+import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;import io.onedev.server.web.page.security.RegisterPage;import io.onedev.server.web.page.user.UserListPage;+import io.onedev.server.web.page.user.UserPage;import io.onedev.server.web.page.user.UserProfilePage;-import io.onedev.utils.license.LicenseDetail;@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {- private WebMarkupContainer head;-public LayoutPage() {}@@ -64,128 +50,79 @@ public abstract class LayoutPage extends BasePage {protected void onInitialize() {super.onInitialize();- head = new WebMarkupContainer("head");- add(head);+ WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");+ projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));+ if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage)+ projectsContainer.add(AttributeAppender.append("class", "active"));+ add(projectsContainer);- head.add(new DropdownLink("nav") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Fragment fragment = new Fragment(id, "navFrag", LayoutPage.this);- fragment.add(new ViewStateAwarePageLink<Void>("projects", ProjectListPage.class));- fragment.add(new ViewStateAwarePageLink<Void>("users", UserListPage.class).setVisible(SecurityUtils.isAdministrator()));-- fragment.add(new ListView<LayoutMenuContribution>("extensions", new LoadableDetachableModel<List<LayoutMenuContribution>>() {-- @Override- protected List<LayoutMenuContribution> load() {- List<LayoutMenuContribution> extensions = new ArrayList<>();- for (LayoutMenuContribution contribution: OneDev.getExtensions(LayoutMenuContribution.class)) {- if (contribution.isAuthorized())- extensions.add(contribution);- }- Collections.sort(extensions, new Comparator<LayoutMenuContribution>() {-- @Override- public int compare(LayoutMenuContribution o1, LayoutMenuContribution o2) {- return o1.getOrder() - o2.getOrder();- }-- });- return extensions;- }-- }) {-- @Override- protected void populateItem(ListItem<LayoutMenuContribution> item) {- LayoutMenuContribution contribution = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link", contribution.getPageClass());- link.add(new Label("label", contribution.getLabel()));- item.add(link);- }-- });-- fragment.add(new ViewStateAwarePageLink<Void>("administration", SystemSettingPage.class).setVisible(SecurityUtils.isAdministrator()));-- Plugin product = AppLoader.getProduct();- fragment.add(new Label("productVersion", product.getVersion()));- fragment.add(new ExternalLink("docLink", OneDev.getInstance().getDocLink() + "/readme.md"));- return fragment;- }-- });-- head.add(new ListView<ComponentRenderer>("breadcrumbs", getBreadcrumbs()) {+ RepeatingView contributionsView = new RepeatingView("navContributions");+ List<MainNavContribution> contributions = new ArrayList<>();+ for (MainNavContribution contribution: OneDev.getExtensions(MainNavContribution.class)) {+ if (contribution.isAuthorized())+ contributions.add(contribution);+ }+ Collections.sort(contributions, new Comparator<MainNavContribution>() {@Override- protected void populateItem(ListItem<ComponentRenderer> item) {- item.add(item.getModelObject().render("nav"));- item.add(new WebMarkupContainer("separator").setVisible(item.getIndex() != getList().size()-1));+ public int compare(MainNavContribution o1, MainNavContribution o2) {+ return o1.getOrder() - o2.getOrder();}});-- int userCount = OneDev.getInstance(UserManager.class).count(EntityCriteria.of(User.class));- int licenseLimit = LicenseDetail.FREE_LICENSE_USERS;- LicenseDetail license = OneDev.getInstance(SettingManager.class).getLicense();- if (license != null && license.getRemainingDays()>=0)- licenseLimit += license.getLicensedUsers();- if (userCount > licenseLimit) {- String tooltip = String.format(""- + "Git push is disabled as number of users (%d) in system exceeds license limit (%d).",- userCount, licenseLimit);- TooltipBehavior tooltipBehavior = new TooltipBehavior(Model.of(tooltip),- new TooltipConfig().withPlacement(Placement.bottom));- head.add(new WebMarkupContainer("pushDisabled").add(tooltipBehavior));- } else {- head.add(new WebMarkupContainer("pushDisabled").setVisible(false));+ for (MainNavContribution contribution: contributions) {+ WebMarkupContainer contributionContainer = new WebMarkupContainer(contributionsView.newChildId());+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", contribution.getPageClass());+ link.add(new Label("label", contribution.getLabel()));+ contributionContainer.add(link);}-- User user = getLoginUser();- boolean signedIn = user != null;-- head.add(new Link<Void>("login") {+ add(contributionsView);++ WebMarkupContainer usersContainer = new WebMarkupContainer("navUsers");+ usersContainer.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));+ if (getPage() instanceof UserListPage || getPage() instanceof UserPage)+ usersContainer.add(AttributeAppender.append("class", "active"));+ usersContainer.setVisible(SecurityUtils.isAdministrator());+ add(usersContainer);++ WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");+ administrationContainer.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));+ if (getPage() instanceof AdministrationPage)+ administrationContainer.add(AttributeAppender.append("class", "active"));+ administrationContainer.setVisible(SecurityUtils.isAdministrator());+ add(administrationContainer);++ Plugin product = AppLoader.getProduct();+ add(new Label("productVersion", product.getVersion()));+ add(new ExternalLink("docLink", OneDev.getInstance().getDocLink() + "/readme.md"));++ WebMarkupContainer notSignedInContainer = new WebMarkupContainer("notSignedIn");+ notSignedInContainer.add(new Link<Void>("signIn") {@Overridepublic void onClick() {throw new RestartResponseAtInterceptPageException(LoginPage.class);}- }.setVisible(!signedIn));+ });+ User loginUser = getLoginUser();boolean enableSelfRegister = OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister();- head.add(new ViewStateAwarePageLink<Void>("register", RegisterPage.class).setVisible(!signedIn && enableSelfRegister));+ notSignedInContainer.add(new ViewStateAwarePageLink<Void>("signUp", RegisterPage.class).setVisible(enableSelfRegister));+ notSignedInContainer.setVisible(loginUser == null);+ add(notSignedInContainer);- if (signedIn) {- head.add(new AvatarLink("user", user));- head.add(new DropdownLink("userMenuTrigger", new AlignPlacement(50, 100, 50, 0, 8)) {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Fragment fragment = new Fragment(id, "userMenuFrag", LayoutPage.this);-- fragment.add(new ViewStateAwarePageLink<Void>("profile",- UserProfilePage.class, UserProfilePage.paramsOf(user)));- fragment.add(new ViewStateAwarePageLink<Void>("logout", LogoutPage.class));-- return fragment;- }-- });- } else {- head.add(new WebMarkupContainer("user").setVisible(false));- head.add(new WebMarkupContainer("userMenuTrigger").setVisible(false));- head.add(new WebMarkupContainer("userMenu").setVisible(false));- }- head.setOutputMarkupId(true);+ WebMarkupContainer signedInContainer = new WebMarkupContainer("signedIn");+ signedInContainer.add(new UserAvatar("avatar", loginUser));+ signedInContainer.add(new Label("userNameExpanded", loginUser!=null?loginUser.getDisplayName():""));+ signedInContainer.add(new Label("userNameCollapsed", loginUser!=null?loginUser.getDisplayName():""));+ signedInContainer.add(new ViewStateAwarePageLink<Void>("profile", UserProfilePage.class,+ loginUser!=null?UserProfilePage.paramsOf(loginUser):new PageParameters()));+ signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));+ signedInContainer.setVisible(loginUser != null);+ add(signedInContainer);}- protected List<ComponentRenderer> getBreadcrumbs() {- return new ArrayList<>();- };-@Overrideprotected boolean isPermitted() {return getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess();diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutMenuContribution.java b/core/src/main/java/io/onedev/server/web/page/layout/MainNavContribution.javasimilarity index 78%rename from core/src/main/java/io/onedev/server/web/page/layout/LayoutMenuContribution.javarename to core/src/main/java/io/onedev/server/web/page/layout/MainNavContribution.javaindex f12d8b5c6c..2df1a881f4 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutMenuContribution.java+++ b/core/src/main/java/io/onedev/server/web/page/layout/MainNavContribution.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.layout;-public interface LayoutMenuContribution {+public interface MainNavContribution {int getOrder();diff --git a/core/src/main/java/io/onedev/server/web/page/layout/layout.css b/core/src/main/java/io/onedev/server/web/page/layout/layout.cssindex a34bff73c8..d67c0d5a95 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/layout.css+++ b/core/src/main/java/io/onedev/server/web/page/layout/layout.css@@ -1,166 +1,48 @@-#layout {- min-width: 768px;+.navbar-brand {+ padding-top: 14px;+ padding-bottom: 14px;}-#layout>.head {- background: #212121;- padding: 8px 16px;- color: #E0E0E0;- position: fixed;- height: 48px;- z-index: 210;- left: 0;- right: 0;- min-width: 375px;-}-#layout>.head>div {- margin-right: 20px;-}-#layout>.head a {- text-decoration: none;- color: #E0E0E0;-}-#layout>.head .push-disabled {- padding-top: 6px;-}-#layout>.head .push-disabled .label {- font-size: 15px;-}-#layout>.head>.nav .fa {- margin-top: 2px;- font-size: 28px;-}-#layout>.head>.breadcrumb {- padding: 0;- margin: 0;- background: inherit;- border-radius: 0;- font-size: 20px;-}-#layout>.head>.breadcrumb .separator {- margin: 0 8px;-}-#layout>.head>.breadcrumb .name {- text-overflow: ellipsis;- overflow: hidden;- white-space: nowrap;-}-@media(min-width: 0px) {- #layout>.head>.breadcrumb .name {- max-width: 50px;- }- #layout>.head .register {- display: none;- }-}-@media(min-width: 500px) {- #layout>.head>.breadcrumb .name {- max-width: 100px;- }-}-@media(min-width: 600px) {- #layout>.head>.breadcrumb .name {- max-width: 200px;- }- #layout>.head .register {- display: inline;- }-}-@media(min-width: 900px) {- #layout>.head>.breadcrumb .name {- max-width: 400px;- }-}-#layout>.head>.help {- padding-top: 7px;-}-#layout>.head>.help .fa {- font-size: 20px;-}-#layout>.head>.user {- margin-right: 0;+.navbar-brand img {+ width: 24px;+ height: 24px;+ margin-left: -6px;}-#layout>.head>.user>.logged-in>a, #layout>.head>.user>.logged-in>span {- margin-right: 8px;- font-size: 20px;+.navbar-nav>li>a.avatar {+ padding-top: 10px;+ padding-bottom: 10px;}-#layout>.head>.user>.logged-in>.menu {- margin-right: 8px;+.navbar img.avatar {+ width: 30px;+ height: 30px;}-#layout>.head>.user>.logged-out {- padding-top: 4px;-}-#layout>.head>.user>.logged-out a {+.navbar .dropdown-header {font-size: 16px;+ padding: 4px 20px 0 20px;}-#layout>.head>.user>.logged-out>a:LAST-CHILD {- margin-left: 16px;++@media (max-width: 768px) {+ .navbar .expanded {+ display: none;+ }}-#layout>.head>.user .avatar {- width: 32px;- height: 32px;+@media (min-width: 768px) {+ .navbar .collapsed {+ display: none;+ }}+#layout>.body {- padding: 68px 20px 20px 20px;+ padding: 70px 20px 20px 20px;width: 100%;}-#project-add {- padding: 20px;-}--.floating>.content>.user-menu {- padding: 12px 0;- min-width: 120px;-}-.floating>.content>.user-menu a {- display: block;- color: #555;- text-decoration: none;- padding: 8px 12px;-}-.floating>.content>.user-menu a:hover {- background: #F2F2F2;-}-#layout .sidebar {- top: 48px;-}--.main-nav {- padding: 6px 0;-}-.main-nav>h4 {- padding: 0 20px;-}-.main-nav ul {- margin:0;- padding: 0;-}-.main-nav li {- white-space: nowrap;-}-.main-nav li a:hover {- background-color: #f5f5f5;-}-.main-nav ul>li>a {- position: relative;- color: #333333;- display: block;- font-weight: normal;- line-height: 20px;- text-decoration: none;- padding: 6px 24px;- white-space: nowrap;-}-.main-nav ul>li.divider {- border-top: 1px solid #DDD;- margin: 8px 0;- height: 0;+ top: 50px;}.floating.side {position: fixed;- top: 48px;+ top: 50px;border-top: none;border-bottom: none;bottom: 0;diff --git a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex 7a34d1a4cf..a57e3cfaa2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -1,24 +1,15 @@package io.onedev.server.web.page.project;-import java.util.List;--import org.apache.wicket.Component;import org.apache.wicket.Session;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathSegment;@@ -64,46 +55,6 @@ public class NewProjectPage extends LayoutPage {add(form);}- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, ProjectListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Projects");- }-- };- }-- });-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new Label(componentId, "New Project") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("div");- }-- };- }-- });-- return breadcrumbs;- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex f5ddca8db3..f577e41de8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -6,7 +6,6 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;@@ -29,9 +28,7 @@ import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.TeamFacade;-import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.project.list.ProjectListPanel;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.util.PagingHistorySupport;@@ -222,27 +219,4 @@ public class ProjectListPage extends LayoutPage {response.render(CssHeaderItem.forReference(new ProjectResourceReference()));}- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, ProjectListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Projects");- }-- };- }-- });-- return breadcrumbs;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.htmlindex 8ff71eb08f..502ae39ee9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html@@ -5,10 +5,11 @@<wicket:child></wicket:child></div></div>- <wicket:fragment wicket:id="breadcrumbFrag">- <div class="project clearfix">- <a wicket:id="name" class="pull-left name"></a>- <a wicket:id="moreInfo" class="pull-left more-info"><i class="fa fa-ellipsis-h"></i></a>- </div>+ <wicket:fragment wicket:id="sidebarHeadFrag">+ <a wicket:id="link">+ <img wicket:id="avatar"></img>+ <span wicket:id="name"></span>+ <i class="fa fa-angle-down"></i>+ </a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex d46b234166..3f7c8fb711 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -9,11 +9,10 @@ import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;@@ -30,10 +29,11 @@ import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;+import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;@@ -238,6 +238,33 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {return tabs;}++ @Override+ protected Component newHead(String componentId) {+ Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", ProjectPage.this);+ Project project = getProject();+ AlignPlacement placement = new AlignPlacement(0, 100, 0, 0);+ AjaxLink<Void> link = new DropdownLink("link", placement) {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new MoreInfoPanel(id, projectModel) {++ @Override+ protected void onPromptForkOption(AjaxRequestTarget target) {+ dropdown.close();+ }+ };+ }++ };+ link.add(new ProjectAvatar("avatar", getProject()));+ link.add(new Label("name", project.getName()));+ fragment.add(link);++ return fragment;+ }+});}@@ -264,70 +291,4 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {super.onDetach();}- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, ProjectListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Projects");- }-- };- }-- });-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- Fragment fragment = new Fragment(componentId, "breadcrumbFrag", ProjectPage.this) {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("div");- }-- };- fragment.add(new BookmarkablePageLink<Void>("name", ProjectBlobPage.class,- ProjectBlobPage.paramsOf(getProject())) {-- @Override- public IModel<?> getBody() {- return Model.of(getProject().getName());- }-- }.add(AttributeAppender.append("title", getProject().getName())));-- fragment.add(new DropdownLink("moreInfo") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new MoreInfoPanel(id, projectModel) {-- @Override- protected void onPromptForkOption(AjaxRequestTarget target) {- dropdown.close();- }-- };- }-- });- return fragment;- }-- });-- return breadcrumbs;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.javaindex 684505f76f..d395b1be0d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import io.onedev.server.web.component.avatar.AvatarResourceReference;+import io.onedev.server.web.component.user.avatar.UserAvatarResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class FolderViewResourceReference extends BaseDependentResourceReference {@@ -24,7 +24,7 @@ public class FolderViewResourceReference extends BaseDependentResourceReferencenew CssResourceReference(FolderViewResourceReference.class, "folder-view.css")));// add this dependency as the lazy loaded last commits information includes avatar displaying- dependencies.add(CssHeaderItem.forReference(new AvatarResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new UserAvatarResourceReference()));return dependencies;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex cc2137fb96..814223cac5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -53,7 +53,6 @@ import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.avatar.ContributorAvatars;import io.onedev.server.web.component.branch.create.CreateBranchLink;import io.onedev.server.web.component.build.status.BuildsStatusPanel;import io.onedev.server.web.component.commit.message.CommitMessageLabel;@@ -62,6 +61,7 @@ import io.onedev.server.web.component.createtag.CreateTagLink;import io.onedev.server.web.component.diff.revision.CommentSupport;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.user.avatar.ContributorAvatars;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex 72db25b912..ddcaa46d8e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -64,7 +64,6 @@ import io.onedev.server.search.commit.CommitQueryUtils;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Constants;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.avatar.ContributorAvatars;import io.onedev.server.web.component.build.status.BuildsStatusPanel;import io.onedev.server.web.component.commit.graph.CommitGraphResourceReference;import io.onedev.server.web.component.commit.graph.CommitGraphUtils;@@ -72,6 +71,7 @@ import io.onedev.server.web.component.commit.message.ExpandableCommitMessagePaneimport io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.user.avatar.ContributorAvatars;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex d2c1313d62..11fa2d8a8f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -30,12 +30,12 @@ import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueField;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.modal.ModalPanel.Size;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;@@ -107,7 +107,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {.findByName(field.getValues().iterator().next());if (user != null) {String tooltip = field.getName() + ": " + user.getDisplayName();- Link<Void> link = new AvatarLink(avatarsView.newChildId(), user, null);+ Link<Void> link = new UserAvatarLink(avatarsView.newChildId(), user, null);link.add(AttributeAppender.append("title", tooltip));avatarsView.add(link);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 04e883c4de..3e3cd8e49b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -56,10 +56,10 @@ import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.project.issues.list.IssueListPage;import io.onedev.server.web.util.ComponentContext;@@ -235,7 +235,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {WebMarkupContainer head = new WebMarkupContainer("head");if (user != null) {head.add(new WebMarkupContainer("title").setVisible(false));- head.add(new AvatarLink("avatarLink", user));+ head.add(new UserAvatarLink("avatarLink", user));head.add(new UserLink("userLink", user));} else {head.add(new Label("title", title));diff --git a/core/src/main/java/io/onedev/server/web/page/project/project.css b/core/src/main/java/io/onedev/server/web/page/project/project.cssindex 8c3a472048..1eeac4ecd5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/project.css+++ b/core/src/main/java/io/onedev/server/web/page/project/project.css@@ -1,13 +1,42 @@-.breadcrumb .project .pull-left {- margin-right: 4px;+#project>.sidebar>.head a {+ display: block;+ border-bottom: 2px solid #E0E0E0;+ padding: 6px 22px 6px 4px;+ font-size: 16px;+ white-space: nowrap;+ overflow: hidden;+ text-overflow: ellipsis;+ text-decoration: none;+ color: #444;+ height: 46px;}-.breadcrumb .project .more-info {- background: #424242;- padding: 0 8px;- border-radius: 4px;- font-size: 14px;- margin-top: 6px;- margin-left: 8px;+#project>.sidebar>.head a:hover {+ background: #EEE;+}+#project>.sidebar>.head img {+ width: 32px;+ height: 32px;+}+#project>.sidebar>.head i {+ position: absolute;+ right: 4px;+ top: 14px;+}+#project>.sidebar>.tabs {+ top: 46px;+}+#project>.minimized.sidebar>.head a {+ height: 60px;+}+#project>.minimized.sidebar>.head span {+ display: none;+}+#project>.minimized.sidebar>.head i {+ left: 14px;+ top: 38px;+}+#project>.minimized.sidebar>.tabs {+ top: 60px;}.no-commits>.head {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex 714ee9e5a5..089319171d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -45,9 +45,9 @@ import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;@@ -102,7 +102,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {if (anchor != null)row.setMarkupId(anchor);- row.add(new AvatarLink("avatar", activity.getUser()));+ row.add(new UserAvatarLink("avatar", activity.getUser()));Component content = activity.render("content", new DeleteCallback() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex c1269449bb..1c771b522f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -27,10 +27,10 @@ import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.build.status.BuildsStatusPanel;import io.onedev.server.web.component.commit.message.ExpandableCommitMessagePanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;@@ -73,7 +73,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {protected void populateItem(final ListItem<RevCommit> item) {RevCommit commit = item.getModelObject();- item.add(new AvatarLink("author", commit.getAuthorIdent(), commit.getAuthorIdent().getName()));+ item.add(new UserAvatarLink("author", commit.getAuthorIdent(), commit.getAuthorIdent().getName()));IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.javaindex 645f0321ae..719b3f810b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java@@ -13,6 +13,7 @@ import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;@@ -50,6 +51,7 @@ public abstract class ProjectSettingPage extends ProjectPage {protected List<? extends Tab> newTabs() {List<PageTab> tabs = new ArrayList<>();tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));+ tabs.add(new ProjectSettingTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));tabs.add(new ProjectSettingTab("Teams", "fa fa-fw fa-group", TeamListPage.class, NewTeamPage.class, TeamEditPage.class));tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.htmlnew file mode 100644index 0000000000..419712c414--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.html@@ -0,0 +1,16 @@+<wicket:extend>+ <div class="avatar-edit">+ <img wicket:id="avatar"></img>+ <form wicket:id="form">+ <div wicket:id="feedback"></div>+ <div wicket:id="file"></div>+ <div class="actions">+ <button wicket:id="useUploaded" class="btn btn-primary dirty-aware">Use Uploaded</button>+ <a wicket:id="useDefault" class="btn btn-default">Use Default</a>+ </div>+ </form>+ <div class="help-block">+ The image size should be less than <span wicket:id="maxSize"></span>M bytes.+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.javanew file mode 100644index 0000000000..d98240dc3d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java@@ -0,0 +1,108 @@+package io.onedev.server.web.page.project.setting.avatar;++import java.util.Collection;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.upload.FileUpload;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.lang.Bytes;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.dropzonefield.DropzoneField;+import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.component.project.avatar.ProjectAvatarChanged;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.util.avatar.AvatarManager;++@SuppressWarnings("serial")+public class AvatarEditPage extends ProjectSettingPage {++ private static final int MAX_IMAGE_SIZE = 5;++ private Collection<FileUpload> uploads;++ public AvatarEditPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ProjectAvatar("avatar", getProject()));++ Form<?> form = new Form<Void>("form");+ add(form);++ form.add(new NotificationPanel("feedback", form));+ form.setMaxSize(Bytes.megabytes(MAX_IMAGE_SIZE));+ form.setOutputMarkupId(true);++ form.setMultiPart(true);++ IModel<Collection<FileUpload>> model = new PropertyModel<>(this, "uploads");++ DropzoneField dropzoneField = new DropzoneField("file", model, "image/*", 1, MAX_IMAGE_SIZE);+ dropzoneField.setRequired(true).setLabel(Model.of("Image"));+ form.add(dropzoneField);++ form.add(new AjaxButton("useUploaded") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ FileUpload upload = uploads.iterator().next();+ AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);+ avatarManager.useAvatar(projectModel.getObject().getFacade(), upload);+ send(getPage(), Broadcast.BREADTH, new ProjectAvatarChanged(target, projectModel.getObject()));+ target.add(form);+ }++ });++ form.add(new AjaxLink<Void>("useDefault") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);+ setVisible(avatarManager.getUploaded(projectModel.getObject().getFacade()).exists());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);+ avatarManager.useAvatar(projectModel.getObject().getFacade(), null);+ target.add(form);+ send(getPage(), Broadcast.BREADTH, new ProjectAvatarChanged(target, projectModel.getObject()));+ }++ });++ add(new Label("maxSize", MAX_IMAGE_SIZE));++ setOutputMarkupId(true);+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canAdministrate(getProject().getFacade());+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex 09bb6a59cf..af49f97821 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -67,3 +67,11 @@width: 240px;}+#project-setting .avatar-edit img.project-avatar {+ height: 240px;+ width: 240px;+ margin-bottom: 20px;+}+#project-setting .avatar-edit .upload {+ margin-right: 8px;+}diff --git a/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.html b/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.htmlindex 8145dc09e6..3572279a1e 100644--- a/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.html+++ b/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.html@@ -1,6 +1,6 @@<wicket:extend><div id="forget" class="center-box">- <h1>Reset Password</h1>+ <h1><img src="/img/logo.png" class="logo"></img> Reset Password</h1><form wicket:id="form"><div wicket:id="feedback"></div><div wicket:id="editor"></div>diff --git a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.html b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.htmlindex 7ab93c9faa..1ceb9cffc5 100644--- a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.html+++ b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.html@@ -1,6 +1,6 @@<wicket:extend><div id="login" class="center-box">- <h1>OneDev Login</h1>+ <h1><img src="/img/logo.png" class="logo"></img> OneDev Login</h1><div wicket:id="feedback"></div><form wicket:id="form" method="post"><div class="input-group username">diff --git a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.htmlindex 6f88c11fc1..8f97532cca 100644--- a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html+++ b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.html@@ -1,6 +1,6 @@<wicket:extend><div id="register" class="center-box">- <h1>Register User</h1>+ <h1><img src="/img/logo.png" class="logo"></img> Register User</h1><form wicket:id="form"><div wicket:id="editor"></div><div class="actions">diff --git a/core/src/main/java/io/onedev/server/web/page/security/login.css b/core/src/main/java/io/onedev/server/web/page/security/login.cssindex 2f94debe3b..fd1eb2dc35 100644--- a/core/src/main/java/io/onedev/server/web/page/security/login.css+++ b/core/src/main/java/io/onedev/server/web/page/security/login.css@@ -14,4 +14,4 @@#login .text-right>a {font-size: 16px;margin-left: 20px;-}\ No newline at end of file+}diff --git a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java b/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.javaindex a0841a7963..b3c9fc153a 100644--- a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java@@ -18,9 +18,9 @@ import org.apache.wicket.util.lang.Bytes;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.avatar.Avatar;-import io.onedev.server.web.component.avatar.AvatarChanged;import io.onedev.server.web.component.dropzonefield.DropzoneField;+import io.onedev.server.web.component.user.avatar.UserAvatar;+import io.onedev.server.web.component.user.avatar.UserAvatarChanged;import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")@@ -38,7 +38,7 @@ public class AvatarEditPage extends UserPage {protected void onInitialize() {super.onInitialize();- add(new Avatar("avatar", getUser()));+ add(new UserAvatar("avatar", getUser()));Form<?> form = new Form<Void>("form");add(form);@@ -68,8 +68,8 @@ public class AvatarEditPage extends UserPage {super.onSubmit(target, form);FileUpload upload = uploads.iterator().next();AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);- avatarManager.useAvatar(userModel.getObject(), upload);- send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject()));+ avatarManager.useAvatar(userModel.getObject().getFacade(), upload);+ send(getPage(), Broadcast.BREADTH, new UserAvatarChanged(target, userModel.getObject()));target.add(form);}@@ -87,9 +87,9 @@ public class AvatarEditPage extends UserPage {@Overridepublic void onClick(AjaxRequestTarget target) {AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);- avatarManager.useAvatar(userModel.getObject(), null);+ avatarManager.useAvatar(userModel.getObject().getFacade(), null);target.add(form);- send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject()));+ send(getPage(), Broadcast.BREADTH, new UserAvatarChanged(target, userModel.getObject()));}});diff --git a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java b/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.javaindex 9081b1603d..a83aa904ba 100644--- a/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/NewUserPage.java@@ -1,17 +1,13 @@package io.onedev.server.web.page.user;-import java.util.List;import java.util.Set;import org.apache.shiro.authc.credential.PasswordService;-import org.apache.wicket.Component;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.model.IModel;@@ -24,8 +20,6 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathSegment;@@ -139,46 +133,4 @@ public class NewUserPage extends LayoutPage {response.render(CssHeaderItem.forReference(new UserCssResourceReference()));}- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- if (SecurityUtils.isAdministrator()) {- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, UserListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Users");- }-- };- }-- });- }-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new Label(componentId, "New User") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("div");- }-- };- }-- });-- return breadcrumbs;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.javaindex 410dc10fde..383b491b73 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java@@ -4,7 +4,6 @@ import java.util.ArrayList;import java.util.Iterator;import java.util.List;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;@@ -32,14 +31,12 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.link.UserLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.user.avatar.UserAvatarLink;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.PagingHistorySupport;@@ -109,7 +106,7 @@ public class UserListPage extends LayoutPage {IModel<User> rowModel) {User user = rowModel.getObject();Fragment fragment = new Fragment(componentId, "nameFrag", UserListPage.this);- fragment.add(new AvatarLink("avatarLink", user));+ fragment.add(new UserAvatarLink("avatarLink", user));fragment.add(new UserLink("nameLink", user));cellItem.add(fragment);}@@ -239,27 +236,4 @@ public class UserListPage extends LayoutPage {response.render(CssHeaderItem.forReference(new UserCssResourceReference()));}- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, UserListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Users");- }-- };- }-- });-- return breadcrumbs;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserPage.html b/core/src/main/java/io/onedev/server/web/page/user/UserPage.htmlindex 599aa5e20e..3227535119 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserPage.html@@ -6,6 +6,7 @@</div></div><wicket:fragment wicket:id="sidebarHeadFrag">- <a wicket:id="avatar"><img wicket:id="avatar"></img></a>+ <img wicket:id="avatar"></img>+ <span wicket:id="name"></span></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/user/UserPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserPage.javaindex 16ac83c278..7126d9858a 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/UserPage.java@@ -5,25 +5,21 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ComponentRenderer;-import io.onedev.server.web.component.avatar.Avatar;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.util.model.EntityModel;import io.onedev.utils.StringUtils;@@ -51,23 +47,9 @@ public abstract class UserPage extends LayoutPage {@Overrideprotected Component newHead(String componentId) {Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", UserPage.this);- ViewStateAwarePageLink<Void> avatarLink = new ViewStateAwarePageLink<Void>("avatar",- AvatarEditPage.class, AvatarEditPage.paramsOf(getUser())) {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (!isEnabled())- tag.setName("span");- }-- };- if (!SecurityUtils.canAdministrate(getUser().getFacade())) {- avatarLink.setEnabled(false);- }- avatarLink.add(new Avatar("avatar", userModel.getObject()));- fragment.add(avatarLink);-+ User user = userModel.getObject();+ fragment.add(new UserAvatar("avatar", user).add(AttributeAppender.append("title", user.getDisplayName())));+ fragment.add(new Label("name", user.getDisplayName()));return fragment;}@@ -114,46 +96,4 @@ public abstract class UserPage extends LayoutPage {return params;}- @Override- protected List<ComponentRenderer> getBreadcrumbs() {- List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();-- if (SecurityUtils.isAdministrator()) {- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- return new ViewStateAwarePageLink<Void>(componentId, UserListPage.class) {-- @Override- public IModel<?> getBody() {- return Model.of("Users");- }-- };- }-- });- }-- breadcrumbs.add(new ComponentRenderer() {-- @Override- public Component render(String componentId) {- Label label;- if (SecurityUtils.isAdministrator()) {- label = new Label(componentId, getUser().getDisplayName());- } else {- label = new Label(componentId, "User (" + getUser().getDisplayName() + ")");- }- label.add(AttributeAppender.append("class", "name"));- label.add(AttributeAppender.append("title", getUser().getDisplayName()));- return label;- }-- });-- return breadcrumbs;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/user/user.css b/core/src/main/java/io/onedev/server/web/page/user/user.cssindex 2d32965393..ab5e9eee2c 100644--- a/core/src/main/java/io/onedev/server/web/page/user/user.css+++ b/core/src/main/java/io/onedev/server/web/page/user/user.css@@ -1,22 +1,22 @@#user>.sidebar>.head {- text-align: center;- vertical-align: center;border-bottom: 2px solid #E0E0E0;- padding: 10px;+ padding: 6px 22px 6px 4px;+ font-size: 16px;+ white-space: nowrap;+ overflow: hidden;+ text-overflow: ellipsis;+ height: 46px;}#user>.sidebar>.tabs {- top: 240px;+ top: 46px;}#user>.sidebar>.head img {- height: 220px;- width: 220px;+ height: 32px;+ width: 32px;}-#user>.minimized.sidebar>.head {+#user>.minimized.sidebar>.head>span {display: none;}-#user>.minimized.sidebar>.tabs {- top: 0;-}#user .avatar-edit img.avatar {height: 240px;diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.javaindex 3f0551fa65..834b41e477 100644--- a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java+++ b/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java@@ -7,7 +7,7 @@ import javax.annotation.Nullable;import org.apache.wicket.markup.html.form.upload.FileUpload;import org.eclipse.jgit.lib.PersonIdent;-import io.onedev.server.model.User;+import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;public interface AvatarManager {@@ -22,6 +22,8 @@ public interface AvatarManager {*/String getAvatarUrl(@Nullable UserFacade user);+ String getAvatarUrl(ProjectFacade project);+/*** Get URL of avatar image of specified person.*@@ -32,9 +34,13 @@ public interface AvatarManager {*/String getAvatarUrl(PersonIdent person);- void useAvatar(User user, @Nullable FileUpload avatar);+ void useAvatar(UserFacade user, @Nullable FileUpload upload);++ void useAvatar(ProjectFacade project, @Nullable FileUpload upload);File getUploaded(UserFacade user);+ File getUploaded(ProjectFacade project);+}diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.javaindex ac1d10630d..b535759aec 100644--- a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java+++ b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java@@ -21,8 +21,8 @@ import com.google.common.collect.Iterables;import io.onedev.launcher.bootstrap.Bootstrap;import io.onedev.server.OneDev;import io.onedev.server.manager.SettingManager;-import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;import io.onedev.utils.ExceptionUtils;import io.onedev.utils.FileUtils;@@ -49,11 +49,11 @@ public class DefaultAvatarManager implements AvatarManager {if (user == null) {return AVATARS_BASE_URL + "onedev.png";} else if (user.getId() == null) {- return AVATARS_BASE_URL + "default.png";+ return AVATARS_BASE_URL + "user.png";} else {File avatarFile = getUploaded(user);if (avatarFile.exists()) {- return AVATARS_BASE_URL + "uploaded/" + user.getId() + "?version=" + avatarFile.lastModified();+ return AVATARS_BASE_URL + "uploaded/users/" + user.getId() + "?version=" + avatarFile.lastModified();}if (configManager.getSystemSetting().isGravatarEnabled())@@ -117,16 +117,16 @@ public class DefaultAvatarManager implements AvatarManager {@Overridepublic File getUploaded(UserFacade user) {- return new File(Bootstrap.getSiteDir(), "avatars/uploaded/" + user.getId());+ return new File(Bootstrap.getSiteDir(), "avatars/uploaded/users/" + user.getId());}@Sessional@Override- public void useAvatar(User user, FileUpload upload) {- Lock avatarLock = LockUtils.getLock("uploaded-avatar:" + user.getId());+ public void useAvatar(UserFacade user, FileUpload upload) {+ Lock avatarLock = LockUtils.getLock("uploaded-user-avatar:" + user.getId());avatarLock.lock();try {- File avatarFile = getUploaded(user.getFacade());+ File avatarFile = getUploaded(user);if (upload != null) {FileUtils.createDir(avatarFile.getParentFile());try {@@ -142,4 +142,39 @@ public class DefaultAvatarManager implements AvatarManager {}}+ @Override+ public String getAvatarUrl(ProjectFacade project) {+ File avatarFile = getUploaded(project);+ if (avatarFile.exists())+ return AVATARS_BASE_URL + "uploaded/projects/" + project.getId() + "?version=" + avatarFile.lastModified();+ else+ return AVATARS_BASE_URL + "project.png";+ }++ @Override+ public void useAvatar(ProjectFacade project, FileUpload upload) {+ Lock avatarLock = LockUtils.getLock("uploaded-project-avatar:" + project.getId());+ avatarLock.lock();+ try {+ File avatarFile = getUploaded(project);+ if (upload != null) {+ FileUtils.createDir(avatarFile.getParentFile());+ try {+ upload.writeTo(avatarFile);+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }+ } else {+ FileUtils.deleteFile(avatarFile);+ }+ } finally {+ avatarLock.unlock();+ }+ }++ @Override+ public File getUploaded(ProjectFacade project) {+ return new File(Bootstrap.getSiteDir(), "avatars/uploaded/projects/" + project.getId());+ }+}diff --git a/product/system/site/avatars/onedev.png b/product/system/site/avatars/onedev.pngindex 2876c5b4c2..a21f7379f5 100644Binary files a/product/system/site/avatars/onedev.png and b/product/system/site/avatars/onedev.png differdiff --git a/product/system/site/avatars/project.png b/product/system/site/avatars/project.pngnew file mode 100644index 0000000000..ca719757b4Binary files /dev/null and b/product/system/site/avatars/project.png differdiff --git a/product/system/site/avatars/default.png b/product/system/site/avatars/user.pngsimilarity index 100%rename from product/system/site/avatars/default.pngrename to product/system/site/avatars/user.png