The Unified and Autonomous Development Platform
Add some help text to dashboard page
robin shen7993ddc7fc97
diff --git a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.javaindex c25ee4f04e..6a46423f31 100644--- a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java@@ -10,7 +10,7 @@ public class SecuritySetting implements Serializable {private static final long serialVersionUID = 1L;private boolean enableSelfRegister = true;-+@Editable(description="User can self-register if this option is enabled")public boolean isEnableSelfRegister() {return enableSelfRegister;diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.javaindex 92ae3909a2..54a5fca6ec 100644--- a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java+++ b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java@@ -31,7 +31,7 @@ import com.gitplex.server.web.page.project.commit.ProjectCommitsPage;import com.gitplex.server.web.page.project.compare.RevisionComparePage;import com.gitplex.server.web.page.project.pullrequest.newrequest.NewRequestPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.CodeCommentsPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.page.project.pullrequest.requestlist.RequestListPage;@@ -154,7 +154,7 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {add(new WebPageMapper("projects/${project}/pulls/new", NewRequestPage.class));add(new WebPageMapper("projects/${project}/pulls/${request}", RequestOverviewPage.class));add(new WebPageMapper("projects/${project}/pulls/${request}/overview", RequestOverviewPage.class));- add(new WebPageMapper("projects/${project}/pulls/${request}/code-comments", RequestCodeCommentsPage.class));+ add(new WebPageMapper("projects/${project}/pulls/${request}/code-comments", CodeCommentsPage.class));add(new WebPageMapper("projects/${project}/pulls/${request}/changes", RequestChangesPage.class));add(new WebPageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));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.htmlindex a34725e89c..fd4557828f 100644--- 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@@ -2,16 +2,22 @@<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 GitPlex represents a git repository. Only those visible to current user will be counted and listed.</div></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 class="help-block">User profiles in GitPlex are publicly accessible for better collaboration. 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><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 GitPlex 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 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>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.cssindex 19d3e0e1f1..133d5a0814 100644--- 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@@ -5,7 +5,9 @@#dashboard .summary {margin-bottom: 20px;border-bottom: 1px solid #DDD;- padding-bottom: 20px;+}+#dashboard .summary .help-block {+ margin-bottom: 20px;}#dashboard .summary a {color: #444;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.htmlindex 381a91abe8..524ce07a7d 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@@ -23,13 +23,9 @@</div></wicket:enclosure></div>- <div class="actions pull-right">- <a wicket:id="createProject" title="Create new project"><i class="fa fa-plus"></i></a>+ <div class="help pull-right"><a wicket:id="docLink" title="Help"><i class="fa fa-question"></i></a></div>- <div class="search pull-right">- <input class="hidden form-control input-sm" placeholder="Search..."></input>- </div></div><div class="body"><wicket:child></wicket:child>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.javaindex 11a99e33b6..25833b4fbc 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@@ -35,7 +35,6 @@ import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;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;@@ -76,16 +75,6 @@ public abstract class LayoutPage extends BasePage {});- head.add(new ViewStateAwarePageLink<Void>("createProject", NewProjectPage.class) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canCreateProjects());- }-- });-head.add(new ExternalLink("docLink", GitPlex.getInstance().getDocLink()));User user = getLoginUser();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.cssindex 33b3e750eb..d37fb95695 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@@ -27,13 +27,10 @@ html, body {#main>.head>.breadcrumb .separator {margin: 0 8px;}-#main>.head>.actions {+#main>.head>.help {padding-top: 7px;}-#main>.head>.actions>a {- margin-right: 20px;-}-#main>.head>.actions a .fa {+#main>.head>.help .fa {font-size: 18px;}#main>.head>.user {diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.javaindex 5bd0b79e7d..0c6c646289 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java@@ -81,7 +81,7 @@ import com.gitplex.server.web.page.base.BasePage;import com.gitplex.server.web.page.project.ProjectPage;import com.gitplex.server.web.page.project.NoBranchesPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.CodeCommentsPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.util.DateUtils;@@ -310,7 +310,7 @@ public abstract class RequestDetailPage extends ProjectPage {tabs.add(new RequestTab("Overview", RequestOverviewPage.class));tabs.add(new RequestTab("File Changes", RequestChangesPage.class));- tabs.add(new RequestTab("Code Comments", RequestCodeCommentsPage.class));+ tabs.add(new RequestTab("Code Comments", CodeCommentsPage.class));tabs.add(new RequestTab("Merge Preview", MergePreviewPage.class));add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));@@ -922,9 +922,9 @@ public abstract class RequestDetailPage extends ProjectPage {@Overridepublic Component render(String componentId) {- if (getMainPageClass() == RequestCodeCommentsPage.class) {+ if (getMainPageClass() == CodeCommentsPage.class) {Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", RequestDetailPage.this);- Link<Void> link = new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, paramsOf(getPullRequest())) {+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", CodeCommentsPage.class, paramsOf(getPullRequest())) {@Overridepublic void onEvent(IEvent<?> event) {diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.javaindex 8877298af9..2f0c1cffc5 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java@@ -11,7 +11,7 @@ import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;+import com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments.CodeCommentsPage;@SuppressWarnings("serial")class UnresolvedCodeCommentsPanel extends GenericPanel<PullRequest> {@@ -26,12 +26,12 @@ class UnresolvedCodeCommentsPanel extends GenericPanel<PullRequest> {PullRequest request = getModelObject();- PageParameters params = RequestCodeCommentsPage.paramsOf(request, getState());- add(new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, params));+ PageParameters params = CodeCommentsPage.paramsOf(request, getState());+ add(new ViewStateAwarePageLink<Void>("link", CodeCommentsPage.class, params));}- private RequestCodeCommentsPage.State getState() {- RequestCodeCommentsPage.State state = new RequestCodeCommentsPage.State();+ private CodeCommentsPage.State getState() {+ CodeCommentsPage.State state = new CodeCommentsPage.State();state.setUnresolved(true);state.setUserName(GitPlex.getInstance(UserManager.class).getCurrent().getName());return state;diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsCssResourceReference.javanew file mode 100644index 0000000000..8cba59df83--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsCssResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++public class CodeCommentsCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public CodeCommentsCssResourceReference() {+ super(CodeCommentsCssResourceReference.class, "code-comments.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javarename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.javaindex 876a8161cc..9d39057ecd 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.java@@ -55,7 +55,7 @@ import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;@SuppressWarnings("serial")-public class RequestCodeCommentsPage extends RequestDetailPage {+public class CodeCommentsPage extends RequestDetailPage {private static final String PARAM_USER = "user";@@ -73,7 +73,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {private List<String> commentedFiles;- public RequestCodeCommentsPage(PageParameters params) {+ public CodeCommentsPage(PageParameters params) {super(params);state = new State();@@ -123,7 +123,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {public void onClick() {State state = new State();state.userName = SecurityUtils.getUser().getName();- setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));+ setResponsePage(CodeCommentsPage.class, paramsOf(getPullRequest(), state));}});@@ -140,7 +140,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {State state = new State();state.userName = SecurityUtils.getUser().getName();state.unresolved = true;- setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));+ setResponsePage(CodeCommentsPage.class, paramsOf(getPullRequest(), state));}});@@ -150,7 +150,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {public void onClick() {State state = new State();state.unresolved = true;- setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));+ setResponsePage(CodeCommentsPage.class, paramsOf(getPullRequest(), state));}});@@ -159,7 +159,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@Overridepublic void onClick() {PageParameters params = paramsOf(getPullRequest());- setResponsePage(RequestCodeCommentsPage.class, params);+ setResponsePage(CodeCommentsPage.class, params);}});@@ -185,7 +185,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {public void populateItem(Item<ICellPopulator<CodeComment>> cellItem,String componentId, IModel<CodeComment> rowModel) {CodeComment comment = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "commentFrag", RequestCodeCommentsPage.this);+ Fragment fragment = new Fragment(componentId, "commentFrag", CodeCommentsPage.this);Link<Void> titleLink = new Link<Void>("title") {@Override@@ -297,7 +297,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new RequestCodeCommentsCssResourceReference()));+ response.render(CssHeaderItem.forReference(new CodeCommentsCssResourceReference()));}public List<String> getCommentedFiles() {@@ -437,7 +437,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@SuppressWarnings("unused")private static List<String> getCommentedFiles() {IPageRequestHandler handler = (IPageRequestHandler) RequestCycle.get().getActiveRequestHandler();- return ((RequestCodeCommentsPage)handler.getPage()).getCommentedFiles();+ return ((CodeCommentsPage)handler.getPage()).getCommentedFiles();}}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.javadeleted file mode 100644index 22e0f229ed..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments;--import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;--public class RequestCodeCommentsCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public RequestCodeCommentsCssResourceReference() {- super(RequestCodeCommentsCssResourceReference.class, "request-code-comments.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/request-code-comments.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/code-comments.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/request-code-comments.cssrename to web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/code-comments.css