Skip to content

The Unified and Autonomous Development Platform

Show/hide side bar with animation

Robin Shend8d74b4262be
diff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.java b/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.java
index 032ad1d12f..a347c1339e 100644
--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.java
@@ -27,7 +27,7 @@ public abstract class MoreInfoSidePanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- String script = String.format("$('#%s').toggleClass('closed');", MoreInfoSidePanel.this.getMarkupId());
+ String script = String.format("$('#%s').hide('slide', {direction: 'right', duration: 200});", MoreInfoSidePanel.this.getMarkupId());
target.appendJavaScript(script);
send(getPage(), Broadcast.BREADTH, new MoreInfoSideClosed(target));
}
@@ -42,7 +42,7 @@ public abstract class MoreInfoSidePanel extends Panel {
super.onEvent(event);
if (event.getPayload() instanceof MoreInfoSideOpened) {
MoreInfoSideOpened moreInfoSideOpened = (MoreInfoSideOpened) event.getPayload();
- String script = String.format("$('#%s').toggleClass('closed');", getMarkupId());
+ String script = String.format("$('#%s').show('slide', {direction: 'right', duration: 200});", getMarkupId());
moreInfoSideOpened.getHandler().appendJavaScript(script);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideResourceReference.java b/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideResourceReference.java
index 3b66abebba..9d1c58a001 100644
--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideResourceReference.java
@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -22,6 +23,7 @@ public class MoreInfoSideResourceReference extends BaseDependentResourceReferenc
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
MoreInfoSidePanel.class, "more-info-side.css")));
return dependencies;
diff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.css b/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.css
index 4cb1b9b4da..e9191e12cf 100644
--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.css
+++ b/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.css
@@ -9,12 +9,10 @@
background: #FAFAFA;
z-index: 10;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ display: none;
}
.more-info-side>.close {
position: absolute;
top: 20px;
right: 20px;
}
-.more-info-side.closed {
- display: none;
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java b/core/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java
index b707631aef..9411b8e818 100644
--- a/core/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java
@@ -7,6 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.web.asset.cookies.CookiesResourceReference;
+import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -24,6 +25,7 @@ public class SidebarResourceReference extends BaseDependentResourceReference {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(SidebarResourceReference.class, "sidebar.css")));
return dependencies;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
index f7d852e4d9..c55854b918 100644
--- a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
+++ b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
@@ -30,7 +30,7 @@ onedev.server.sidebar = {
}
$miniToggle.click(function() {
- $sidebar.toggleClass("minimized");
+ $sidebar.toggleClass("minimized", 100);
if (miniCookieKey) {
var cookieValue = $sidebar.hasClass("minimized")?"yes":"no";
Cookies.set(miniCookieKey, cookieValue, {expires: Infinity});
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index 00b182fd94..b590421ae9 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -1,6 +1,7 @@
<wicket:panel>
<table wicket:id="listEditor" class="bean list">
<thead>
+ <th class="reorder">&nbsp;</th>
<th wicket:id="headers">
<span wicket:id="header"></span>
<span wicket:id="required" class="required"></span>
@@ -10,13 +11,13 @@
</thead>
<tbody>
<tr wicket:id="elements">
+ <td class="reorder"><span class="drag-indicator fa fa-reorder"></span></td>
<td wicket:id="properties">
<div wicket:id="propertyEditor"></div>
<div wicket:id="feedback"></div>
</td>
<td class="actions">
<a wicket:id="deleteElement" title="Delete this element"><span class="fa fa-trash delete"></span></a>
- <span class="handle fa fa-arrows" title="Drag to reorder elements"></span>
</td>
</tr>
</tbody>
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index 1351a8d927..cfee184da0 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -217,7 +217,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
onPropertyUpdating(target);
}
- }.sortable("tbody").handle(".handle").helperClass("sort-helper"));
+ }.sortable("tbody").helperClass("sort-helper"));
return listEditor;
}
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 da0c0bf86b..e42fb33180 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
@@ -239,6 +239,12 @@ form>.test-feedback {
line-height: 22px;
white-space: nowrap;
}
+.editable table.bean.list>thead>tr>th.reorder {
+ width: 1%;
+}
+.editable table.bean.list>tbody>tr>td.reorder {
+ vertical-align: middle;
+}
.editable table.bean.list>thead>tr>th, .editable table.bean.list>tbody>tr>td {
padding: 5px 10px 5px 0;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
index 4a92a70166..34f2e3ce6e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
@@ -26,9 +26,7 @@
#issue-detail .more-info-side {
box-shadow: none;
border-left-width: 2px;
- }
- #issue-detail .more-info-side.closed {
- display: block;
+ display: block !important;
}
#issue-detail .issue-operations a.more-info, #issue-detail .more-info-side>a.close {
display: none;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 2ea6e486ba..0b43d20e7a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -164,6 +164,7 @@ ul>li>a.code-comments.new .fa-circle {
#request-detail .more-info-side {
box-shadow: none;
border-left-width: 2px;
+ display: block !important;
}
#request-detail .more-info-side.closed {
display: block;