Skip to content

The Unified and Autonomous Development Platform

Enhance tabs to display tab options

Robin Shena64e663e12ef
diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.java
index df914a731f..d1103a029d 100644
--- a/core/src/main/java/io/onedev/server/model/User.java
+++ b/core/src/main/java/io/onedev/server/model/User.java
@@ -70,6 +70,9 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
private Collection<Membership> memberships = new ArrayList<>();
+ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
+ private Collection<UserAuthorization> authorizations = new ArrayList<>();
+
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
private Collection<PullRequestReview> reviews = new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
index 5d291bec46..f3beb72964 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
@@ -1,17 +1,5 @@
<wicket:panel>
<div class="issue-activities">
- <div class="options">
- <div class="checkbox">
- <label>
- <input type="checkbox" wicket:id="showComments"/> Comments
- </label>
- </div>
- <div class="checkbox">
- <label>
- <input type="checkbox" wicket:id="showChangeHistory"/> Change History
- </label>
- </div>
- </div>
<table>
<tr wicket:id="activities" class="activity">
<td class="avatar"><a wicket:id="avatar"></a></td>
@@ -34,4 +22,12 @@
</div>
</form>
</wicket:fragment>
+ <wicket:fragment wicket:id="optionsFrag">
+ <div class="issue-activity-options">
+ <span class="btn-group">
+ <a wicket:id="showComments" class="btn btn-sm btn-default" title="Show comments"><i class="fa fa-comments"></i></a>
+ <a wicket:id="showChangeHistory" class="btn btn-sm btn-default" title="Show change history"><i class="fa fa-history"></i></a>
+ </span>
+ </div>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 46cbbcfebe..d99645a89d 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -11,7 +11,7 @@ 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.form.AjaxCheckBox;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -85,36 +85,6 @@ public abstract class IssueActivitiesPanel extends Panel {
@Override
protected void onBeforeRender() {
- addOrReplace(new AjaxCheckBox("showComments", Model.of(showComments)) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- showComments = !showComments;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(IssueActivitiesPanel.this);
- }
-
- });
-
- addOrReplace(new AjaxCheckBox("showChangeHistory", Model.of(showChangeHistory)) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- showChangeHistory = !showChangeHistory;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(IssueActivitiesPanel.this);
- }
-
- });
-
activitiesView = new RepeatingView("activities");
addOrReplace(activitiesView);
Issue issue = getIssue();
@@ -335,4 +305,56 @@ public abstract class IssueActivitiesPanel extends Panel {
}
protected abstract Issue getIssue();
+
+ public Component renderOptions(String componentId) {
+ Fragment fragment = new Fragment(componentId, "optionsFrag", this);
+ fragment.add(new AjaxLink<Void>("showComments") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showComments)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showComments = !showComments;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(IssueActivitiesPanel.this);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ fragment.add(new AjaxLink<Void>("showChangeHistory") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showChangeHistory)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showChangeHistory = !showChangeHistory;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(IssueActivitiesPanel.this);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ return fragment;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
index 67fc781b5d..40beadf95f 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
@@ -1,7 +1,7 @@
-.issue-activities>.options {
+.issue-activity-options {
text-align: right;
}
-.issue-activities>.options>div {
+.issue-activity-options>div {
padding-left: 12px;
display: inline-block;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java
index 5f526c1d61..5d641ed1f9 100644
--- a/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java
+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java
@@ -42,6 +42,8 @@ public abstract class ActionTab extends Tab {
each.setSelected(false);
setSelected(true);
+
+ tabLink.findParent(Tabbable.class).renderOptions(this);
onSelect(tabLink);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java
index 0f81258700..50f9fa1f12 100644
--- a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java
+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java
@@ -7,6 +7,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.model.IModel;
+import io.onedev.server.web.util.WicketUtils;
+
public class PageTab extends Tab {
private static final long serialVersionUID = 1L;
@@ -137,7 +139,7 @@ public class PageTab extends Tab {
@Override
public final boolean isSelected() {
- return isActive(getItem().getPage());
+ return isActive(WicketUtils.getPage());
}
public boolean isActive(Page currentPage) {
diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java
index fe9d616de2..6abd054b18 100644
--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java
+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java
@@ -2,26 +2,19 @@ package io.onedev.server.web.component.tabbable;
import java.io.Serializable;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.list.ListItem;
+import javax.annotation.Nullable;
-import com.google.common.base.Preconditions;
+import org.apache.wicket.Component;
@SuppressWarnings("serial")
public abstract class Tab implements Serializable {
- private ListItem<Tab> item;
-
- void setItem(ListItem<Tab> item) {
- this.item = item;
- }
+ protected abstract Component render(String componentId);
- protected ListItem<Tab> getItem() {
- Preconditions.checkNotNull(item);
- return item;
+ @Nullable
+ protected Component renderOptions(String componentId) {
+ return null;
}
- protected abstract Component render(String componentId);
-
public abstract boolean isSelected();
}
diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/TabDivider.java b/core/src/main/java/io/onedev/server/web/component/tabbable/TabDivider.java
deleted file mode 100644
index 61fa696e16..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/tabbable/TabDivider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.onedev.server.web.component.tabbable;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-
-public class TabDivider extends Tab {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- getItem().add(AttributeModifier.append("class", "divider"));
- return new WebMarkupContainer(componentId);
- }
-
- @Override
- public boolean isSelected() {
- return false;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html
index 31e2d0e668..ed9f0e6fb8 100644
--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html
+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.html
@@ -2,4 +2,5 @@
<li wicket:id="tabs">
<wicket:container wicket:id="tab"></wicket:container>
</li>
+ <li wicket:id="options" class="options"></li>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java
index 25afdfa5c4..af35ac23a2 100644
--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java
+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java
@@ -4,8 +4,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
@@ -13,6 +15,8 @@ import org.apache.wicket.markup.html.panel.Panel;
@SuppressWarnings("serial")
public class Tabbable extends Panel {
+ private static final String OPTIONS_ID = "options";
+
private final List<Tab> tabs;
public Tabbable(String id, List<? extends Tab> tabs) {
@@ -55,8 +59,6 @@ public class Tabbable extends Panel {
@Override
protected void populateItem(ListItem<Tab> item) {
Tab tab = item.getModelObject();
- tab.setItem(item);
-
if (tab.isSelected())
item.add(AttributeModifier.append("class", "active"));
@@ -64,8 +66,34 @@ public class Tabbable extends Panel {
}
});
-
+
setOutputMarkupId(true);
}
+ @Override
+ protected void onBeforeRender() {
+ boolean found = false;
+ for (Tab tab: tabs) {
+ if (tab.isSelected()) {
+ Component options = tab.renderOptions(OPTIONS_ID);
+ if (options != null) {
+ addOrReplace(options);
+ found = true;
+ }
+ break;
+ }
+ }
+ if (!found)
+ addOrReplace(new WebMarkupContainer(OPTIONS_ID).setVisible(false));
+
+ super.onBeforeRender();
+ }
+
+ public void renderOptions(Tab tab) {
+ Component options = tab.renderOptions(OPTIONS_ID);
+ if (options != null)
+ replace(options);
+ else
+ replace(new WebMarkupContainer(OPTIONS_ID).setVisible(false));
+ }
}
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index 9684ec3c3b..13004f9016 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -624,4 +624,8 @@ a.disabled, a[disabled="disabled"] {
/* wicket default ajax lazyload style */
.floating>.content>div>img[alt="Loading..."] {
margin: 8px;
+}
+
+.nav.nav-tabs>li.options {
+ float: right;
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
index f3f30b14ba..bcf1f8826f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.project.issues.detail;
+import org.apache.wicket.Component;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.model.Issue;
@@ -8,6 +9,8 @@ import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;
@SuppressWarnings("serial")
public class IssueActivitiesPage extends IssueDetailPage {
+ private IssueActivitiesPanel activities;
+
public IssueActivitiesPage(PageParameters params) {
super(params);
}
@@ -15,7 +18,7 @@ public class IssueActivitiesPage extends IssueDetailPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new IssueActivitiesPanel("activities") {
+ add(activities = new IssueActivitiesPanel("activities") {
@Override
protected Issue getIssue() {
@@ -25,4 +28,8 @@ public class IssueActivitiesPage extends IssueDetailPage {
});
}
+ public Component renderOptions(String componentId) {
+ return activities.renderOptions(componentId);
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index f2c99f75d1..a430c9936a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -115,7 +115,15 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
});
List<Tab> tabs = new ArrayList<>();
- tabs.add(new IssueTab("Activities", IssueActivitiesPage.class));
+ tabs.add(new IssueTab("Activities", IssueActivitiesPage.class) {
+
+ @Override
+ protected Component renderOptions(String componentId) {
+ IssueActivitiesPage page = (IssueActivitiesPage) getPage();
+ return page.renderOptions(componentId);
+ }
+
+ });
CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
Collection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 752aa45c5a..8d6d681ef4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -86,6 +86,7 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.build.status.PullRequestBuildsPanel;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
@@ -113,7 +114,6 @@ import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
-import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.util.model.EntityModel;
@@ -332,7 +332,15 @@ public abstract class PullRequestDetailPage extends ProjectPage {
List<Tab> tabs = new ArrayList<>();
- tabs.add(new RequestTab("Activities", PullRequestActivitiesPage.class));
+ tabs.add(new RequestTab("Activities", PullRequestActivitiesPage.class) {
+
+ @Override
+ protected Component renderOptions(String componentId) {
+ PullRequestActivitiesPage page = (PullRequestActivitiesPage) getPage();
+ return page.renderOptions(componentId);
+ }
+
+ });
tabs.add(new RequestTab("File Changes", PullRequestChangesPage.class));
tabs.add(new RequestTab("Code Comments", PullRequestCodeCommentsPage.class));
if (request.isOpen())
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
index fcb91714e4..2ab72453e4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
@@ -1,22 +1,5 @@
<wicket:extend>
<div wicket:id="activities" class="activities">
- <div class="options">
- <div class="checkbox">
- <label>
- <input type="checkbox" wicket:id="showComments"/> Comments
- </label>
- </div>
- <div class="checkbox">
- <label>
- <input type="checkbox" wicket:id="showCommits"/> Commits
- </label>
- </div>
- <div class="checkbox">
- <label>
- <input type="checkbox" wicket:id="showChangeHistory"/> Change History
- </label>
- </div>
- </div>
<table>
<tr wicket:id="activities" class="activity">
<td class="avatar"><a wicket:id="avatar"></a></td>
@@ -44,4 +27,13 @@
<span class="icon fa fa-ext fa-file-diff"></span> <a wicket:id="sinceChanges">Changes since last visit</a>
</div>
</wicket:fragment>
+ <wicket:fragment wicket:id="optionsFrag">
+ <div class="request-activity-options">
+ <span class="btn-group">
+ <a wicket:id="showComments" class="btn btn-sm btn-default" title="Show comments"><i class="fa fa-comments"></i></a>
+ <a wicket:id="showCommits" class="btn btn-sm btn-default" title="Show commits"><i class="fa fa-ext fa-commit"></i></a>
+ <a wicket:id="showChangeHistory" class="btn btn-sm btn-default" title="Show change history"><i class="fa fa-history"></i></a>
+ </span>
+ </div>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 25ece4833b..6ce252e95c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -10,7 +10,7 @@ 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.form.AjaxCheckBox;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -253,52 +253,6 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
@Override
protected void onBeforeRender() {
- WebMarkupContainer container = this;
- addOrReplace(new AjaxCheckBox("showComments", Model.of(showComments)) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- showComments = !showComments;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(container);
- }
-
- });
-
- addOrReplace(new AjaxCheckBox("showCommits", Model.of(showCommits)) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- showCommits = !showCommits;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_COMMITS, String.valueOf(showCommits));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(container);
- }
-
- });
-
- addOrReplace(new AjaxCheckBox("showChangeHistory", Model.of(showChangeHistory)) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- showChangeHistory = !showChangeHistory;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(container);
- }
-
- });
-
addOrReplace(activitiesView = new RepeatingView("activities"));
List<PullRequestActivity> activities = getActivities();
@@ -425,5 +379,82 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new PullRequestActivitiesCssResourceReference()));
}
-
+
+ public Component renderOptions(String componentId) {
+ Fragment fragment = new Fragment(componentId, "optionsFrag", this);
+
+ fragment.add(new AjaxLink<Void>("showComments") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showComments)
+ add(AttributeAppender.append("class", "active"));
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showComments = !showComments;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(container);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ fragment.add(new AjaxLink<Void>("showCommits") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showCommits)
+ add(AttributeAppender.append("class", "active"));
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showCommits = !showCommits;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMITS, String.valueOf(showCommits));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(container);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ fragment.add(new AjaxLink<Void>("showChangeHistory") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showChangeHistory)
+ add(AttributeAppender.append("class", "active"));
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showChangeHistory = !showChangeHistory;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(container);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ return fragment;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index e57efe19de..a0967fa042 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -1,7 +1,7 @@
-#request-detail>.main>.activities>.options {
+.request-activity-options {
text-align: right;
}
-#request-detail>.main>.activities>.options>div {
+.request-activity-options>div {
padding-left: 12px;
display: inline-block;
}