The Unified and Autonomous Development Platform
Use project list page as dashboard page
Robin Shenc259335258c0
diff --git a/web/src/main/java/com/turbodev/server/web/TurboDevUrlMapper.java b/web/src/main/java/com/turbodev/server/web/TurboDevUrlMapper.javaindex f0feac788c..6010fa2c7f 100644--- a/web/src/main/java/com/turbodev/server/web/TurboDevUrlMapper.java+++ b/web/src/main/java/com/turbodev/server/web/TurboDevUrlMapper.java@@ -130,7 +130,24 @@ public class TurboDevUrlMapper extends CompoundRequestMapper {}private void addProjectPages() {- add(new TurboDevPageMapper("projects", ProjectListPage.class));+ add(new TurboDevPageMapper("projects", ProjectListPage.class) {++ /*+ * This logic is added to prevent url "/" from being redirected to "/projects"+ */+ @Override+ public Url mapHandler(IRequestHandler requestHandler) {+ if (requestHandler instanceof BookmarkablePageRequestHandler+ || requestHandler instanceof RenderPageRequestHandler) {+ IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;+ if (pageClassRequestHandler.getPageClass() == ProjectListPage.class) {+ return null;+ }+ }+ return super.mapHandler(requestHandler);+ }++ });add(new TurboDevPageMapper("projects/new", NewProjectPage.class));add(new TurboDevPageMapper("projects/${project}", ProjectBlobPage.class));diff --git a/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java b/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.javaindex 717f0ce7c5..21c8afd68f 100644--- a/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java+++ b/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java@@ -48,15 +48,15 @@ import org.apache.wicket.util.IProvider;import com.turbodev.launcher.bootstrap.Bootstrap;import com.turbodev.launcher.loader.AppLoader;-import com.turbodev.utils.ExceptionUtils;import com.turbodev.server.web.page.base.BasePage;-import com.turbodev.server.web.page.dashboard.DashboardPage;import com.turbodev.server.web.page.error.BaseErrorPage;import com.turbodev.server.web.page.error.ExpectedExceptionPage;import com.turbodev.server.web.page.error.UnexpectedExceptionPage;+import com.turbodev.server.web.page.project.ProjectListPage;import com.turbodev.server.web.util.AbsoluteUrlRenderer;import com.turbodev.server.web.util.resourcebundle.ResourceBundleReferences;import com.turbodev.server.web.websocket.WebSocketManager;+import com.turbodev.utils.ExceptionUtils;import de.agilecoders.wicket.core.settings.BootstrapSettings;@@ -213,7 +213,7 @@ public class TurboDevWebApplication extends WebApplication {@Overridepublic Class<? extends Page> getHomePage() {- return DashboardPage.class;+ return ProjectListPage.class;}@Overridediff --git a/web/src/main/java/com/turbodev/server/web/behavior/CollapseBehavior.java b/web/src/main/java/com/turbodev/server/web/behavior/CollapseBehavior.javadeleted file mode 100644index 9425f26ff5..0000000000--- a/web/src/main/java/com/turbodev/server/web/behavior/CollapseBehavior.java+++ /dev/null@@ -1,46 +0,0 @@-package com.turbodev.server.web.behavior;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;--import com.turbodev.server.web.component.AccordionPanel;--/**- * Add this behavior to a component to have it able to show/hide another component- * upon click. The component to be collapsed will be hidden initially. Note that- * if collapsible components are put inside a {@link AccordionPanel}, they will behave- * together like an accordion.- *- * @see AccordionPanel- * @author robin- *- */-@SuppressWarnings("serial")-public class CollapseBehavior extends Behavior {-- private Component target;-- public CollapseBehavior(Component target) {- this.target = target;- target.add(AttributeAppender.append("class", "collapse"));- target.setOutputMarkupId(true);- }-- @Override- public void bind(Component component) {- super.bind(component);- component.setOutputMarkupId(true);- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);-- String script = String.format("turbodev.server.setupCollapse('%s', '%s')", component.getMarkupId(), target.getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }--}diff --git a/web/src/main/java/com/turbodev/server/web/component/AccordionPanel.java b/web/src/main/java/com/turbodev/server/web/component/AccordionPanel.javadeleted file mode 100644index c7abcbd3bb..0000000000--- a/web/src/main/java/com/turbodev/server/web/component/AccordionPanel.java+++ /dev/null@@ -1,42 +0,0 @@-package com.turbodev.server.web.component;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;--import com.turbodev.server.web.behavior.CollapseBehavior;--/**- * Put collapsible components inside this accordion panel to have them behaving like- * accordion. Collapsible components are target components referenced via- * {@link CollapseBehavior}.- *- * @see CollapseBehavior- * @author robin- *- */-@SuppressWarnings("serial")-public class AccordionPanel extends WebMarkupContainer {-- public AccordionPanel(String id) {- super(id);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setOutputMarkupId(true);- add(AttributeAppender.append("class", "accordion"));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- String script = String.format("turbodev.server.setupAccordion('%s')", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }--}diff --git a/web/src/main/java/com/turbodev/server/web/component/menu/MenuItem.java b/web/src/main/java/com/turbodev/server/web/component/menu/MenuItem.javaindex bb13f172f8..f41687d1a5 100644--- a/web/src/main/java/com/turbodev/server/web/component/menu/MenuItem.java+++ b/web/src/main/java/com/turbodev/server/web/component/menu/MenuItem.java@@ -23,4 +23,5 @@ public abstract class MenuItem implements Serializable {public String getShortcut() {return null;};+}diff --git a/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardPage.html b/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardPage.htmldeleted file mode 100644index 1908a521dd..0000000000--- a/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardPage.html+++ /dev/null@@ -1,35 +0,0 @@-<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 class="help-block">A project in TurboDev represents a git repository. Only those visible to current user will be counted.</div>- <wicket:enclosure child="recentVisitedProjects">- <div class="title">Recent Visited</div>- <div wicket:id="recentVisitedProjects"></div>- </wicket:enclosure>- <wicket:enclosure child="recentAddedProjects">- <div class="title">Recent Added</div>- <div wicket:id="recentAddedProjects"></div>- </wicket:enclosure>- </div>- <wicket:enclosure child="users">- <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 class="help-block">Users can be granted with project permissions separately, or they can be added to groups to gain access to projects authorized to the groups</div>- </div>- </wicket:enclosure>- <wicket:enclosure child="groups">- <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 class="help-block">Groups in TurboDev can be used to control access to projects. Members of a group will be granted with the same set of- project permissions</div>- </div>- </wicket:enclosure>- <wicket:enclosure child="administration">- <div class="summary">- <a wicket:id="administration"><i class="fa fa-cog fa-fw"></i> server administration</a>- <div class="help-block">Follow this link to perform server management tasks, such as global setting configuration, database backup, etc.</div>- </div>- </wicket:enclosure>- </div>-</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardPage.java b/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardPage.javadeleted file mode 100644index 573956d306..0000000000--- a/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardPage.java+++ /dev/null@@ -1,197 +0,0 @@-package com.turbodev.server.web.page.dashboard;--import java.util.ArrayList;-import java.util.Comparator;-import java.util.List;-import java.util.Map;--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 org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;--import com.google.common.collect.Lists;-import com.turbodev.server.TurboDev;-import com.turbodev.server.manager.CacheManager;-import com.turbodev.server.manager.GroupManager;-import com.turbodev.server.manager.ProjectManager;-import com.turbodev.server.manager.UserManager;-import com.turbodev.server.security.SecurityUtils;-import com.turbodev.server.util.facade.ProjectFacade;-import com.turbodev.server.web.ComponentRenderer;-import com.turbodev.server.web.component.projectlist.ProjectListPanel;-import com.turbodev.server.web.page.admin.systemsetting.SystemSettingPage;-import com.turbodev.server.web.page.group.GroupListPage;-import com.turbodev.server.web.page.group.NewGroupPage;-import com.turbodev.server.web.page.layout.LayoutPage;-import com.turbodev.server.web.page.project.NewProjectPage;-import com.turbodev.server.web.page.project.ProjectListPage;-import com.turbodev.server.web.page.user.NewUserPage;-import com.turbodev.server.web.page.user.UserListPage;--@SuppressWarnings("serial")-public class DashboardPage extends LayoutPage {-- private static final int MAX_RECENT_PROJECTS = 10;-- @Override- protected void onInitialize() {- super.onInitialize();-- Link<Void> link = new BookmarkablePageLink<Void>("projects", ProjectListPage.class);- link.add(new Label("count", TurboDev.getInstance(ProjectManager.class)- .getAccessibleProjects(getLoginUser()).size()));- add(link);-- add(new BookmarkablePageLink<Void>("addProject", NewProjectPage.class) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canCreateProjects());- }-- });-- IModel<List<ProjectFacade>> recentVisitedProjectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {-- @Override- protected List<ProjectFacade> load() {- List<ProjectFacade> projects = new ArrayList<>(TurboDev.getInstance(ProjectManager.class)- .getAccessibleProjects(getLoginUser()));- projects.sort(ProjectFacade::compareLastVisit);- if (projects.size() > MAX_RECENT_PROJECTS)- return projects.subList(0, MAX_RECENT_PROJECTS);- else- return projects;- }-- };-- add(new ProjectListPanel("recentVisitedProjects", recentVisitedProjectsModel, null) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() != null && !recentVisitedProjectsModel.getObject().isEmpty());- }-- });-- IModel<List<ProjectFacade>> recentAddedProjectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {-- @Override- protected List<ProjectFacade> load() {- List<ProjectFacade> projects = new ArrayList<>(TurboDev.getInstance(ProjectManager.class)- .getAccessibleProjects(getLoginUser()));- Map<String, Long> projectIds = TurboDev.getInstance(CacheManager.class).getProjectIds();- projects.sort(new Comparator<ProjectFacade>() {-- @Override- public int compare(ProjectFacade o1, ProjectFacade o2) {- Long id1 = projectIds.get(o1.getName());- Long id2 = projectIds.get(o2.getName());- if (id1 == null)- id1 = 0L;- if (id2 == null)- id2 = 0L;- return (int)(id2 - id1);- }-- });- if (projects.size() > MAX_RECENT_PROJECTS)- return projects.subList(0, MAX_RECENT_PROJECTS);- else- return projects;- }-- };-- add(new ProjectListPanel("recentAddedProjects", recentAddedProjectsModel, null) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() == null && !recentAddedProjectsModel.getObject().isEmpty());- }-- });-- link = new BookmarkablePageLink<Void>("users", UserListPage.class) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator());- }-- };- link.add(new Label("count", TurboDev.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) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator());- }-- };- link.add(new Label("count", TurboDev.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/turbodev/server/web/page/dashboard/DashboardResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardResourceReference.javadeleted file mode 100644index c386db066b..0000000000--- a/web/src/main/java/com/turbodev/server/web/page/dashboard/DashboardResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.turbodev.server.web.page.dashboard;--import com.turbodev.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/turbodev/server/web/page/dashboard/dashboard.css b/web/src/main/java/com/turbodev/server/web/page/dashboard/dashboard.cssdeleted file mode 100644index b1cb888d56..0000000000--- a/web/src/main/java/com/turbodev/server/web/page/dashboard/dashboard.css+++ /dev/null@@ -1,34 +0,0 @@-#dashboard {- padding: 20px;-}--#dashboard .summary {- margin-bottom: 20px;- border: 1px solid #DDD;- border-radius: 4px;- padding: 20px;-}-#dashboard .summary .help-block {- margin-left: 4px;-}-#dashboard .summary>a {- color: #444;- font-size: 20px;- margin-right: 20px;-}-#dashboard .summary>a .fa-ext {- font-size: 20px;-}--#dashboard .summary .title {- font-size: 16px;- margin: 20px 0 8px 4px;-}--#dashboard .summary table {- margin-bottom: 0;-}--#dashboard .summary table td {- border-top: 1px dotted #BBB !important;-}diff --git a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html b/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.htmlindex c6839b1ea3..4255f956a4 100644--- a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html@@ -3,7 +3,7 @@<div wicket:id="title" class="title"></div><div wicket:id="description" class="description"></div><div class="actions">- <a wicket:id="dashboard" class="btn btn-primary">Back to dashboard</a>+ <a wicket:id="home" class="btn btn-primary">Back to home</a><a wicket:id="showDetail" class="btn btn-primary">Show Error Detail</a></div><div wicket:id="detail"></div>diff --git a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.java b/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.javaindex 5dd01bbac5..592ce3d68d 100644--- a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.java@@ -7,10 +7,10 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.util.string.Strings;-import com.turbodev.utils.WordUtils;import com.turbodev.server.web.component.MultilineLabel;import com.turbodev.server.web.component.link.ViewStateAwarePageLink;-import com.turbodev.server.web.page.dashboard.DashboardPage;+import com.turbodev.server.web.page.project.ProjectListPage;+import com.turbodev.utils.WordUtils;@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>("home", ProjectListPage.class));container.add(new AjaxLink<Void>("showDetail") {diff --git a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html b/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.htmlindex 24c31a4a87..6c3994aa37 100644--- a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html@@ -51,7 +51,7 @@<form action="https://www.turbodev.com/bug-report" method="post"><div class="actions"><input type="submit" value="Send Error Report" class="btn btn-primary" onclick="if (validateBugReport()) this.form.submit();return false;"></input>- <input wicket:id="dashboardTop" type="button" value="Back to Dashboard" class="btn btn-primary"></input>+ <input wicket:id="homeTop" type="button" value="Back to Home" class="btn btn-primary"></input></div><h4 class="alert alert-danger has-errors">Fix errors below</h4><h4 class="alert alert-info submitting">Submitting bug report...</h4>@@ -103,7 +103,7 @@</table><div class="actions"><input type="submit" value="Send Error Report" onclick="if (validateBugReport()) this.form.submit();return false;" class="btn btn-primary"></input>- <input wicket:id="dashboardBottom" type="button" value="Back to Dashboard" class="btn btn-primary"></input>+ <input wicket:id="homeBottom" type="button" value="Back to Home" class="btn btn-primary"></input></div><input wicket:id="backUrl" type="hidden" name="back_url"></input><input wicket:id="additionalInfo" type="hidden" name="additional_info"></input>diff --git a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.java b/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.javaindex a1b5ef8cdc..064a6eb95b 100644--- a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.java@@ -33,13 +33,13 @@ import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.model.Model;import org.apache.wicket.util.string.Strings;-import com.turbodev.utils.FileUtils;-import com.turbodev.utils.StringUtils;import com.turbodev.server.TurboDev;import com.turbodev.server.manager.ConfigManager;import com.turbodev.server.model.User;-import com.turbodev.server.web.page.dashboard.DashboardPage;+import com.turbodev.server.web.page.project.ProjectListPage;import com.turbodev.server.web.util.DateUtils;+import com.turbodev.utils.FileUtils;+import com.turbodev.utils.StringUtils;@SuppressWarnings("serial")public class UnexpectedExceptionPage extends BaseErrorPage {@@ -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>("homeTop", ProjectListPage.class));+ add(new BookmarkablePageLink<Void>("homeBottom", ProjectListPage.class));add(new WebMarkupContainer("backUrl") {diff --git a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.java b/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.javaindex b582655967..903bf37dc7 100644--- a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.java@@ -11,9 +11,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import com.turbodev.utils.init.InitStage;-import com.turbodev.utils.init.ManualConfig;-import com.turbodev.utils.init.Skippable;import com.turbodev.server.TurboDev;import com.turbodev.server.manager.UserManager;import com.turbodev.server.model.User;@@ -22,7 +19,10 @@ import com.turbodev.server.web.WebSession;import com.turbodev.server.web.component.wizard.ManualConfigStep;import com.turbodev.server.web.component.wizard.Wizard;import com.turbodev.server.web.page.base.BasePage;-import com.turbodev.server.web.page.dashboard.DashboardPage;+import com.turbodev.server.web.page.project.ProjectListPage;+import com.turbodev.utils.init.InitStage;+import com.turbodev.utils.init.ManualConfig;+import com.turbodev.utils.init.Skippable;@SuppressWarnings("serial")public class ServerInitPage extends BasePage {@@ -99,7 +99,7 @@ public class ServerInitPage extends BasePage {WebSession.get().logout();User root = TurboDev.getInstance(UserManager.class).getRoot();SecurityUtils.getSubject().runAs(root.getPrincipals());- throw new RestartResponseException(DashboardPage.class);+ throw new RestartResponseException(ProjectListPage.class);}});diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.htmlindex d03adb5e89..5f8b345a08 100644--- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html@@ -1,8 +1,11 @@<wicket:extend>- <div id="main">- <div wicket:id="mainHead" class="head clearfix">+ <div id="layout">+ <div wicket:id="head" class="head clearfix"><div class="logo pull-left">- <a wicket:id="home" title="Dashboard"><i class="fa fa-ext fa-turbodev-logo"></i></a>+ <a wicket:id="home" title="Home"><i class="fa fa-ext fa-turbodev-logo"></i></a>+ </div>+ <div class="nav pull-left">+ <a wicket:id="nav" title="Navigation" class="fa fa-bars"></a></div><div wicket:id="breadcrumbs" class="breadcrumb pull-left clearfix"><a wicket:id="nav" class="nav pull-left"></a>@@ -35,7 +38,7 @@<div class="body"><wicket:child></wicket:child></div>- <div wicket:id="mainFoot" class="foot clearfix">+ <div wicket:id="foot" class="foot clearfix"><div class="pull-left"><a href="https://www.turbodev.com">TurboDev</a>, <span wicket:id="productVersion"></span>, <span wicket:id="releaseDate"></span></div>diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.javaindex d8914548c3..c498ea3653 100644--- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java@@ -17,13 +17,11 @@ 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.turbodev.launcher.loader.AppLoader;import com.turbodev.launcher.loader.Plugin;-import com.turbodev.utils.license.LicenseDetail;import com.turbodev.server.TurboDev;import com.turbodev.server.manager.ConfigManager;import com.turbodev.server.manager.UserManager;@@ -37,16 +35,22 @@ import com.turbodev.server.web.component.floating.AlignPlacement;import com.turbodev.server.web.component.floating.FloatingPanel;import com.turbodev.server.web.component.link.DropdownLink;import com.turbodev.server.web.component.link.ViewStateAwarePageLink;+import com.turbodev.server.web.component.menu.MenuItem;+import com.turbodev.server.web.component.menu.MenuLink;+import com.turbodev.server.web.page.admin.systemsetting.SystemSettingPage;import com.turbodev.server.web.page.base.BasePage;-import com.turbodev.server.web.page.dashboard.DashboardPage;+import com.turbodev.server.web.page.group.GroupListPage;+import com.turbodev.server.web.page.project.ProjectListPage;import com.turbodev.server.web.page.security.LoginPage;import com.turbodev.server.web.page.security.LogoutPage;import com.turbodev.server.web.page.security.RegisterPage;import com.turbodev.server.web.page.user.TaskListPage;+import com.turbodev.server.web.page.user.UserListPage;import com.turbodev.server.web.page.user.UserProfilePage;import com.turbodev.server.web.websocket.PageDataChanged;import com.turbodev.server.web.websocket.TaskChangedRegion;import com.turbodev.server.web.websocket.WebSocketRegion;+import com.turbodev.utils.license.LicenseDetail;import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;@@ -67,10 +71,79 @@ public abstract class LayoutPage extends BasePage {protected void onInitialize() {super.onInitialize();- WebMarkupContainer head = new WebMarkupContainer("mainHead");+ WebMarkupContainer head = new WebMarkupContainer("head");add(head);head.add(new ViewStateAwarePageLink<Void>("home", getApplication().getHomePage()));+ head.add(new MenuLink("nav") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> items = new ArrayList<>();+ items.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Projects";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new ViewStateAwarePageLink<Void>(id, ProjectListPage.class);+ }++ });+ if (SecurityUtils.isAdministrator()) {+ items.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Users";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new ViewStateAwarePageLink<Void>(id, UserListPage.class);+ }++ });+ items.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Groups";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new ViewStateAwarePageLink<Void>(id, GroupListPage.class);+ }++ });+ items.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Administration";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new ViewStateAwarePageLink<Void>(id, SystemSettingPage.class);+ }++ });+ }+ return items;+ }++ });head.add(new ListView<ComponentRenderer>("breadcrumbs", getBreadcrumbs()) {@@ -159,7 +232,7 @@ public abstract class LayoutPage extends BasePage {head.add(new WebMarkupContainer("userMenu").setVisible(false));}- add(new WebMarkupContainer("mainFoot") {+ add(new WebMarkupContainer("foot") {@Overrideprotected void onInitialize() {@@ -179,24 +252,7 @@ public abstract class LayoutPage extends BasePage {}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;+ return new ArrayList<>();};protected boolean isFootVisible() {diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/layout.css b/web/src/main/java/com/turbodev/server/web/page/layout/layout.cssindex 67b2f5170e..94f4c87fcf 100644--- a/web/src/main/java/com/turbodev/server/web/page/layout/layout.css+++ b/web/src/main/java/com/turbodev/server/web/page/layout/layout.css@@ -1,73 +1,76 @@html, body {background: #F7F6F2;}-#main>.head {+#layout>.head {background: #010203;padding: 8px 16px;color: #CCC;}-#main>.head>div {+#layout>.head>div {margin-right: 20px;}-#main>.head a {+#layout>.head a {text-decoration: none;color: #CCC;}-#main>.head .push-disabled {+#layout>.head .push-disabled {padding-top: 6px;}-#main>.head .push-disabled .label {+#layout>.head .push-disabled .label {font-size: 15px;}-#main>.head>.logo .fa {+#layout>.head>.nav .fa {+ font-size: 28px;+}+#layout>.head>.logo .fa {font-size: 28px;color: #EEE;}-#main>.head>.breadcrumb {+#layout>.head>.breadcrumb {padding: 0;margin: 0;background: inherit;border-radius: 0;font-size: 20px;}-#main>.head>.breadcrumb .separator {+#layout>.head>.breadcrumb .separator {margin: 0 8px;}-#main>.head>.help {+#layout>.head>.help {padding-top: 7px;}-#main>.head>.help .fa {+#layout>.head>.help .fa {font-size: 18px;}-#main>.head>.user {+#layout>.head>.user {margin-right: 0;}-#main>.head>.user>.logged-in>.tasks {+#layout>.head>.user>.logged-in>.tasks {color: #69B7F7;margin-right: 16px;}-#main>.head>.user>.logged-in>a, #main>.head>.user>.logged-in>span {+#layout>.head>.user>.logged-in>a, #layout>.head>.user>.logged-in>span {margin-right: 8px;font-size: 20px;}-#main>.head>.user>.logged-in>.menu {+#layout>.head>.user>.logged-in>.menu {margin-right: 8px;}-#main>.head>.user>.logged-out {+#layout>.head>.user>.logged-out {padding-top: 4px;}-#main>.head>.user>.logged-out a {+#layout>.head>.user>.logged-out a {font-size: 16px;}-#main>.head>.user>.logged-out>a:FIRST-CHILD {+#layout>.head>.user>.logged-out>a:FIRST-CHILD {margin-right: 16px;}-#main>.head>.user .avatar {+#layout>.head>.user .avatar {width: 32px;height: 32px;}-#main>.body {+#layout>.body {border-bottom: 1px solid #BBB;background: white;}@@ -112,11 +115,11 @@ html, body {color: #888;background: #EEE;}-#main>.foot {+#layout>.foot {font-size: 11px;padding: 8px;}-#main>.foot>div {+#layout>.foot>div {white-space: nowrap;}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.java b/web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.javaindex 096b47f52f..5caab0d100 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.java@@ -21,8 +21,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.turbodev.utils.matchscore.MatchScoreProvider;-import com.turbodev.utils.matchscore.MatchScoreUtils;import com.turbodev.server.TurboDev;import com.turbodev.server.manager.CacheManager;import com.turbodev.server.manager.ProjectManager;@@ -37,6 +35,8 @@ import com.turbodev.server.web.component.link.ViewStateAwarePageLink;import com.turbodev.server.web.component.projectlist.ProjectListPanel;import com.turbodev.server.web.page.layout.LayoutPage;import com.turbodev.server.web.util.PagingHistorySupport;+import com.turbodev.utils.matchscore.MatchScoreProvider;+import com.turbodev.utils.matchscore.MatchScoreUtils;@SuppressWarnings("serial")public class ProjectListPage extends LayoutPage {@@ -94,8 +94,7 @@ public class ProjectListPage extends LayoutPage {protected List<ProjectFacade> load() {List<ProjectFacade> projects = new ArrayList<>(TurboDev.getInstance(ProjectManager.class).getAccessibleProjects(getLoginUser()));- projects.sort(Comparator.comparing(ProjectFacade::getName));-+ projects.sort(ProjectFacade::compareLastVisit);return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<ProjectFacade>() {@Overridediff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.html b/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.htmlindex 8841debf5d..d69ed71cee 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.html@@ -17,7 +17,7 @@</ul><div wicket:id="noCommits" class="no-commits"><i class="fa fa-exclamation-triangle"></i> No commits found</div></div>- <div wicket:id="foot" class="foot">+ <div wicket:id="commitsFoot" class="foot"><a wicket:id="more" class="btn btn-default">More commits</a><div wicket:id="tooMany" class="alert alert-warning">Too many commits to load</div></div>diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.java b/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.javaindex 4d3322be66..db91f2b77b 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.java@@ -294,7 +294,7 @@ public class ProjectCommitsPage extends ProjectPage {});- foot = new WebMarkupContainer("foot");+ foot = new WebMarkupContainer("commitsFoot");foot.setOutputMarkupId(true);foot.add(new AjaxLink<Void>("more") {diff --git a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java b/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.javaindex 7cbfe6d622..a22de8eeb8 100644--- a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java@@ -19,7 +19,7 @@ import com.turbodev.server.web.editable.BeanContext;import com.turbodev.server.web.editable.BeanEditor;import com.turbodev.server.web.editable.PathSegment;import com.turbodev.server.web.page.base.BasePage;-import com.turbodev.server.web.page.dashboard.DashboardPage;+import com.turbodev.server.web.page.project.ProjectListPage;import com.turbodev.server.web.page.user.AvatarEditPage;import com.turbodev.server.web.page.user.UserPage;@@ -74,7 +74,7 @@ public class RegisterPage extends BasePage {@Overridepublic void onClick() {- setResponsePage(DashboardPage.class);+ setResponsePage(ProjectListPage.class);}});