Skip to content

The Unified and Autonomous Development Platform

Move issue side info outside of activities page

Robin Shen9b30d4287236
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 7896dbebef..60d241ecd9 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -32,7 +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.issuedetail.overview.IssueOverviewPage;
+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;
import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;
@@ -197,7 +197,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidRequestPage.class));
add(new OnePageMapper("projects/${project}/issues", IssueListPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/overview", IssueOverviewPage.class));
+ add(new OnePageMapper("projects/${project}/issues/${issue}/overview", IssueActivitiesPage.class));
add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
index 57e513e669..ab11692b26 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
@@ -31,7 +31,7 @@ import io.onedev.server.util.inputspec.multichoiceinput.MultiChoiceInput;
import io.onedev.server.web.component.IssueStateLabel;
import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.IssueOverviewPage;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;
import io.onedev.server.web.util.ComponentContext;
import io.onedev.utils.ColorUtils;
@@ -64,7 +64,7 @@ public class FieldValuesPanel extends GenericPanel<PromptedField> implements Edi
Issue issue = issueManager.find(project, Long.valueOf(value));
if (issue != null) {
Fragment issueFrag = new Fragment("value", "issueFrag", this);
- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueOverviewPage.class, IssueOverviewPage.paramsOf(issue));
+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
link.add(new Label("label", "#" + issue.getNumber()));
issueFrag.add(link);
issueFrag.add(new IssueStateLabel("state", Model.of(issue)));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html
index 479691262e..20732d25a9 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html
@@ -1,20 +1,38 @@
<wicket:extend>
<div id="issue-detail">
- <div wicket:id="title" class="title"></div>
- <div class="state-and-actions clearfix">
- <span wicket:id="state" class="state label pull-left"></span>
- <div class="transition-actions pull-left">
- <wicket:enclosure child="transitions">
- <span class="btn-group">
- <a wicket:id="transitions" class="btn btn-default btn-sm"><span wicket:id="label"></span></a>
- </span>
- </wicket:enclosure>
+ <div class="main">
+ <div wicket:id="title" class="title"></div>
+ <div class="state-and-actions clearfix">
+ <span wicket:id="state" class="state label pull-left"></span>
+ <div class="transition-actions pull-left">
+ <wicket:enclosure child="transitions">
+ <span class="btn-group">
+ <a wicket:id="transitions" class="btn btn-default btn-sm"><span wicket:id="label"></span></a>
+ </span>
+ </wicket:enclosure>
+ </div>
+ <a wicket:id="newIssue" class="new-issue pull-left btn btn-success btn-sm"><i class="fa fa-plus"></i> New Issue</a>
</div>
- <a wicket:id="newIssue" class="new-issue pull-left btn btn-success btn-sm"><i class="fa fa-plus"></i> New Issue</a>
+ <div wicket:id="actionOptions" class="action-options"></div>
+ <ul wicket:id="issueTabs" class="tabs nav nav-tabs"></ul>
+ <wicket:child></wicket:child>
+ </div>
+ <div class="side">
+ <div wicket:id="fields" class="fields">
+ <table>
+ <tr wicket:id="fields">
+ <td class="name"><span wicket:id="name"></span></td>
+ <td class="values"><div wicket:id="values"></div></td>
+ </tr>
+ </table>
+ <a wicket:id="editFields" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a>
+ </div>
+ <wicket:enclosure child="delete">
+ <div>
+ <a wicket:id="delete" class="delete btn btn-danger btn-sm"><i class="fa fa-trash"></i> Delete</a>
+ </div>
+ </wicket:enclosure>
</div>
- <div wicket:id="actionOptions" class="action-options"></div>
- <ul wicket:id="issueTabs" class="tabs nav nav-tabs"></ul>
- <wicket:child></wicket:child>
</div>
<wicket:fragment wicket:id="transitionFrag">
<form wicket:id="form" class="state-transition leave-confirm">
@@ -38,4 +56,27 @@
<span wicket:id="title"></span>
<a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>
</wicket:fragment>
+ <wicket:fragment wicket:id="userFrag">
+ <a wicket:id="avatar"></a> <a wicket:id="name"></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="nonEmptyValuesFrag">
+ <div wicket:id="values" class="value"><span wicket:id="value"></span></div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="fieldEditFrag">
+ <form wicket:id="form" class="field-edit leave-confirm">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 id="modal-title" class="modal-title">
+ Edit Fields
+ </h4>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>
+ </div>
+ </form>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
index 5c4a23760d..233b6c42a0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
@@ -26,6 +26,8 @@ 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.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.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -58,16 +60,23 @@ import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.IssueStateLabel;
import io.onedev.server.web.component.comment.CommentInput;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
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.editable.BeanContext;
+import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.IssueOverviewPage;
+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.IssueListPage;
import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
+import io.onedev.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
public abstract class IssueDetailPage extends ProjectPage implements InputContext {
@@ -283,7 +292,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevState, prevFields, promptedFields);
- setResponsePage(IssueOverviewPage.class, IssueOverviewPage.paramsOf(getIssue()));
+ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue()));
}
});
@@ -325,7 +334,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
newEmptyActionOptions(null);
List<Tab> tabs = new ArrayList<>();
- tabs.add(new IssueTab("Overview", IssueOverviewPage.class));
+ tabs.add(new IssueTab("Activities", IssueActivitiesPage.class));
add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));
@@ -371,7 +380,122 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
public void onBeginRequest(RequestCycle cycle) {
}
- });
+ });
+
+
+ WebMarkupContainer fieldsContainer = new WebMarkupContainer("fields") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getIssue().getFields().isEmpty());
+ }
+
+ };
+ fieldsContainer.setOutputMarkupId(true);
+
+ fieldsContainer.add(new ListView<PromptedField>("fields", new LoadableDetachableModel<List<PromptedField>>() {
+
+ @Override
+ protected List<PromptedField> load() {
+ return new ArrayList<>(getIssue().getPromptedFields().values());
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<PromptedField> item) {
+ PromptedField field = item.getModelObject();
+ item.add(new Label("name", field.getName()));
+ item.add(new FieldValuesPanel("values", item.getModel()));
+ }
+
+ });
+
+ fieldsContainer.add(new ModalLink("editFields") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "fieldEditFrag", IssueDetailPage.this);
+ Form<?> form = new Form<Void>("form");
+
+ Serializable fieldBean = OneDev.getInstance(IssueFieldManager.class).readFields(getIssue());
+ Map<String, PromptedField> prevFields = getIssue().getPromptedFields();
+
+ Map<String, PropertyDescriptor> propertyDescriptors =
+ new BeanDescriptor(fieldBean.getClass()).getMapOfDisplayNameToPropertyDescriptor();
+
+ Set<String> excludedFields = new HashSet<>();
+ for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFields()) {
+ if (!getIssue().getPromptedFields().containsKey(fieldSpec.getName()))
+ excludedFields.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());
+ }
+
+ form.add(BeanContext.editBean("editor", fieldBean, excludedFields));
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ OneDev.getInstance(IssueChangeManager.class).changeFields(
+ getIssue(), fieldBean, prevFields, getIssue().getPromptedFields().keySet());
+ modal.close();
+ target.add(fieldsContainer);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+ form.setOutputMarkupId(true);
+ fragment.add(form);
+
+ return fragment;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canModify(getIssue()));
+ }
+
+ });
+
+ add(fieldsContainer);
+
+ Link<Void> deleteLink = new Link<Void>("delete") {
+
+ @Override
+ public void onClick() {
+ OneDev.getInstance(IssueManager.class).delete(getIssue());
+ setResponsePage(IssueListPage.class, IssueListPage.paramsOf(getProject()));
+ }
+
+ };
+ deleteLink.add(new ConfirmOnClick("Do you really want to delete this issue?"));
+ deleteLink.setVisible(SecurityUtils.canModify(getIssue()));
+ add(deleteLink);
}
private void newEmptyActionOptions(@Nullable AjaxRequestTarget target) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.html
new file mode 100644
index 0000000000..ff2ee6d8ab
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.html
@@ -0,0 +1,25 @@
+<wicket:extend>
+ <div class="activities">
+ <table>
+ <tr wicket:id="activities" class="activity">
+ <td class="avatar"><a wicket:id="avatar"></a></td>
+ <td wicket:id="content" class="content"></td>
+ </tr>
+ </table>
+ <div wicket:id="addComment"></div>
+ </div>
+ <wicket:fragment wicket:id="loginToCommentFrag">
+ <div class="login-to-comment">
+ <a wicket:id="login">Login to comment</a>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="addCommentFrag">
+ <form wicket:id="form" class="add-comment leave-confirm no-autofocus">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="comment" placeholder="Leave a comment"></div>
+ <div class="actions">
+ <a wicket:id="save" class="btn btn-primary dirty-aware">Comment</a>
+ </div>
+ </form>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java
similarity index 59%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java
index 2e65299a42..2cebcac779 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java
@@ -1,20 +1,14 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview;
+package io.onedev.server.web.page.project.issues.issuedetail.activities;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
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.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -22,14 +16,10 @@ import org.apache.wicket.event.IEvent;
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.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.markup.repeater.RepeatingView;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -37,45 +27,31 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueCommentManager;
-import io.onedev.server.manager.IssueFieldManager;
-import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.PromptedField;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.comment.CommentInput;
import io.onedev.server.web.component.comment.ProjectAttachmentSupport;
import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanDescriptor;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.ChangedActivity;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.CommentedActivity;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.IssueActivity;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.IssueCommentDeleted;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.OpenedActivity;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.ChangedActivity;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.CommentedActivity;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.IssueActivity;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.IssueCommentDeleted;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.OpenedActivity;
import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
-public class IssueOverviewPage extends IssueDetailPage {
+public class IssueActivitiesPage extends IssueDetailPage {
private RepeatingView activitiesView;
- public IssueOverviewPage(PageParameters params) {
+ public IssueActivitiesPage(PageParameters params) {
super(params);
}
@@ -205,7 +181,7 @@ public class IssueOverviewPage extends IssueDetailPage {
@Override
protected Project getProject() {
- return IssueOverviewPage.this.getProject();
+ return IssueActivitiesPage.this.getProject();
}
@Override
@@ -266,126 +242,12 @@ public class IssueOverviewPage extends IssueDetailPage {
});
add(fragment);
}
-
- WebMarkupContainer fieldsContainer = new WebMarkupContainer("fields") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!getIssue().getFields().isEmpty());
- }
-
- };
- fieldsContainer.setOutputMarkupId(true);
-
- fieldsContainer.add(new ListView<PromptedField>("fields", new LoadableDetachableModel<List<PromptedField>>() {
-
- @Override
- protected List<PromptedField> load() {
- return new ArrayList<>(getIssue().getPromptedFields().values());
- }
-
- }) {
-
- @Override
- protected void populateItem(ListItem<PromptedField> item) {
- PromptedField field = item.getModelObject();
- item.add(new Label("name", field.getName()));
- item.add(new FieldValuesPanel("values", item.getModel()));
- }
-
- });
-
- fieldsContainer.add(new ModalLink("editFields") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "fieldEditFrag", IssueOverviewPage.this);
- Form<?> form = new Form<Void>("form");
-
- Serializable fieldBean = OneDev.getInstance(IssueFieldManager.class).readFields(getIssue());
- Map<String, PromptedField> prevFields = getIssue().getPromptedFields();
-
- Map<String, PropertyDescriptor> propertyDescriptors =
- new BeanDescriptor(fieldBean.getClass()).getMapOfDisplayNameToPropertyDescriptor();
-
- Set<String> excludedFields = new HashSet<>();
- for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFields()) {
- if (!getIssue().getPromptedFields().containsKey(fieldSpec.getName()))
- excludedFields.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());
- }
-
- form.add(BeanContext.editBean("editor", fieldBean, excludedFields));
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- OneDev.getInstance(IssueChangeManager.class).changeFields(
- getIssue(), fieldBean, prevFields, getIssue().getPromptedFields().keySet());
- modal.close();
- target.add(fieldsContainer);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
-
- });
- form.setOutputMarkupId(true);
- fragment.add(form);
-
- return fragment;
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canModify(getIssue()));
- }
-
- });
-
- add(fieldsContainer);
-
- Link<Void> deleteLink = new Link<Void>("delete") {
-
- @Override
- public void onClick() {
- OneDev.getInstance(IssueManager.class).delete(getIssue());
- setResponsePage(IssueListPage.class, IssueListPage.paramsOf(getProject()));
- }
-
- };
- deleteLink.add(new ConfirmOnClick("Do you really want to delete this issue?"));
- deleteLink.setVisible(SecurityUtils.canModify(getIssue()));
- add(deleteLink);
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueOverviewResourceReference()));
+ response.render(CssHeaderItem.forReference(new IssueActivitiesResourceReference()));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesResourceReference.java
new file mode 100644
index 0000000000..841b9049b0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesResourceReference.java
@@ -0,0 +1,12 @@
+package io.onedev.server.web.page.project.issues.issuedetail.activities;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+@SuppressWarnings("serial")
+public class IssueActivitiesResourceReference extends BaseDependentCssResourceReference {
+
+ public IssueActivitiesResourceReference() {
+ super(IssueActivitiesResourceReference.class, "issue-activities.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedActivity.java
similarity index 91%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedActivity.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedActivity.java
index df25103feb..af698cabe3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedActivity.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import java.util.Date;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedPanel.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedPanel.java
index 9fbc30dfe3..f3ae8cacaa 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedActivity.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java
index 9b30797798..507630c206 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import java.util.Date;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java
index c549ba1d9f..0e70e38d1e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/CommentedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/IssueActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueActivity.java
similarity index 77%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/IssueActivity.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueActivity.java
index 19e706738b..2eb0d2e2c0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/IssueActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueActivity.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import java.io.Serializable;
import java.util.Date;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/IssueCommentDeleted.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueCommentDeleted.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/IssueCommentDeleted.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueCommentDeleted.java
index 2c5bac1f28..e054e3cd60 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/IssueCommentDeleted.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueCommentDeleted.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedActivity.java
similarity index 91%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedActivity.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedActivity.java
index d8a509b929..6784b2f018 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedActivity.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import java.util.Date;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java
index a44d1cbbaa..8153847121 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/OpenedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css
new file mode 100644
index 0000000000..a251984ba0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css
@@ -0,0 +1,51 @@
+#issue-detail>.main>.activities tr.activity.new>.avatar {
+ border-left-color: #4667EE;
+}
+
+#issue-detail>.main>.activities>table>tbody>tr>td {
+ border-bottom: 1px solid #EEE;
+ padding: 16px 0;
+}
+#issue-detail>.main>.activities>table>tbody>tr:last-child>td {
+ border-bottom: none;
+}
+#issue-detail>.main>.activities>table>tbody>tr>td.avatar {
+ width: 40px;
+ border-left: 4px solid white;
+ padding-left: 12px;
+}
+#issue-detail>.main>.activities>table>tbody>tr>td.avatar .avatar {
+ width: 40px;
+ height: 40px;
+}
+#issue-detail>.main>.activities>table>tbody>tr>td.content {
+ padding-left: 20px;
+}
+#issue-detail>.main>.activities .activity>.head {
+ color: #888;
+}
+#issue-detail>.main>.activities .activity>.body {
+ margin-top: 8px;
+}
+#issue-detail>.main>.activities .activity>.body>.actions {
+ margin-top: 8px;
+}
+#issue-detail>.main>.activities .activity>.body>.actions a {
+ color: #888;
+}
+#issue-detail>.main>.activities .activity>.head a {
+ color: #999;
+ margin-left: 8px;
+}
+#issue-detail>.main>.activities .add-comment {
+ margin-top: 16px;
+}
+#issue-detail>.main>.activities .login-to-comment {
+ border: 1px solid #EEE;
+ vertical-align: center;
+ text-align: center;
+ padding: 20px;
+ font-size: 20px;
+ background: #F9F9F9;
+ border-radius: 4px;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
index 60537451d0..e8b6350699 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
@@ -1,27 +1,79 @@
+#issue-detail {
+ display: table;
+ width: 100%;
+}
#issue-detail>div {
+ display: table-cell;
+ vertical-align: top;
+}
+#issue-detail>.main {
+ width: 75%;
+ padding-right: 20px;
+}
+
+#issue-detail>.main>div {
margin-bottom: 20px;
}
-#issue-detail>.title {
+#issue-detail>.main>.title {
font-size: 20px;
font-weight: bold;
color: #444;
position: relative;
}
-#issue-detail>.title a {
+#issue-detail>.main>.title a {
color: #999;
}
-#issue-detail>.title input[type=text] {
+#issue-detail>.main>.title input[type=text] {
width: 600px;
font-weight: normal;
}
-#issue-detail>.title .alert {
+#issue-detail>.main>.title .alert {
font-weight: normal;
font-size: 14px;
}
-#issue-detail>.state-and-actions>.state {
+#issue-detail>.main>.state-and-actions>.state {
font-size: 20px;
font-weight: normal;
}
-#issue-detail>.state-and-actions>* {
+#issue-detail>.main>.state-and-actions>* {
margin-right: 20px;
}
+
+#issue-detail>.side {
+ border: 1px solid #E0E0E0;
+ padding: 20px;
+ background: #F9F9F9;
+ border-radius: 4px;
+ overflow: auto;
+}
+#issue-detail>.side>* {
+ margin-bottom: 20px;
+ border-top: 1px solid #E8E8E8;
+ padding-top: 20px;
+}
+#issue-detail>.side>div:first-child {
+ padding-top: 0;
+ border-top: none;
+}
+
+#issue-detail>.side .fields td {
+ padding-bottom: 10px;
+ vertical-align: middle;
+}
+#issue-detail>.side .fields tr:last-child td {
+ padding-bottom: 0;
+}
+#issue-detail>.side .fields .name {
+ font-weight: bold;
+ line-height: 20px;
+ white-space: nowrap;
+ padding-right: 20px;
+}
+#issue-detail>.side .fields .values .value>div {
+ display: table-cell;
+ border-radius: 3px;
+ padding: 3px 6px;
+}
+#issue-detail>.side .fields>a {
+ margin-top: 12px;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.html
deleted file mode 100644
index 7761ba6c58..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<wicket:extend>
- <div class="overview">
- <div class="activities">
- <table>
- <tr wicket:id="activities" class="activity">
- <td class="avatar"><a wicket:id="avatar"></a></td>
- <td wicket:id="content" class="content"></td>
- </tr>
- </table>
- <div wicket:id="addComment"></div>
- </div>
- <div class="side-info">
- <div wicket:id="fields" class="fields">
- <table>
- <tr wicket:id="fields">
- <td class="name"><span wicket:id="name"></span></td>
- <td class="values"><div wicket:id="values"></div></td>
- </tr>
- </table>
- <a wicket:id="editFields" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a>
- </div>
- <wicket:enclosure child="delete">
- <div>
- <a wicket:id="delete" class="delete btn btn-danger btn-sm"><i class="fa fa-trash"></i> Delete</a>
- </div>
- </wicket:enclosure>
- </div>
- </div>
- <wicket:fragment wicket:id="userFrag">
- <a wicket:id="avatar"></a> <a wicket:id="name"></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="nonEmptyValuesFrag">
- <div wicket:id="values" class="value"><span wicket:id="value"></span></div>
- </wicket:fragment>
- <wicket:fragment wicket:id="loginToCommentFrag">
- <div class="login-to-comment">
- <a wicket:id="login">Login to comment</a>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="addCommentFrag">
- <form wicket:id="form" class="add-comment leave-confirm no-autofocus">
- <div wicket:id="feedback"></div>
- <div wicket:id="comment" placeholder="Leave a comment"></div>
- <div class="actions">
- <a wicket:id="save" class="btn btn-primary dirty-aware">Comment</a>
- </div>
- </form>
- </wicket:fragment>
- <wicket:fragment wicket:id="fieldEditFrag">
- <form wicket:id="form" class="field-edit leave-confirm">
- <div class="modal-header">
- <button wicket:id="close" type="button" class="close">&times;</button>
- <h4 id="modal-title" class="modal-title">
- Edit Fields
- </h4>
- </div>
- <div class="modal-body">
- <div wicket:id="editor"></div>
- </div>
- <div class="modal-footer">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
- <a wicket:id="cancel" class="btn btn-default">Cancel</a>
- </div>
- </form>
- </wicket:fragment>
-</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewResourceReference.java
deleted file mode 100644
index 19cc2befb9..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewResourceReference.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.web.page.project.issues.issuedetail.overview;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-@SuppressWarnings("serial")
-public class IssueOverviewResourceReference extends BaseDependentCssResourceReference {
-
- public IssueOverviewResourceReference() {
- super(IssueOverviewResourceReference.class, "issue-overview.css");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/issue-overview.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/issue-overview.css
deleted file mode 100644
index 3bdc99cd96..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/issue-overview.css
+++ /dev/null
@@ -1,111 +0,0 @@
-#issue-detail>.overview {
- display: table;
- width: 100%;
-}
-#issue-detail>.overview>div {
- display: table-cell;
- vertical-align: top;
-}
-#issue-detail>.overview>.activities {
- width: 75%;
- padding-right: 20px;
-}
-#issue-detail>.overview>.activities tr.activity.new>.avatar {
- border-left-color: #4667EE;
-}
-
-#issue-detail>.overview>.activities>table>tbody>tr>td {
- border-bottom: 1px solid #EEE;
- padding: 16px 0;
-}
-#issue-detail>.overview>.activities>table>tbody>tr:last-child>td {
- border-bottom: none;
-}
-#issue-detail>.overview>.activities>table>tbody>tr>td.avatar {
- width: 40px;
- border-left: 4px solid white;
- padding-left: 12px;
-}
-#issue-detail>.overview>.activities>table>tbody>tr>td.avatar .avatar {
- width: 40px;
- height: 40px;
-}
-#issue-detail>.overview>.activities>table>tbody>tr>td.content {
- padding-left: 20px;
-}
-#issue-detail>.overview>.activities .activity>.head {
- color: #888;
-}
-#issue-detail>.overview>.activities .activity>.body {
- margin-top: 8px;
-}
-#issue-detail>.overview>.activities .activity>.body>.actions {
- margin-top: 8px;
-}
-#issue-detail>.overview>.activities .activity>.body>.actions a {
- color: #888;
-}
-#issue-detail>.overview>.activities .activity>.head a {
- color: #999;
- margin-left: 8px;
-}
-#issue-detail>.overview>.activities .add-comment {
- margin-top: 16px;
-}
-#issue-detail>.overview>.activities .login-to-comment {
- border: 1px solid #EEE;
- vertical-align: center;
- text-align: center;
- padding: 20px;
- font-size: 20px;
- background: #F9F9F9;
- border-radius: 4px;
-}
-
-#issue-detail>.overview>.side-info {
- border: 1px solid #E0E0E0;
- padding: 20px;
- background: #F9F9F9;
- border-radius: 4px;
- overflow: auto;
-}
-#issue-detail>.overview>.side-info>* {
- margin-bottom: 20px;
- border-top: 1px solid #E8E8E8;
- padding-top: 20px;
-}
-#issue-detail>.overview>.side-info>div:first-child,
-#issue-detail>.overview>.side-info>.add-relation {
- padding-top: 0;
- border-top: none;
- margin-top: -10px;
-}
-
-#issue-detail>.overview>.side-info .fields td {
- padding-bottom: 10px;
- vertical-align: middle;
-}
-#issue-detail>.overview>.side-info .fields tr:last-child td {
- padding-bottom: 0;
-}
-#issue-detail>.overview>.side-info .fields .name {
- font-weight: bold;
- line-height: 20px;
- white-space: nowrap;
- padding-right: 20px;
-}
-#issue-detail>.overview>.side-info .fields .values .value>div {
- display: table-cell;
- border-radius: 3px;
- padding: 3px 6px;
-}
-#issue-detail>.overview>.side-info .fields>a {
- margin-top: 12px;
-}
-
-.diff.floating {
- max-width: 600px;
-}
-.diff.floating table {
- border: none;
-}
\ No newline at end of file
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.java
index 7866352ba5..5a230fb23a 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
@@ -76,7 +76,7 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.choice.MultiChoiceEditor;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.IssueOverviewPage;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.WorkflowReconcilePanel;
import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -666,7 +666,7 @@ public class IssueListPage extends ProjectPage {
Issue issue = item.getModelObject();
item.add(new Label("number", "#" + issue.getNumber()));
Fragment titleFrag = new Fragment("title", "titleFrag", IssueListPage.this);
- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueOverviewPage.class, IssueOverviewPage.paramsOf(issue));
+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
link.add(new Label("label", issue.getTitle()));
titleFrag.add(link);
item.add(titleFrag);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
index 7f61c997ff..0d8824ef76 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
@@ -23,7 +23,7 @@ import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.IssueOverviewPage;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;
import io.onedev.server.web.page.security.LoginPage;
@SuppressWarnings("serial")
@@ -64,7 +64,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {
super.onSubmit();
StateSpec stateSpec = Preconditions.checkNotNull(getProject().getIssueWorkflow().getState(issue.getState()));
getIssueManager().open(issue, fieldBean, stateSpec.getFields());
- setResponsePage(IssueOverviewPage.class, IssueOverviewPage.paramsOf(issue));
+ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
}
};
diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
index 44bfdfb0cb..df0cd46a1e 100644
--- a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
@@ -7,7 +7,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.util.markdown.IssueParser;
import io.onedev.server.util.markdown.MarkdownProcessor;
-import io.onedev.server.web.page.project.issues.issuedetail.overview.IssueOverviewPage;
+import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;
public class IssueProcessor extends IssueParser implements MarkdownProcessor {
@@ -19,7 +19,7 @@ public class IssueProcessor extends IssueParser implements MarkdownProcessor {
@Override
protected String toHtml(Issue issue) {
CharSequence url = RequestCycle.get().urlFor(
- IssueOverviewPage.class, IssueOverviewPage.paramsOf(issue));
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
return String.format("<a href='%s' class='issue'>#%d</a>", url, issue.getNumber());
}