The Unified and Autonomous Development Platform
Minor UI improvements
Robin Shen1a9a599902c7
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex 9e8a839e3b..204c200fb3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -5,7 +5,6 @@<div wicket:id="state"></div></div><a wicket:id="transitions" class="btn btn-primary btn-sm pull-left"><span wicket:id="label"></span></a>- <a wicket:id="newIssue" class="new-issue pull-left btn btn-success btn-sm"><i class="fa fa-plus"></i> New</a><a wicket:id="moreInfo" class="more-info" title="More info"><i class="fa fa-ellipsis-h"></i></a></div><div wicket:id="actionOptions" class="action-options"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 016edf126f..786f95f52b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.issue.operation;import java.io.Serializable;-import java.util.ArrayList;import java.util.Collection;import java.util.List;import java.util.Map;@@ -31,24 +30,15 @@ import org.apache.wicket.request.cycle.RequestCycle;import com.google.common.collect.Lists;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.issue.TransitionSpec;-import io.onedev.server.issue.fieldspec.DateField;-import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryLexer;-import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;-import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.markdown.AttachmentSupport;@@ -94,7 +84,6 @@ public abstract class IssueOperationsPanel extends Panel {RepeatingView transitionsView = new RepeatingView("transitions");- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();List<TransitionSpec> transitions = getIssue().getProject().getIssueSetting().getTransitionSpecs(true);AtomicReference<Component> activeTransitionLinkRef = new AtomicReference<>(null);@@ -209,49 +198,11 @@ public abstract class IssueOperationsPanel extends Panel {addOrReplace(transitionsView);- List<String> criterias = new ArrayList<>();- if (getIssue().getMilestone() != null) {- criterias.add(Criteria.quote(Issue.FIELD_MILESTONE) + " "- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + Criteria.quote(getIssue().getMilestoneName()));- }- for (Map.Entry<String, Input> entry: getIssue().getFieldInputs().entrySet()) {- if (getIssue().isFieldVisible(entry.getKey())) {- List<String> strings = entry.getValue().getValues();- if (strings.isEmpty()) {- criterias.add(Criteria.quote(entry.getKey()) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty));- } else {- FieldSpec field = issueSetting.getFieldSpec(entry.getKey());- if (field.isAllowMultiple()) {- for (String string: strings) {- criterias.add(Criteria.quote(entry.getKey()) + " "- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + Criteria.quote(string));- }- } else if (!(field instanceof DateField)) {- criterias.add(Criteria.quote(entry.getKey()) + " "- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + Criteria.quote(strings.iterator().next()));- }- }- }- }-- String query;- if (!criterias.isEmpty())- query = StringUtils.join(criterias, " and ");- else- query = null;-- Component createIssueButton = newCreateIssueButton("newIssue", query);- addOrReplace(createIssueButton);-stateContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {@Overrideprotected String load() {- createIssueButton.configure();- if (createIssueButton.isVisible() || transitionsView.size() != 0)+ if (transitionsView.size() != 0)return "with-separator";elsereturn "";@@ -295,6 +246,4 @@ public abstract class IssueOperationsPanel extends Panel {protected abstract Issue getIssue();- protected abstract Component newCreateIssueButton(String componentId, String templateQuery);-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.htmlindex b7232a5187..e9281d5bfa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html@@ -13,8 +13,13 @@</form></wicket:fragment><wicket:fragment wicket:id="titleViewFrag">- <span wicket:id="title"></span>- <a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>- <a wicket:id="copy" title="Copy issue number and title" class="copy"><i class="fa fa-copy"></i></a>+ <div class="view clearfix">+ <span class="pull-left">+ <span wicket:id="title"></span>+ <a wicket:id="copy" title="Copy issue number and title" class="copy"><i class="fa fa-copy"></i></a>+ <a wicket:id="edit" title="Edit issue title" class="edit"><i class="fa fa-pencil"></i></a>+ </span>+ <a wicket:id="create" class="create btn btn-success btn-sm pull-right"><i class="fa fa-plus"></i> New</a>+ </div></wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javaindex 5d0e290fdd..1e6589a933 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java@@ -1,27 +1,48 @@package io.onedev.server.web.component.issue.title;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.Map;++import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.DateField;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryLexer;+import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.ReferenceInputBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.util.ReferenceTransformer;@SuppressWarnings("serial")@@ -29,8 +50,11 @@ public abstract class IssueTitlePanel extends Panel {private static final String CONTENT_ID = "content";- public IssueTitlePanel(String id) {+ private final boolean withIssueCreation;++ public IssueTitlePanel(String id, boolean withIssueCreation) {super(id);+ this.withIssueCreation = withIssueCreation;}private Fragment newTitleEditor() {@@ -122,6 +146,66 @@ public abstract class IssueTitlePanel extends Panel {String copyContent = "#" + getIssue().getNumber() + ": " + getIssue().getTitle();titleViewer.add(new WebMarkupContainer("copy").add(new CopyClipboardBehavior(Model.of(copyContent))));+ if (withIssueCreation) {+ titleViewer.add(new BookmarkablePageLink<Void>("create", NewIssuePage.class) {++ @Override+ public PageParameters getPageParameters() {+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ List<String> criterias = new ArrayList<>();+ if (getIssue().getMilestone() != null) {+ criterias.add(Criteria.quote(Issue.FIELD_MILESTONE) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + Criteria.quote(getIssue().getMilestoneName()));+ }+ for (Map.Entry<String, Input> entry: getIssue().getFieldInputs().entrySet()) {+ if (getIssue().isFieldVisible(entry.getKey())) {+ List<String> strings = entry.getValue().getValues();+ if (strings.isEmpty()) {+ criterias.add(Criteria.quote(entry.getKey()) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty));+ } else {+ FieldSpec field = issueSetting.getFieldSpec(entry.getKey());+ if (field.isAllowMultiple()) {+ for (String string: strings) {+ criterias.add(Criteria.quote(entry.getKey()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + Criteria.quote(string));+ }+ } else if (!(field instanceof DateField)) {+ criterias.add(Criteria.quote(entry.getKey()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + Criteria.quote(strings.iterator().next()));+ }+ }+ }+ }++ String query;+ if (!criterias.isEmpty())+ query = StringUtils.join(criterias, " and ");+ else+ query = null;++ return NewIssuePage.paramsOf(getIssue().getProject(), query);+ }++ }.add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(Issue.getWebSocketObservable(getIssue().getId()));+ }++ }).setOutputMarkupId(true));+ } else {+ titleViewer.add(new WebMarkupContainer("create").setVisible(false));+ }+titleViewer.setOutputMarkupId(true);return titleViewer;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css b/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.cssindex 83262219d4..72f8e3f6a8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css@@ -3,16 +3,14 @@font-weight: bold;position: relative;}-.issue-title a.edit {- color: #666;- margin-left: 8px;- font-size: 16px;-}-.issue-title a.copy {+.issue-title .view>.pull-left>a {color: #666;margin-left: 4px;font-size: 16px;}+.issue-title .view>.pull-right {+ margin-left: 8px;+}.issue-title input[type=text] {font-weight: normal;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 42ab3d2bd3..26afb51713 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -233,12 +233,8 @@ public abstract class PullRequestListPanel extends Panel {add(form);if (getProject() != null) {- if (SecurityUtils.canReadCode(getProject())) {- add(new BookmarkablePageLink<Void>("newRequest", NewPullRequestPage.class,- NewPullRequestPage.paramsOf(getProject())));- } else {- add(new WebMarkupContainer("newRequest").setVisible(false));- }+ add(new BookmarkablePageLink<Void>("newRequest", NewPullRequestPage.class,+ NewPullRequestPage.paramsOf(getProject())));} else {add(new DropdownLink("newRequest") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex c394dbd42e..a98c91b7d8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -9,7 +9,6 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;@@ -80,7 +79,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConteprotected void onInitialize() {super.onInitialize();- add(new IssueTitlePanel("title") {+ add(new IssueTitlePanel("title", false) {@Overrideprotected Issue getIssue() {@@ -96,11 +95,6 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContereturn CardDetailPanel.this.getIssue();}- @Override- protected Component newCreateIssueButton(String componentId, String templateQuery) {- return new WebMarkupContainer(componentId).setVisible(false);- }-});List<Tab> tabs = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex f2ac2e80d4..50840537d2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -14,7 +14,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;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.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -48,7 +47,6 @@ 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.create.NewIssuePage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.QueryPosition;@@ -102,7 +100,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}});- add(new IssueTitlePanel("title") {+ add(new IssueTitlePanel("title", true) {@Overrideprotected Issue getIssue() {@@ -118,11 +116,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexreturn IssueDetailPage.this.getIssue();}- @Override- protected Component newCreateIssueButton(String componentId, String templateQuery) {- return new BookmarkablePageLink<Void>(componentId, NewIssuePage.class, NewIssuePage.paramsOf(getProject(), templateQuery));- }-});List<Tab> tabs = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.htmlindex 72b57f8bd9..0834ab5b2a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html@@ -1,8 +1,9 @@<wicket:panel><span class="actions">- <a wicket:id="reopen" title="Reopen milestone">reopen</a>- <a wicket:id="close" title="Close milestone">close</a>- <a wicket:id="edit" title="Edit milestone">edit</a>- <a wicket:id="delete" title="Delete milestone">delete</a>+ <a wicket:id="reopen" title="Reopen this milestone">reopen</a>+ <a wicket:id="close" title="Close this milestone">close</a>+ <a wicket:id="edit" title="Edit this milestone">edit</a>+ <a wicket:id="delete" title="Delete this milestone">delete</a>+ <a wicket:id="create" title="Create new milestone">create</a></span></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.javaindex 67b90480ba..19ac963486 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.issues.milestones;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;@@ -15,8 +16,11 @@ import io.onedev.server.web.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {- public MilestoneActionsPanel(String id, IModel<Milestone> model) {+ private final boolean withMilestoneCreation;++ public MilestoneActionsPanel(String id, IModel<Milestone> model, boolean withMilestoneCreation) {super(id, model);+ this.withMilestoneCreation = withMilestoneCreation;}private Milestone getMilestone() {@@ -83,6 +87,14 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {}});++ if (withMilestoneCreation) {+ add(new BookmarkablePageLink<Void>("create", NewMilestonePage.class,+ NewMilestonePage.paramsOf(getMilestone().getProject())));+ } else {+ add(new WebMarkupContainer("create").setVisible(false));+ }+setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex f57338c9e0..0288fb35ca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -82,7 +82,7 @@ public class MilestoneDetailPage extends ProjectIssuesPage {add(new MilestoneDueLabel("due", milestoneModel));- add(new MilestoneActionsPanel("actions", milestoneModel) {+ add(new MilestoneActionsPanel("actions", milestoneModel, true) {@Overrideprotected void onDeleted(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex 0372e87954..a9ad1a399a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -156,13 +156,8 @@ public class MilestoneListPage extends ProjectIssuesPage {});- add(new Link<Void>("newMilestone") {+ add(new BookmarkablePageLink<Void>("newMilestone", NewMilestonePage.class, NewMilestonePage.paramsOf(getProject())) {- @Override- public void onClick() {- setResponsePage(NewMilestonePage.class, NewMilestonePage.paramsOf(getProject()));- }-@Overrideprotected void onConfigure() {super.onConfigure();@@ -263,7 +258,7 @@ public class MilestoneListPage extends ProjectIssuesPage {});- if (SecurityUtils.canManage(getProject())) {+ if (SecurityUtils.canManageIssues(getProject())) {columns.add(new AbstractColumn<Milestone, Void>(Model.of("Actions")) {@Override@@ -274,7 +269,7 @@ public class MilestoneListPage extends ProjectIssuesPage {@Overridepublic void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,IModel<Milestone> rowModel) {- cellItem.add(new MilestoneActionsPanel(componentId, rowModel) {+ cellItem.add(new MilestoneActionsPanel(componentId, rowModel, false) {@Overrideprotected void onUpdated(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 4881cd8615..c98890fc0e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -1,9 +1,12 @@<wicket:extend><div id="request-detail"><div class="main">- <div wicket:id="requestHead" class="title">- <span wicket:id="title" class="title"></span>- <a wicket:id="editLink" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>+ <div wicket:id="requestHead" class="title clearfix">+ <span class="pull-left">+ <span wicket:id="title" class="title"></span>+ <a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>+ </span>+ <a wicket:id="create" class="create btn btn-success btn-sm pull-right"><i class="fa fa-plus"></i> New</a><form wicket:id="editForm" class="form"><div class="clearable-wrapper"><input wicket:id="title" type="text" placeholder="Input title" class="form-control">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 94a01a4385..94c43e2f77 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -130,6 +130,7 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;+import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;@@ -223,7 +224,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}.setEscapeModelStrings(false));- requestHead.add(new AjaxLink<Void>("editLink") {+ requestHead.add(new AjaxLink<Void>("edit") {@Overridepublic void onClick(AjaxRequestTarget target) {@@ -240,6 +241,17 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}});++ requestHead.add(new BookmarkablePageLink<Void>("create",+ NewPullRequestPage.class, NewPullRequestPage.paramsOf(getProject())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!isEditingTitle);+ }++ });Form<?> form = new Form<Void>("editForm") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 00c79a1731..b66e2a109a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -24,6 +24,9 @@ body.PullRequestDetailPage #layout>.body {font-weight: bold;position: relative;}+#request-detail>.main>.title .create {+ margin-left: 8px;+}#request-detail>.main>.title form {position: relative;padding-right: 100px;