Skip to content

The Unified and Autonomous Development Platform

Reorganize pages and use breadcrumb for easier navigation

robin sheneab3887a4b8c
diff --git a/core/src/main/java/com/gitplex/server/manager/ProjectManager.java b/core/src/main/java/com/gitplex/server/manager/ProjectManager.java
index 94d00152fe..4ac31f7bc5 100644
--- a/core/src/main/java/com/gitplex/server/manager/ProjectManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/ProjectManager.java
@@ -1,11 +1,15 @@
package com.gitplex.server.manager;
+import java.util.Collection;
+
import javax.annotation.Nullable;
import org.eclipse.jgit.lib.Repository;
import com.gitplex.server.model.Project;
+import com.gitplex.server.model.User;
import com.gitplex.server.persistence.dao.EntityManager;
+import com.gitplex.server.util.facade.ProjectFacade;
public interface ProjectManager extends EntityManager<Project> {
@@ -30,4 +34,6 @@ public interface ProjectManager extends EntityManager<Project> {
Repository getRepository(Project project);
+ Collection<ProjectFacade> getAccessibleProjects(@Nullable User user);
+
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
index 777b42df1f..3c6aa98e52 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
@@ -3,6 +3,8 @@ package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -34,6 +36,7 @@ import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.UserAuthorizationManager;
import com.gitplex.server.model.Project;
+import com.gitplex.server.model.User;
import com.gitplex.server.model.UserAuthorization;
import com.gitplex.server.model.support.BranchProtection;
import com.gitplex.server.model.support.TagProtection;
@@ -44,6 +47,10 @@ import com.gitplex.server.security.ProjectPrivilege;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.facade.GroupAuthorizationFacade;
+import com.gitplex.server.util.facade.MembershipFacade;
+import com.gitplex.server.util.facade.ProjectFacade;
+import com.gitplex.server.util.facade.UserAuthorizationFacade;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
@@ -276,4 +283,35 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
}
}
+ @Override
+ public Collection<ProjectFacade> getAccessibleProjects(User user) {
+ Collection<ProjectFacade> projects = new HashSet<>();
+
+ if (SecurityUtils.isAdministrator()) {
+ projects.addAll(cacheManager.getProjects().values());
+ } else {
+ for (ProjectFacade project: cacheManager.getProjects().values()) {
+ if (project.isPublicRead())
+ projects.add(project);
+ }
+ if (user != null) {
+ Collection<Long> groupIds = new HashSet<>();
+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {
+ if (membership.getUserId().equals(user.getId()))
+ groupIds.add(membership.getGroupId());
+ }
+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {
+ if (groupIds.contains(authorization.getGroupId()))
+ projects.add(cacheManager.getProject(authorization.getProjectId()));
+ }
+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
+ if (authorization.getUserId().equals(user.getId()))
+ projects.add(cacheManager.getProject(authorization.getProjectId()));
+ }
+ }
+ }
+
+ return projects;
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/util/validation/GroupNameReservation.java b/core/src/main/java/com/gitplex/server/util/validation/GroupNameReservation.java
deleted file mode 100644
index 45535880e6..0000000000
--- a/core/src/main/java/com/gitplex/server/util/validation/GroupNameReservation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gitplex.server.util.validation;
-
-import java.util.Set;
-
-import com.gitplex.launcher.loader.ExtensionPoint;
-
-@ExtensionPoint
-public interface GroupNameReservation {
- Set<String> getReserved();
-}
diff --git a/core/src/main/java/com/gitplex/server/util/validation/GroupNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/GroupNameValidator.java
index 42788c01cf..d3040cfd5b 100644
--- a/core/src/main/java/com/gitplex/server/util/validation/GroupNameValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/GroupNameValidator.java
@@ -1,19 +1,14 @@
package com.gitplex.server.util.validation;
-import java.util.HashSet;
-import java.util.Set;
import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.util.validation.annotation.GroupName;
public class GroupNameValidator implements ConstraintValidator<GroupName, String> {
- private static Set<String> reservedNames;
-
private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");
public void initialize(GroupName constaintAnnotation) {
@@ -27,23 +22,14 @@ public class GroupNameValidator implements ConstraintValidator<GroupName, String
String message = "Only alphanumeric, underscore, dash, and dot are accepted";
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
- } else if (getReservedNames().contains(value)) {
+ } else if (value.equals("new")) {
constraintContext.disableDefaultConstraintViolation();
- constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved word").addConstraintViolation();
+ String message = "'new' is reserved and can not be used as group name";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
} else {
return true;
}
}
-
- public static synchronized Set<String> getReservedNames() {
- if (reservedNames == null) {
- reservedNames = new HashSet<>();
- for (GroupNameReservation each : AppLoader.getExtensions(GroupNameReservation.class)) {
- reservedNames.addAll(each.getReserved());
- }
- }
- return reservedNames;
- }
-
+
}
diff --git a/core/src/main/java/com/gitplex/server/util/validation/ProjectNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/ProjectNameValidator.java
index 2ee83db62a..ec850c8d7b 100644
--- a/core/src/main/java/com/gitplex/server/util/validation/ProjectNameValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/ProjectNameValidator.java
@@ -22,6 +22,11 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, St
String message = "Only alphanumeric, underscore, dash, and dot are accepted";
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
+ } else if (value.equals("new")) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = "'new' is reserved and can not be used as project name";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
} else {
return true;
}
diff --git a/core/src/main/java/com/gitplex/server/util/validation/UserNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/UserNameValidator.java
index 7c4501d13a..b7ea42466f 100644
--- a/core/src/main/java/com/gitplex/server/util/validation/UserNameValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/UserNameValidator.java
@@ -22,6 +22,11 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>
String message = "Only alphanumeric, underscore, dash, and dot are accepted";
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
+ } else if (value.equals("new")) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = "'new' is reserved and can not be used as user name";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
} else {
return true;
}
diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java
index 8d2ee740f8..92ae3909a2 100644
--- a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java
@@ -15,17 +15,15 @@ import com.gitplex.server.web.page.admin.SecuritySettingPage;
import com.gitplex.server.web.page.admin.ServerInformationPage;
import com.gitplex.server.web.page.admin.ServerLogPage;
import com.gitplex.server.web.page.admin.SystemSettingPage;
-import com.gitplex.server.web.page.admin.group.GroupListPage;
-import com.gitplex.server.web.page.admin.group.NewGroupPage;
-import com.gitplex.server.web.page.admin.user.NewUserPage;
-import com.gitplex.server.web.page.admin.user.UserListPage;
import com.gitplex.server.web.page.group.GroupAuthorizationsPage;
-import com.gitplex.server.web.page.group.GroupProfilePage;
+import com.gitplex.server.web.page.group.GroupListPage;
import com.gitplex.server.web.page.group.GroupMembershipsPage;
+import com.gitplex.server.web.page.group.GroupProfilePage;
+import com.gitplex.server.web.page.group.NewGroupPage;
import com.gitplex.server.web.page.init.ServerInitPage;
-import com.gitplex.server.web.page.init.WelcomePage;
-import com.gitplex.server.web.page.layout.NewProjectPage;
+import com.gitplex.server.web.page.project.NewProjectPage;
import com.gitplex.server.web.page.project.NoBranchesPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.branches.ProjectBranchesPage;
import com.gitplex.server.web.page.project.commit.CommitDetailPage;
@@ -49,9 +47,11 @@ import com.gitplex.server.web.page.security.LogoutPage;
import com.gitplex.server.web.page.security.RegisterPage;
import com.gitplex.server.web.page.test.TestPage;
import com.gitplex.server.web.page.user.AvatarEditPage;
+import com.gitplex.server.web.page.user.NewUserPage;
import com.gitplex.server.web.page.user.PasswordEditPage;
import com.gitplex.server.web.page.user.TaskListPage;
import com.gitplex.server.web.page.user.UserAuthorizationsPage;
+import com.gitplex.server.web.page.user.UserListPage;
import com.gitplex.server.web.page.user.UserMembershipsPage;
import com.gitplex.server.web.page.user.UserProfilePage;
import com.gitplex.server.web.util.mapper.WebPageMapper;
@@ -64,7 +64,6 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {
public GitPlexUrlMapper(WebApplication app) {
add(new WebPageMapper("init", ServerInitPage.class));
- add(new WebPageMapper("welcome", WelcomePage.class));
addAdministrationPages();
addUserPages();
addGroupPages();
@@ -72,7 +71,6 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {
addSecurityPages();
add(new WebPageMapper("test", TestPage.class));
- add(new WebPageMapper("new-project", NewProjectPage.class));
addResources();
}
@@ -93,10 +91,6 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {
}
private void addAdministrationPages() {
- add(new WebPageMapper("administration/users", UserListPage.class));
- add(new WebPageMapper("administration/users/new", NewUserPage.class));
- add(new WebPageMapper("administration/groups", GroupListPage.class));
- add(new WebPageMapper("administration/groups/new", NewGroupPage.class));
add(new WebPageMapper("administration/settings/system", SystemSettingPage.class));
add(new WebPageMapper("administration/settings/mail", MailSettingPage.class));
add(new WebPageMapper("administration/settings/backup", DatabaseBackupPage.class));
@@ -106,6 +100,8 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {
}
private void addUserPages() {
+ add(new WebPageMapper("users", UserListPage.class));
+ add(new WebPageMapper("users/new", NewUserPage.class));
add(new WebPageMapper("users/${user}/profile", UserProfilePage.class));
add(new WebPageMapper("users/${user}/groups", UserMembershipsPage.class));
add(new WebPageMapper("users/${user}/authorizations", UserAuthorizationsPage.class));
@@ -115,12 +111,16 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {
}
private void addGroupPages() {
+ add(new WebPageMapper("groups", GroupListPage.class));
+ add(new WebPageMapper("groups/new", NewGroupPage.class));
add(new WebPageMapper("groups/${group}/profile", GroupProfilePage.class));
add(new WebPageMapper("groups/${group}/members", GroupMembershipsPage.class));
add(new WebPageMapper("groups/${group}/authorizations", GroupAuthorizationsPage.class));
}
private void addProjectPages() {
+ add(new WebPageMapper("projects", ProjectListPage.class));
+ add(new WebPageMapper("projects/new", NewProjectPage.class));
add(new WebPageMapper("projects/${project}", ProjectBlobPage.class));
add(new WebPageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) {
diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java
index c737034618..59c3e7fd60 100644
--- a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java
+++ b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java
@@ -49,10 +49,10 @@ import com.gitplex.launcher.bootstrap.Bootstrap;
import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.util.ExceptionUtils;
import com.gitplex.server.web.page.base.BasePage;
+import com.gitplex.server.web.page.dashboard.DashboardPage;
import com.gitplex.server.web.page.error.BaseErrorPage;
import com.gitplex.server.web.page.error.ExpectedExceptionPage;
import com.gitplex.server.web.page.error.UnexpectedExceptionPage;
-import com.gitplex.server.web.page.home.DashboardPage;
import com.gitplex.server.web.util.AbsoluteUrlRenderer;
import com.gitplex.server.web.util.resourcebundle.ResourceBundleReferences;
import com.gitplex.server.web.websocket.WebSocketManager;
diff --git a/web/src/main/java/com/gitplex/server/web/WebGroupNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebGroupNameReservation.java
deleted file mode 100644
index bc9c997791..0000000000
--- a/web/src/main/java/com/gitplex/server/web/WebGroupNameReservation.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gitplex.server.web;
-
-import java.util.Set;
-
-import com.gitplex.server.util.validation.GroupNameReservation;
-import com.google.common.collect.Sets;
-
-public class WebGroupNameReservation implements GroupNameReservation {
-
- @Override
- public Set<String> getReserved() {
- return Sets.newHashSet("new"); // reserved for url segment when creating new group
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java
index f885c898d3..c72c7b2d9d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java
@@ -6,15 +6,14 @@ 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.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.tabbable.PageTab;
import com.gitplex.server.web.component.tabbable.Tabbable;
-import com.gitplex.server.web.page.admin.group.NewGroupPage;
-import com.gitplex.server.web.page.admin.group.GroupListPage;
-import com.gitplex.server.web.page.admin.user.NewUserPage;
-import com.gitplex.server.web.page.admin.user.UserListPage;
import com.gitplex.server.web.page.layout.LayoutPage;
@SuppressWarnings("serial")
@@ -34,8 +33,6 @@ public abstract class AdministrationPage extends LayoutPage {
tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));
tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));
tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));
- tabs.add(new AdministrationTab("User Management", "fa fa-fw fa-user", UserListPage.class, NewUserPage.class));
- tabs.add(new AdministrationTab("Group Management", "fa fa-fw fa-group", GroupListPage.class, NewGroupPage.class));
tabs.add(new AdministrationTab("Server Log", "fa fa-fw fa-file-text-o", ServerLogPage.class));
tabs.add(new AdministrationTab("Server Information", "fa fa-fw fa-desktop", ServerInformationPage.class));
@@ -49,8 +46,26 @@ public abstract class AdministrationPage extends LayoutPage {
}
@Override
- protected Component newContextHead(String componentId) {
- return new Label(componentId, "Server Administration");
+ 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/web/src/main/java/com/gitplex/server/web/page/admin/administration.css b/web/src/main/java/com/gitplex/server/web/page/admin/administration.css
index 8d1475bf2b..8cd2fd76f5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/administration.css
@@ -27,10 +27,3 @@
color: white;
}
-#user-add .actions .btn {
- margin-right: 20px;
-}
-
-.group.list .actions a, .user.list .actions a {
- color: #666;
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.html
deleted file mode 100644
index e1a19af7ca..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<wicket:extend>
- <section id="group-add">
- <div class="head">Add New Group</div>
- <div class="body">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="checkbox">
- <label>
- <input wicket:id="administrator" type="checkbox"/> Is Administrator
- <div class="help-block">Members of administrator group have administrative rights over the whole system</div>
- </label>
- </div>
- <div class="checkbox">
- <label>
- <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects
- <div class="help-block">Check this to make members of this group able to fork/create projects</div>
- </label>
- </div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>
- </div>
- </form>
- </div>
- </section>
-</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.html
deleted file mode 100644
index f894bd1f21..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<wicket:extend>
- <section id="user-add">
- <div class="head">Add New User</div>
- <div class="body">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions clearfix">
- <input class="btn btn-primary dirty-aware pull-left" value="Create" type="submit"></input>
- <div class="checkbox pull-left">
- <label> <input wicket:id="continueToAdd" type="checkbox"> Continue to add other user after create</label>
- </div>
- </div>
- </form>
- </div>
- </section>
-</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.html b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.html
new file mode 100644
index 0000000000..a34725e89c
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.html
@@ -0,0 +1,18 @@
+<wicket:extend>
+ <div id="dashboard">
+ <div class="summary">
+ <a wicket:id="projects"><i class="fa fa-ext fa-fw fa-repo"></i> <span wicket:id="count"></span> projects</a> <a wicket:id="addProject"><i class="fa fa-plus"></i> add new</a>
+ </div>
+ <div class="summary">
+ <a wicket:id="users"><i class="fa fa-user fa-fw"></i> <span wicket:id="count"></span> users</a> <a wicket:id="addUser"><i class="fa fa-plus"></i> add new</a>
+ </div>
+ <div class="summary">
+ <a wicket:id="groups"><i class="fa fa-group fa-fw"></i> <span wicket:id="count"></span> groups</a> <a wicket:id="addGroup"><i class="fa fa-plus"></i> add new</a>
+ </div>
+ <wicket:enclosure child="administration">
+ <div class="summary">
+ <a wicket:id="administration"><i class="fa fa-cog fa-fw"></i> server administration</a>
+ </div>
+ </wicket:enclosure>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java
new file mode 100644
index 0000000000..0ca1a1ea57
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java
@@ -0,0 +1,108 @@
+package com.gitplex.server.web.page.dashboard;
+
+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.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.GroupManager;
+import com.gitplex.server.manager.ProjectManager;
+import com.gitplex.server.manager.UserManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
+import com.gitplex.server.web.page.admin.SystemSettingPage;
+import com.gitplex.server.web.page.group.GroupListPage;
+import com.gitplex.server.web.page.group.NewGroupPage;
+import com.gitplex.server.web.page.layout.LayoutPage;
+import com.gitplex.server.web.page.project.NewProjectPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
+import com.gitplex.server.web.page.user.NewUserPage;
+import com.gitplex.server.web.page.user.UserListPage;
+
+import jersey.repackaged.com.google.common.collect.Lists;
+
+@SuppressWarnings("serial")
+public class DashboardPage extends LayoutPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Link<Void> link = new BookmarkablePageLink<Void>("projects", ProjectListPage.class);
+ link.add(new Label("count", GitPlex.getInstance(ProjectManager.class)
+ .getAccessibleProjects(getLoginUser()).size()));
+ add(link);
+
+ add(new BookmarkablePageLink<Void>("addProject", NewProjectPage.class) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canCreateProjects());
+ }
+
+ });
+
+ link = new BookmarkablePageLink<Void>("users", UserListPage.class);
+ link.add(new Label("count", GitPlex.getInstance(UserManager.class).findAll().size()));
+ add(link);
+
+ add(new BookmarkablePageLink<Void>("addUser", NewUserPage.class) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
+ }
+
+ });
+
+ link = new BookmarkablePageLink<Void>("groups", GroupListPage.class);
+ link.add(new Label("count", GitPlex.getInstance(GroupManager.class).findAll().size()));
+ add(link);
+
+ add(new BookmarkablePageLink<Void>("addGroup", NewGroupPage.class) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
+ }
+
+ });
+
+ add(new BookmarkablePageLink<Void>("administration", SystemSettingPage.class) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
+ }
+
+ });
+ }
+
+ @Override
+ protected List<ComponentRenderer> getBreadcrumbs() {
+ return Lists.newArrayList(new ComponentRenderer() {
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, "Home");
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new DashboardResourceReference()));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardResourceReference.java
new file mode 100644
index 0000000000..ff2538ee83
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardResourceReference.java
@@ -0,0 +1,13 @@
+package com.gitplex.server.web.page.dashboard;
+
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
+
+public class DashboardResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public DashboardResourceReference() {
+ super(DashboardResourceReference.class, "dashboard.css");
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css b/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css
new file mode 100644
index 0000000000..19d3e0e1f1
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css
@@ -0,0 +1,17 @@
+#dashboard {
+ padding: 20px;
+}
+
+#dashboard .summary {
+ margin-bottom: 20px;
+ border-bottom: 1px solid #DDD;
+ padding-bottom: 20px;
+}
+#dashboard .summary a {
+ color: #444;
+ font-size: 20px;
+ margin-right: 20px;
+}
+#dashboard .summary a .fa-ext {
+ font-size: 20px;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java b/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java
index 33550a13dc..b53265a000 100644
--- a/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java
@@ -10,7 +10,7 @@ import org.apache.wicket.util.string.Strings;
import com.gitplex.server.util.WordUtils;
import com.gitplex.server.web.component.MultilineLabel;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
-import com.gitplex.server.web.page.home.DashboardPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
@SuppressWarnings("serial")
public class ExpectedExceptionPage extends BaseErrorPage {
@@ -39,7 +39,7 @@ public class ExpectedExceptionPage extends BaseErrorPage {
container.add(new Label("title", title));
container.add(new Label("description", exception.getMessage()));
- container.add(new ViewStateAwarePageLink<Void>("dashboard", DashboardPage.class));
+ container.add(new ViewStateAwarePageLink<Void>("dashboard", ProjectListPage.class));
container.add(new AjaxLink<Void>("showDetail") {
diff --git a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java
index b752538e42..0013259da4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java
@@ -38,7 +38,7 @@ import com.gitplex.server.manager.ConfigManager;
import com.gitplex.server.model.User;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.util.StringUtils;
-import com.gitplex.server.web.page.home.DashboardPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
import com.gitplex.server.web.util.DateUtils;
@SuppressWarnings("serial")
@@ -119,8 +119,8 @@ public class UnexpectedExceptionPage extends BaseErrorPage {
}
});
- add(new BookmarkablePageLink<Void>("dashboardTop", DashboardPage.class));
- add(new BookmarkablePageLink<Void>("dashboardBottom", DashboardPage.class));
+ add(new BookmarkablePageLink<Void>("dashboardTop", ProjectListPage.class));
+ add(new BookmarkablePageLink<Void>("dashboardBottom", ProjectListPage.class));
add(new WebMarkupContainer("dashboardUrl") {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.html b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.html
similarity index 86%
rename from web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.html
rename to web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.html
index fa04965be8..d1b59450df 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <section class="group list">
+ <div class="group list">
<div class="head clearfix">
<div class="pull-left">
<input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name"></input>
@@ -11,12 +11,12 @@
<div class="body">
<table wicket:id="groups" class="groups table table-hover"></table>
</div>
- </section>
+ </div>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="name"></a>
</wicket:fragment>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="setting" title="Setting of this group"><i class="fa fa-cog"></i></a>
+ <a wicket:id="profile" title="Profile of this group"><i class="fa fa-cog"></i></a>
<a wicket:id="delete" title="Delete this group"><i class="fa fa-trash"></i></a>
</wicket:fragment>
</wicket:extend>
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java
similarity index 79%
rename from web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.java
rename to web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java
index 41d543512f..ab8ca9dd62 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/group/GroupListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java
@@ -1,9 +1,10 @@
-package com.gitplex.server.web.page.admin.group;
+package com.gitplex.server.web.page.group;
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;
@@ -11,6 +12,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColu
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+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.TextField;
import org.apache.wicket.markup.html.link.Link;
@@ -27,16 +30,18 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.GroupManager;
import com.gitplex.server.model.Group;
import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.datatable.DefaultDataTable;
import com.gitplex.server.web.component.link.LabelLink;
-import com.gitplex.server.web.page.admin.AdministrationPage;
-import com.gitplex.server.web.page.group.GroupProfilePage;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.page.layout.LayoutPage;
import com.gitplex.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
-public class GroupListPage extends AdministrationPage {
+public class GroupListPage extends LayoutPage {
private DataTable<Group, Void> groupsTable;
@@ -72,6 +77,12 @@ public class GroupListPage extends AdministrationPage {
setResponsePage(NewGroupPage.class);
}
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
+ }
+
});
List<IColumn<Group, Void>> columns = new ArrayList<>();
@@ -123,7 +134,7 @@ public class GroupListPage extends AdministrationPage {
Group group = rowModel.getObject();
- fragment.add(new Link<Void>("setting") {
+ fragment.add(new Link<Void>("profile") {
@Override
public void onClick() {
@@ -139,6 +150,12 @@ public class GroupListPage extends AdministrationPage {
setResponsePage(GroupListPage.class);
}
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
+ }
+
}.add(new ConfirmOnClick("Do you really want to delete group '" + group.getName() + "'?")));
cellItem.add(fragment);
@@ -178,4 +195,33 @@ public class GroupListPage extends AdministrationPage {
WebConstants.PAGE_SIZE));
}
+ @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, GroupListPage.class) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("Groups");
+ }
+
+ };
+ }
+
+ });
+
+ return breadcrumbs;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new GroupResourceReference()));
+ }
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java
index d48cb68a0f..c642554772 100644
--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java
@@ -8,12 +8,15 @@ 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.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.GroupManager;
import com.gitplex.server.model.Group;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.tabbable.PageTab;
import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.layout.LayoutPage;
@@ -73,8 +76,35 @@ public abstract class GroupPage extends LayoutPage {
}
@Override
- protected Component newContextHead(String componentId) {
- return new Label(componentId, "Group - " + getGroup().getName());
- }
+ protected List<ComponentRenderer> getBreadcrumbs() {
+ List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();
+
+ breadcrumbs.add(new ComponentRenderer() {
+
+ @Override
+ public Component render(String componentId) {
+ return new ViewStateAwarePageLink<Void>(componentId, GroupListPage.class) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("Groups");
+ }
+
+ };
+ }
+
+ });
+ breadcrumbs.add(new ComponentRenderer() {
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, getGroup().getName());
+ }
+
+ });
+
+ return breadcrumbs;
+ }
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java
index 14f711033a..1d6a532e10 100644
--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java
@@ -20,7 +20,7 @@ import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.BeanDescriptor;
import com.gitplex.server.web.editable.BeanEditor;
import com.gitplex.server.web.editable.PathSegment;
-import com.gitplex.server.web.page.home.DashboardPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
import com.gitplex.server.web.util.ConfirmOnClick;
import com.google.common.collect.Sets;
@@ -129,7 +129,7 @@ public class GroupProfilePage extends GroupPage {
@Override
public void onClick() {
GitPlex.getInstance(GroupManager.class).delete(getGroup());
- setResponsePage(DashboardPage.class);
+ setResponsePage(ProjectListPage.class);
}
}.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));
diff --git a/web/src/main/java/com/gitplex/server/web/page/group/NewGroupPage.html b/web/src/main/java/com/gitplex/server/web/page/group/NewGroupPage.html
new file mode 100644
index 0000000000..7a9c13bf11
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/group/NewGroupPage.html
@@ -0,0 +1,22 @@
+<wicket:extend>
+ <div class="new-group">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="checkbox">
+ <label>
+ <input wicket:id="administrator" type="checkbox"/> Is Administrator
+ <div class="help-block">Members of administrator group have administrative rights over the whole system</div>
+ </label>
+ </div>
+ <div class="checkbox">
+ <label>
+ <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects
+ <div class="help-block">Check this to make members of this group able to fork/create projects</div>
+ </label>
+ </div>
+ <div class="actions clearfix">
+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></input>
+ </div>
+ </form>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.java b/web/src/main/java/com/gitplex/server/web/page/group/NewGroupPage.java
similarity index 60%
rename from web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.java
rename to web/src/main/java/com/gitplex/server/web/page/group/NewGroupPage.java
index 8c1af6cc80..2d24a919a2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/group/NewGroupPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/group/NewGroupPage.java
@@ -1,24 +1,34 @@
-package com.gitplex.server.web.page.admin.group;
+package com.gitplex.server.web.page.group;
+import java.util.List;
+
+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;
import org.apache.wicket.model.Model;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.GroupManager;
import com.gitplex.server.model.Group;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.BeanEditor;
import com.gitplex.server.web.editable.PathSegment;
-import com.gitplex.server.web.page.admin.AdministrationPage;
-import com.gitplex.server.web.page.group.GroupMembershipsPage;
+import com.gitplex.server.web.page.layout.LayoutPage;
import com.google.common.collect.Sets;
@SuppressWarnings("serial")
-public class NewGroupPage extends AdministrationPage {
+public class NewGroupPage extends LayoutPage {
private Group group = new Group();
@@ -83,4 +93,55 @@ public class NewGroupPage extends AdministrationPage {
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, GroupListPage.class) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("Groups");
+ }
+
+ };
+ }
+
+ });
+
+ breadcrumbs.add(new ComponentRenderer() {
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, "New Group") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("div");
+ }
+
+ };
+ }
+
+ });
+
+ return breadcrumbs;
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.isAdministrator();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new GroupResourceReference()));
+ }
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/group/group.css b/web/src/main/java/com/gitplex/server/web/page/group/group.css
index 33abfe3f04..dcce9d456a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/group/group.css
+++ b/web/src/main/java/com/gitplex/server/web/page/group/group.css
@@ -7,4 +7,11 @@
#group .authorization.list .head .select2-container,
#group .membership.list .head .select2-container {
width: 240px;
-}
\ No newline at end of file
+}
+
+.group.list, .new-group {
+ padding: 20px;
+}
+.group.list .actions a {
+ color: #666;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/home/DashboardResourceReference.java
deleted file mode 100644
index 52afd2300a..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitplex.server.web.page.home;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class DashboardResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public DashboardResourceReference() {
- super(DashboardResourceReference.class, "dashboard.css");
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css b/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css
deleted file mode 100644
index 5eec63cd8e..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css
+++ /dev/null
@@ -1,36 +0,0 @@
-#dashboard {
- padding: 20px;
-}
-#dashboard .head>div {
- margin-right: 20px;
-}
-#dashboard>div, #dashboard>ul {
- margin-bottom: 20px;
-}
-#dashboard ul li a {
- display: block;
- text-decoration: none;
- padding: 6px 12px;
- color: #333;
-}
-#dashboard ul li a:hover {
- background: #EEE;
-}
-
-#dashboard table.projects {
- font-size: 13px;
-}
-#dashboard table.projects td.project {
- font-size: 14px;
-}
-
-#dashboard table.projects a {
- color: #444;
-}
-#dashboard table.projects td.author img.avatar {
- width: 20px;
- height: 20px;
-}
-#dashboard table.projects td.author span, #dashboard table.projects td.commit-date {
- color: #888;
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java b/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java
index e903eb1df7..933f40c9c2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java
@@ -22,6 +22,7 @@ import com.gitplex.server.web.WebSession;
import com.gitplex.server.web.component.wizard.ManualConfigStep;
import com.gitplex.server.web.component.wizard.Wizard;
import com.gitplex.server.web.page.base.BasePage;
+import com.gitplex.server.web.page.dashboard.DashboardPage;
@SuppressWarnings("serial")
public class ServerInitPage extends BasePage {
@@ -98,7 +99,7 @@ public class ServerInitPage extends BasePage {
WebSession.get().logout();
User root = GitPlex.getInstance(UserManager.class).getRoot();
SecurityUtils.getSubject().runAs(root.getPrincipals());
- throw new RestartResponseException(WelcomePage.class);
+ throw new RestartResponseException(DashboardPage.class);
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.html b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.html
deleted file mode 100644
index 8b3f2e7c13..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<wicket:extend>
- <div id="welcome">
- <div class="head">Welcome to GitPlex</div>
- <div class="body well">
- You may <a wicket:id="addProject">add a project</a> or <a wicket:id="addUser">add an user</a> now
- </div>
- </div>
-</wicket:extend>
diff --git a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java
deleted file mode 100644
index 980f2c3e7b..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gitplex.server.web.page.init;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-
-import com.gitplex.server.web.page.admin.user.NewUserPage;
-import com.gitplex.server.web.page.layout.LayoutPage;
-import com.gitplex.server.web.page.layout.NewProjectPage;
-
-@SuppressWarnings("serial")
-public class WelcomePage extends LayoutPage {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new BookmarkablePageLink<Void>("addProject", NewProjectPage.class));
- add(new BookmarkablePageLink<Void>("addUser", NewUserPage.class));
- }
-
- @Override
- protected boolean isPermitted() {
- return getLoginUser() != null;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new WelcomeResourceReference()));
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/init/WelcomeResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/init/WelcomeResourceReference.java
deleted file mode 100644
index d7bb916f6d..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/init/WelcomeResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitplex.server.web.page.init;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class WelcomeResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public WelcomeResourceReference() {
- super(WelcomeResourceReference.class, "welcome.css");
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html
index cfcbc7aa6d..381a91abe8 100644
--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.html
@@ -4,7 +4,10 @@
<div class="logo pull-left">
<a wicket:id="home" title="Dashboard"><i class="fa fa-ext fa-gitplex-logo"></i></a>
</div>
- <div wicket:id="context" class="context pull-left"></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">
@@ -42,7 +45,6 @@
</div>
<wicket:fragment wicket:id="userMenuFrag">
<div class="user">
- <a wicket:id="administration"><i class="fa fa-fw fa-wrench"></i> Server administration</a>
<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>
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
index 56874c2524..11a99e33b6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
@@ -1,7 +1,9 @@
package com.gitplex.server.web.page.layout;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
@@ -12,7 +14,11 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
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.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.gitplex.launcher.loader.AppLoader;
@@ -21,13 +27,15 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.ConfigManager;
import com.gitplex.server.model.User;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.floating.AlignPlacement;
import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
-import com.gitplex.server.web.page.admin.SystemSettingPage;
import com.gitplex.server.web.page.base.BasePage;
+import com.gitplex.server.web.page.dashboard.DashboardPage;
+import com.gitplex.server.web.page.project.NewProjectPage;
import com.gitplex.server.web.page.security.LoginPage;
import com.gitplex.server.web.page.security.LogoutPage;
import com.gitplex.server.web.page.security.RegisterPage;
@@ -57,8 +65,16 @@ public abstract class LayoutPage extends BasePage {
add(head);
head.add(new ViewStateAwarePageLink<Void>("home", getApplication().getHomePage()));
-
- head.add(newContextHead("context"));
+
+ head.add(new ListView<ComponentRenderer>("breadcrumbs", getBreadcrumbs()) {
+
+ @Override
+ protected void populateItem(ListItem<ComponentRenderer> item) {
+ item.add(item.getModelObject().render("nav"));
+ item.add(new WebMarkupContainer("separator").setVisible(item.getIndex() != getList().size()-1));
+ }
+
+ });
head.add(new ViewStateAwarePageLink<Void>("createProject", NewProjectPage.class) {
@@ -120,15 +136,6 @@ public abstract class LayoutPage extends BasePage {
fragment.add(new ViewStateAwarePageLink<Void>("profile",
UserProfilePage.class, UserProfilePage.paramsOf(user)));
- fragment.add(new ViewStateAwarePageLink<Void>("administration", SystemSettingPage.class) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.isAdministrator());
- }
-
- });
fragment.add(new ViewStateAwarePageLink<Void>("logout", LogoutPage.class));
return fragment;
@@ -160,9 +167,26 @@ public abstract class LayoutPage extends BasePage {
});
}
- protected Component newContextHead(String componentId) {
- return new WebMarkupContainer(componentId);
- }
+ protected List<ComponentRenderer> getBreadcrumbs() {
+ List<ComponentRenderer> breadcrumbs = new ArrayList<>();
+
+ breadcrumbs.add(new ComponentRenderer() {
+
+ @Override
+ public Component render(String componentId) {
+ return new ViewStateAwarePageLink<Void>(componentId, DashboardPage.class) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("Home");
+ }
+
+ };
+ }
+ });
+
+ return breadcrumbs;
+ };
protected boolean isLoggedIn() {
return getLoginUser() != null;
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.html b/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.html
deleted file mode 100644
index fe86bd870f..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<wicket:extend>
- <section id="project-add">
- <div class="head">Create New Project</div>
- <div class="body">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input class="btn btn-primary dirty-aware" value="Create" type="submit"></input>
- </div>
- </form>
- </div>
- </section>
-</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.java
deleted file mode 100644
index 00f4062e45..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/layout/NewProjectPage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.gitplex.server.web.page.layout;
-
-import org.apache.wicket.Session;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.manager.ProjectManager;
-import com.gitplex.server.model.Project;
-import com.gitplex.server.web.editable.BeanContext;
-import com.gitplex.server.web.editable.BeanEditor;
-import com.gitplex.server.web.editable.PathSegment;
-import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
-
-@SuppressWarnings("serial")
-public class NewProjectPage extends LayoutPage {
-
- public NewProjectPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Project project = new Project();
-
- BeanEditor<?> editor = BeanContext.editBean("editor", project);
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
-
- ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);
- Project projectWithSameName = projectManager.find(project.getName());
- if (projectWithSameName != null) {
- editor.getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another project");
- } else {
- projectManager.save(project, null);
- Session.get().success("New project created");
- setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
- }
- }
-
- };
- form.add(editor);
-
- add(form);
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/layout.css b/web/src/main/java/com/gitplex/server/web/page/layout/layout.css
index 87d353a902..33b3e750eb 100644
--- a/web/src/main/java/com/gitplex/server/web/page/layout/layout.css
+++ b/web/src/main/java/com/gitplex/server/web/page/layout/layout.css
@@ -4,6 +4,7 @@ html, body {
#main>.head {
background: #010203;
padding: 8px 16px;
+ color: #CCC;
}
#main>.head>div {
margin-right: 20px;
@@ -16,25 +17,15 @@ html, body {
font-size: 28px;
color: #EEE;
}
-#main>.head>.context {
- color: #CCC;
+#main>.head>.breadcrumb {
+ padding: 0;
+ margin: 0;
+ background: inherit;
+ border-radius: 0;
font-size: 20px;
}
-#main>.head>.search {
- padding-top: 2px;
- position: relative;
-}
-#main>.head>.search input {
- background: #333;
- border: 1px solid #333;
- box-shadow: none;
- transition: none;
- color: #CCC;
-}
-#main>.head>.search input:FOCUS {
- background: #DDD;
- border-color: #DDD;
- color: #333;
+#main>.head>.breadcrumb .separator {
+ margin: 0 8px;
}
#main>.head>.actions {
padding-top: 7px;
@@ -125,10 +116,6 @@ html, body {
#main>.foot>div {
white-space: nowrap;
}
-section>.head {
- font-size: 18px;
- margin-bottom: 20px;
-}
#project-add {
padding: 20px;
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/NewProjectPage.html b/web/src/main/java/com/gitplex/server/web/page/project/NewProjectPage.html
new file mode 100644
index 0000000000..fdfc4ab575
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/project/NewProjectPage.html
@@ -0,0 +1,10 @@
+<wicket:extend>
+ <div class="new-project">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <input class="btn btn-primary dirty-aware" value="Create" type="submit"></input>
+ </div>
+ </form>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/NewProjectPage.java b/web/src/main/java/com/gitplex/server/web/page/project/NewProjectPage.java
new file mode 100644
index 0000000000..591e6415c4
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/project/NewProjectPage.java
@@ -0,0 +1,118 @@
+package com.gitplex.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 com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.ProjectManager;
+import com.gitplex.server.model.Project;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.page.layout.LayoutPage;
+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
+
+@SuppressWarnings("serial")
+public class NewProjectPage extends LayoutPage {
+
+ public NewProjectPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Project project = new Project();
+
+ BeanEditor<?> editor = BeanContext.editBean("editor", project);
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);
+ Project projectWithSameName = projectManager.find(project.getName());
+ if (projectWithSameName != null) {
+ editor.getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another project");
+ } else {
+ projectManager.save(project, null);
+ Session.get().success("New project created");
+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
+ }
+ }
+
+ };
+ form.add(editor);
+
+ 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;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new ProjectResourceReference()));
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canCreateProjects();
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.html b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.html
index 6aa413ae7d..cec22c9b6a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <section id="no-branches">
+ <div class="no-branches">
<div class="head">Project does not have any branches yet</div>
<div class="body">
<div><i class="fa fa-hand-o-right"></i> You may initialize code of the project from command line:</div>
@@ -18,5 +18,5 @@
</ul>
<div class="help-block"><i class="fa fa-info-circle"></i> In case remote <em>origin</em> already exists, use another name other than <em>origin</em>, or run command <em>git remote set-url origin <span wicket:id="url3"></span></em> instead</div>
</div>
- </section>
+ </div>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.java
index 1c4c104598..ec8c41103a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesPage.java
@@ -1,8 +1,6 @@
package com.gitplex.server.web.page.project;
import org.apache.wicket.RestartResponseException;
-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.request.mapper.parameter.PageParameters;
@@ -27,10 +25,4 @@ public class NoBranchesPage extends ProjectPage {
add(new Label("url3", getProject().getUrl()));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new NoBranchesResourceReference()));
- }
-
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesResourceReference.java
deleted file mode 100644
index bcf4f83fa3..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/project/NoBranchesResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitplex.server.web.page.project;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class NoBranchesResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public NoBranchesResourceReference() {
- super(NoBranchesResourceReference.class, "no-branches.css");
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.html
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
rename to web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.html
index c31d5575bd..cbb6bdae31 100644
--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div id="dashboard">
+ <div class="project list">
<div class="head clearfix">
<div class="pull-left">
<input wicket:id="filterProjects" class="form-control search" placeholder="Filter projects"></input>
@@ -15,7 +15,7 @@
<div wicket:id="orphanProjectsNote" class="alert alert-warning">Orphan projects are those without explicit administrators. For instance,
project forked/created by some user will become orphan if that user account is deleted. You may delete orphan projects
to save resource or assign someone else as explicit project administrator if it is still useful.</div>
- <table wicket:id="projects" class="projects table"></table>
+ <table wicket:id="projects" class="table"></table>
</div>
</div>
<wicket:fragment wicket:id="projectFrag">
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java
similarity index 87%
rename from web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
rename to web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java
index 805582ab8d..13edd6e0df 100644
--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java
@@ -1,7 +1,6 @@
-package com.gitplex.server.web.page.home;
+package com.gitplex.server.web.page.project;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -39,19 +38,18 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.CacheManager;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.model.Project;
-import com.gitplex.server.model.User;
import com.gitplex.server.security.ProjectPrivilege;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.facade.GroupAuthorizationFacade;
-import com.gitplex.server.util.facade.MembershipFacade;
import com.gitplex.server.util.facade.ProjectFacade;
import com.gitplex.server.util.facade.UserAuthorizationFacade;
+import com.gitplex.server.web.ComponentRenderer;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.link.UserLink;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.page.layout.LayoutPage;
-import com.gitplex.server.web.page.layout.NewProjectPage;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.commit.CommitDetailPage;
import com.gitplex.server.web.page.project.setting.general.GeneralSettingPage;
@@ -60,7 +58,7 @@ import com.gitplex.server.web.util.DateUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@SuppressWarnings("serial")
-public class DashboardPage extends LayoutPage {
+public class ProjectListPage extends LayoutPage {
private boolean showOrphanProjects;
@@ -97,34 +95,8 @@ public class DashboardPage extends LayoutPage {
@Override
protected List<ProjectFacade> load() {
- CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);
- List<ProjectFacade> projects = new ArrayList<>();
-
- if (SecurityUtils.isAdministrator()) {
- projects.addAll(cacheManager.getProjects().values());
- } else {
- for (ProjectFacade project: cacheManager.getProjects().values()) {
- if (project.isPublicRead())
- projects.add(project);
- }
- User user = getLoginUser();
- if (user != null) {
- Collection<Long> groupIds = new HashSet<>();
- for (MembershipFacade membership: cacheManager.getMemberships().values()) {
- if (membership.getUserId().equals(user.getId()))
- groupIds.add(membership.getGroupId());
- }
- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {
- if (groupIds.contains(authorization.getGroupId()))
- projects.add(cacheManager.getProject(authorization.getProjectId()));
- }
- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
- if (authorization.getUserId().equals(user.getId()))
- projects.add(cacheManager.getProject(authorization.getProjectId()));
- }
- }
- }
-
+ List<ProjectFacade> projects = new ArrayList<>(GitPlex.getInstance(ProjectManager.class)
+ .getAccessibleProjects(getLoginUser()));
for (Iterator<ProjectFacade> it = projects.iterator(); it.hasNext();) {
if (!it.next().matchesQuery(searchInput))
it.remove();
@@ -216,7 +188,7 @@ public class DashboardPage extends LayoutPage {
@Override
public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,
IModel<ProjectFacade> rowModel) {
- Fragment fragment = new Fragment(componentId, "projectFrag", DashboardPage.this);
+ Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPage.this);
Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());
Link<Void> link;
if (showOrphanProjects) {
@@ -241,7 +213,7 @@ public class DashboardPage extends LayoutPage {
Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());
RevCommit lastCommit = project.getLastCommit();
if (lastCommit != null) {
- Fragment fragment = new Fragment(componentId, "authorFrag", DashboardPage.this);
+ Fragment fragment = new Fragment(componentId, "authorFrag", ProjectListPage.this);
fragment.add(new AvatarLink("avatar", lastCommit.getAuthorIdent()));
fragment.add(new UserLink("name", lastCommit.getAuthorIdent()));
cellItem.add(fragment);
@@ -260,7 +232,7 @@ public class DashboardPage extends LayoutPage {
Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());
RevCommit lastCommit = project.getLastCommit();
if (lastCommit != null) {
- Fragment fragment = new Fragment(componentId, "commitMessageFrag", DashboardPage.this);
+ Fragment fragment = new Fragment(componentId, "commitMessageFrag", ProjectListPage.this);
PageParameters params = CommitDetailPage.paramsOf(project, lastCommit.name());
Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class, params);
link.add(new Label("message", lastCommit.getShortMessage()));
@@ -342,12 +314,30 @@ public class DashboardPage extends LayoutPage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new DashboardResourceReference()));
+ response.render(CssHeaderItem.forReference(new ProjectResourceReference()));
}
@Override
- protected Component newContextHead(String componentId) {
- return new Label(componentId, "Projects");
+ 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/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.html b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.html
index 4842c12dc1..a83eba5eea 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.html
@@ -14,11 +14,10 @@
</table>
</div>
</div>
- <wicket:fragment wicket:id="contextHeadFrag">
- <div id="project-head" class="clearfix">
- <span class="pull-left">Project - </span>
- <span wicket:id="projectName" class="pull-left"></span>
- <a wicket:id="projectMoreInfo" class="pull-left more-info"><i class="fa fa-ellipsis-h"></i></a>
+ <wicket:fragment wicket:id="breadcrumbFrag">
+ <div class="project clearfix">
+ <a wicket:id="name" class="pull-left"></a>
+ <a wicket:id="moreInfo" class="pull-left more-info"><i class="fa fa-ellipsis-h"></i></a>
</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java
index d1c5e26116..b96896306f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java
@@ -12,11 +12,12 @@ import org.apache.wicket.Component;
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.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
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.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -32,8 +33,10 @@ import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.UserInfoManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.component.link.DropdownLink;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.tabbable.PageTab;
import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.layout.LayoutPage;
@@ -179,25 +182,68 @@ public abstract class ProjectPage extends LayoutPage {
}
@Override
- protected Component newContextHead(String componentId) {
- Fragment fragment = new Fragment(componentId, "contextHeadFrag", this);
- fragment.add(new Label("projectName", getProject().getName()));
- fragment.add(new DropdownLink("projectMoreInfo") {
+ protected List<ComponentRenderer> getBreadcrumbs() {
+ List<ComponentRenderer> breadcrumbs = super.getBreadcrumbs();
+
+ breadcrumbs.add(new ComponentRenderer() {
@Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new MoreInfoPanel(id, projectModel) {
+ public Component render(String componentId) {
+ return new ViewStateAwarePageLink<Void>(componentId, ProjectListPage.class) {
@Override
- protected void onPromptForkOption(AjaxRequestTarget target) {
- dropdown.close();
+ public IModel<?> getBody() {
+ return Model.of("Projects");
}
};
}
});
- return fragment;
+
+ 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());
+ }
+
+ });
+ 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/web/src/main/java/com/gitplex/server/web/page/project/no-branches.css b/web/src/main/java/com/gitplex/server/web/page/project/no-branches.css
deleted file mode 100644
index a8ead71f69..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/project/no-branches.css
+++ /dev/null
@@ -1,17 +0,0 @@
-#no-branches {
- padding: 20px;
-}
-#no-branches>.body>ul {
- background: #333;
- color: #EEE;
- border-radius: 4px;
- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
- margin: 4px 0 16px 0;
-}
-#no-branches>.body>ul>li:before {
- content: "$";
- margin-right: 8px;
-}
-#no-branches>.body>.help-block {
- margin-top: -8px;
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/project.css b/web/src/main/java/com/gitplex/server/web/page/project/project.css
index 8a0d442068..a763505fe6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/project.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/project.css
@@ -1,7 +1,7 @@
-#project-head .pull-left {
+.breadcrumb .project .pull-left {
margin-right: 4px;
}
-#project-head .more-info {
+.breadcrumb .project .more-info {
background: #444;
padding: 0 8px;
border-radius: 4px;
@@ -9,9 +9,6 @@
margin-top: 6px;
margin-left: 8px;
}
-#project-head .more-info:hover, #project-head .more-info.dropdown-open {
- background: #777;
-}
#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle {
display: block;
@@ -50,3 +47,42 @@
#project>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a>.badge {
display: none;
}
+
+.project.list, .new-project {
+ padding: 20px;
+}
+.project.list table {
+ font-size: 13px;
+}
+.project.list table td.project {
+ font-size: 14px;
+}
+
+.project.list table a {
+ color: #444;
+}
+.project.list table td.author img.avatar {
+ width: 20px;
+ height: 20px;
+}
+.project.list table td.author span, .project.list table td.commit-date {
+ color: #888;
+}
+
+.no-branches {
+ padding: 20px;
+}
+.no-branches>.body>ul {
+ background: #333;
+ color: #EEE;
+ border-radius: 4px;
+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+ margin: 4px 0 16px 0;
+}
+.no-branches>.body>ul>li:before {
+ content: "$";
+ margin-right: 8px;
+}
+.no-branches>.body>.help-block {
+ margin-top: -8px;
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.java
index d46cd57444..79ebddb0f7 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/general/GeneralSettingPage.java
@@ -16,7 +16,7 @@ import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteProjectModal;
import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.BeanEditor;
import com.gitplex.server.web.editable.PathSegment;
-import com.gitplex.server.web.page.home.DashboardPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
import com.gitplex.server.web.page.project.setting.ProjectSettingPage;
@SuppressWarnings("serial")
@@ -89,7 +89,7 @@ public class GeneralSettingPage extends ProjectSettingPage {
@Override
protected void onDeleted(AjaxRequestTarget target) {
- setResponsePage(DashboardPage.class);
+ setResponsePage(ProjectListPage.class);
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java
index 85a39c01e7..16e608f59e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java
@@ -19,7 +19,7 @@ import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.BeanEditor;
import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.base.BasePage;
-import com.gitplex.server.web.page.home.DashboardPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
import com.gitplex.server.web.page.user.AvatarEditPage;
import com.gitplex.server.web.page.user.UserPage;
@@ -74,7 +74,7 @@ public class RegisterPage extends BasePage {
@Override
public void onClick() {
- setResponsePage(DashboardPage.class);
+ setResponsePage(ProjectListPage.class);
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/NewUserPage.html b/web/src/main/java/com/gitplex/server/web/page/user/NewUserPage.html
new file mode 100644
index 0000000000..fd7f23d079
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/user/NewUserPage.html
@@ -0,0 +1,13 @@
+<wicket:extend>
+ <div class="new-user">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="actions clearfix">
+ <input class="btn btn-primary dirty-aware pull-left" value="Create" type="submit"></input>
+ <div class="checkbox pull-left">
+ <label> <input wicket:id="continueToAdd" type="checkbox"> Continue to add other user after create</label>
+ </div>
+ </div>
+ </form>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.java b/web/src/main/java/com/gitplex/server/web/page/user/NewUserPage.java
similarity index 57%
rename from web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.java
rename to web/src/main/java/com/gitplex/server/web/page/user/NewUserPage.java
index 9fb13cfc06..dffd25aca7 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/user/NewUserPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/NewUserPage.java
@@ -1,23 +1,33 @@
-package com.gitplex.server.web.page.admin.user;
+package com.gitplex.server.web.page.user;
+
+import java.util.List;
import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
+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;
+import org.apache.wicket.model.Model;
import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.User;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.BeanEditor;
import com.gitplex.server.web.editable.PathSegment;
-import com.gitplex.server.web.page.admin.AdministrationPage;
-import com.gitplex.server.web.page.user.UserMembershipsPage;
+import com.gitplex.server.web.page.layout.LayoutPage;
@SuppressWarnings("serial")
-public class NewUserPage extends AdministrationPage {
+public class NewUserPage extends LayoutPage {
private User user = new User();
@@ -81,4 +91,55 @@ public class NewUserPage extends AdministrationPage {
add(form);
}
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.isAdministrator();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new UserResourceReference()));
+ }
+
+ @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");
+ }
+
+ };
+ }
+
+ });
+
+ 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/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditPage.html b/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditPage.html
index a13f0a2c8d..1c7af283f6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/user/PasswordEditPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <section class="password-edit">
+ <div class="password-edit">
<div class="body">
<form wicket:id="form" class="leave-confirm" autocomplete="off">
<div wicket:id="editor"></div>
@@ -8,5 +8,5 @@
</div>
</form>
</div>
- </section>
+ </div>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.html b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.html
similarity index 87%
rename from web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.html
rename to web/src/main/java/com/gitplex/server/web/page/user/UserListPage.html
index bc4e100ebc..9bf7ec3f8c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <section class="user list">
+ <div class="user list">
<div class="head clearfix">
<div class="pull-left">
<input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name"></input>
@@ -11,13 +11,13 @@
<div class="body">
<table wicket:id="users" class="users table table-hover"></table>
</div>
- </section>
+ </div>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="avatarLink"></a>
<a wicket:id="nameLink"></a>
</wicket:fragment>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="setting" title="Setting of this user"><i class="fa fa-cog"></i></a>
+ <a wicket:id="profile" title="Profile of this user"><i class="fa fa-cog"></i></a>
<a wicket:id="delete" title="Delete this user"><i class="fa fa-trash"></i></a>
</wicket:fragment>
</wicket:extend>
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java
similarity index 78%
rename from web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.java
rename to web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java
index 301021c9eb..2199200e8c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/user/UserListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java
@@ -1,9 +1,10 @@
-package com.gitplex.server.web.page.admin.user;
+package com.gitplex.server.web.page.user;
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;
@@ -11,6 +12,8 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColu
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+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.TextField;
import org.apache.wicket.markup.html.link.Link;
@@ -28,18 +31,19 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.User;
import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.datatable.DefaultDataTable;
import com.gitplex.server.web.component.link.UserLink;
-import com.gitplex.server.web.page.admin.AdministrationPage;
-import com.gitplex.server.web.page.user.UserPage;
-import com.gitplex.server.web.page.user.UserProfilePage;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.page.layout.LayoutPage;
import com.gitplex.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
-public class UserListPage extends AdministrationPage {
+public class UserListPage extends LayoutPage {
private DataTable<User, Void> usersTable;
@@ -77,6 +81,12 @@ public class UserListPage extends AdministrationPage {
public void onClick() {
setResponsePage(NewUserPage.class);
}
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
+ }
});
@@ -111,7 +121,7 @@ public class UserListPage extends AdministrationPage {
Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);
fragment.add(AttributeAppender.append("class", "actions"));
- fragment.add(new Link<Void>("setting") {
+ fragment.add(new Link<Void>("profile") {
@Override
public void onClick() {
@@ -130,6 +140,12 @@ public class UserListPage extends AdministrationPage {
GitPlex.getInstance(UserManager.class).delete(rowModel.getObject());
}
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator());
+ }
+
}.add(new ConfirmOnClick("Do you really want to delete user '" + user.getDisplayName() + "'?")));
cellItem.add(fragment);
@@ -168,4 +184,33 @@ public class UserListPage extends AdministrationPage {
WebConstants.PAGE_SIZE));
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new UserResourceReference()));
+ }
+
+ @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/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java
index 8b8ec57892..e183c99a78 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java
@@ -9,12 +9,14 @@ 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.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.User;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.ComponentRenderer;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.tabbable.PageTab;
@@ -97,8 +99,35 @@ public abstract class UserPage extends LayoutPage {
}
@Override
- protected Component newContextHead(String componentId) {
- return new Label(componentId, "User - " + getUser().getDisplayName());
+ 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");
+ }
+
+ };
+ }
+
+ });
+
+ breadcrumbs.add(new ComponentRenderer() {
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, getUser().getDisplayName());
+ }
+
+ });
+
+ return breadcrumbs;
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java
index 8aa41d0f0c..7558b2bd71 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java
@@ -16,7 +16,7 @@ import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.BeanDescriptor;
import com.gitplex.server.web.editable.BeanEditor;
import com.gitplex.server.web.editable.PathSegment;
-import com.gitplex.server.web.page.home.DashboardPage;
+import com.gitplex.server.web.page.project.ProjectListPage;
import com.gitplex.server.web.util.ConfirmOnClick;
import com.google.common.collect.Sets;
@@ -96,7 +96,7 @@ public class UserProfilePage extends UserPage {
@Override
public void onClick() {
GitPlex.getInstance(UserManager.class).delete(getUser());
- setResponsePage(DashboardPage.class);
+ setResponsePage(ProjectListPage.class);
}
}.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/user/UserResourceReference.java
index d1ccf3094a..7b65167a8f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/UserResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserResourceReference.java
@@ -1,8 +1,8 @@
package com.gitplex.server.web.page.user;
-import org.apache.wicket.request.resource.CssResourceReference;
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
-public class UserResourceReference extends CssResourceReference {
+public class UserResourceReference extends BaseDependentCssResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/web/src/main/java/com/gitplex/server/web/page/user/user.css b/web/src/main/java/com/gitplex/server/web/page/user/user.css
index 16e49b8c7a..18b93daa11 100644
--- a/web/src/main/java/com/gitplex/server/web/page/user/user.css
+++ b/web/src/main/java/com/gitplex/server/web/page/user/user.css
@@ -28,4 +28,14 @@
#user .membership.list .head .select2-container,
#user .authorization.list .head .select2-container {
width: 240px;
-}
\ No newline at end of file
+}
+
+.user.list, .new-user {
+ padding: 20px;
+}
+.user.list .actions a {
+ color: #666;
+}
+.new-user .actions .btn {
+ margin-right: 20px;
+}