The Unified and Autonomous Development Platform
Add issue board blank page
Robin Shenefef910ef8b7
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 46f91faf47..454f9a2b7a 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -32,6 +32,7 @@ import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.issues.issueboard.IssueBoardPage;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;@@ -196,7 +197,8 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidRequestPage.class));- add(new OnePageMapper("projects/${project}/issues", IssueListPage.class));+ add(new OnePageMapper("projects/${project}/issue-board", IssueBoardPage.class));+ add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 2fc9ba7981..eaf46f183d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -48,6 +48,7 @@ import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.issues.IssuesPage;import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;@@ -145,7 +146,8 @@ public abstract class ProjectPage extends LayoutPage {tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class));- tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, IssueDetailPage.class, NewIssuePage.class) {+ tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, IssuesPage.class,+ IssueDetailPage.class, NewIssuePage.class) {@Overridepublic Component render(String componentId) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.htmlnew file mode 100644index 0000000000..a1fbb5ffa8--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html@@ -0,0 +1,6 @@+<wicket:extend>+ <div id="issues">+ <ul wicket:id="issuesTabs" class="nav nav-tabs"></ul>+ <wicket:child></wicket:child>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.javanew file mode 100644index 0000000000..73172a740e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java@@ -0,0 +1,59 @@+package io.onedev.server.web.page.project.issues;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.PageTabLink;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.issues.issueboard.IssueBoardPage;+import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;++@SuppressWarnings("serial")+public abstract class IssuesPage extends ProjectPage {++ public IssuesPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Tab> tabs = new ArrayList<>();+ tabs.add(new IssuesTab("List", IssueListPage.class));+ tabs.add(new IssuesTab("Board", IssueBoardPage.class));++ add(new Tabbable("issuesTabs", tabs));+ }++ private class IssuesTab extends PageTab {++ public IssuesTab(String title, Class<? extends Page> pageClass) {+ super(Model.of(title), pageClass);+ }++ @Override+ public Component render(String componentId) {+ return new PageTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getProject()));+ }++ };+ }++ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboard/IssueBoardPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboard/IssueBoardPage.htmlnew file mode 100644index 0000000000..351dd25380--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboard/IssueBoardPage.html@@ -0,0 +1,3 @@+<wicket:extend>++</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboard/IssueBoardPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboard/IssueBoardPage.javanew file mode 100644index 0000000000..4110b8cb15--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboard/IssueBoardPage.java@@ -0,0 +1,14 @@+package io.onedev.server.web.page.project.issues.issueboard;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.page.project.issues.IssuesPage;++@SuppressWarnings("serial")+public class IssueBoardPage extends IssuesPage {++ public IssueBoardPage(PageParameters params) {+ super(params);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.javaindex 70eec16cc5..f6720afe11 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java@@ -71,7 +71,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.watchstatus.WatchStatusLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.issues.IssuesPage;import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.WorkflowReconcilePanel;@@ -82,7 +82,7 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")-public class IssueListPage extends ProjectPage {+public class IssueListPage extends IssuesPage {private static final Logger logger = LoggerFactory.getLogger(IssueListPage.class);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.cssindex e878666c80..61e4c4bc6f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css@@ -1,18 +1,15 @@#issue-list {- margin: -20px;+ display: table;+ width: 100%;+}+#issue-list>div {+ display: table-cell;}#issue-list>.side {- position: fixed;- top: 48px;- left: 240px;- bottom: 0;width: 300px;- padding: 20px;- border-right: 2px solid #E0E0E0;- overflow: auto;-}-#project>.minimized.sidebar+.content>#issue-list>.side {- left: 44px;+ border: 1px solid #E0E0E0;+ padding: 20px;+ border-radius: 4px;}#issue-list>.side>.head>.actions {margin: 8px 0 0 12px;@@ -50,8 +47,7 @@}#issue-list>.main {- padding: 20px;- margin-left: 300px;+ padding-left: 20px;}#issue-list>.main>.head {position: relative;diff --git a/core/src/main/java/io/onedev/server/web/page/project/project.css b/core/src/main/java/io/onedev/server/web/page/project/project.cssindex 9365e69075..8c3a472048 100644--- a/core/src/main/java/io/onedev/server/web/page/project/project.css+++ b/core/src/main/java/io/onedev/server/web/page/project/project.css@@ -32,4 +32,5 @@}.no-commits>.body>.help-block {margin-top: -8px;-}\ No newline at end of file+}+