Fix activity monitor on automatic logout: extra-long opacity effect w…

…as in raising CPU usage Fix home dashboard blocks width
pydio · Nov 12, 2014 · 59557cd · 59557cd
1 parent db9d1e7
commit 59557cd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/core/src/plugins/access.ajxp_home/home.css b/core/src/plugins/access.ajxp_home/home.css
@@ -35,7 +35,7 @@
 .repoInfoBadge {
     display: inline-block;
     font-size: 25px;
-    width: 190px;
+    min-width: 190px;
     line-height: 30px;
     border: 1px solid rgba(255,255,255,0.7);
     border-radius: 8px;

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActivityMonitor.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActivityMonitor.js
@@ -174,17 +174,12 @@ Class.create("ActivityMonitor", {
 			mess = mess.replace("__LOGOUT__", "<span class=\"warning_timer\"></span>");
 			this.warningPane = new Element('div', {id:"activity_monitor_warning", className:'dialogBox', style:'padding:3px'}).update('<div class="dialogContent">'+mess+'<br><span class="click_anywhere">'+MessageHash[376]+'</span></div>');
 			$(document.body).insert(this.warningPane);			
+            displayLightBoxById("activity_monitor_warning");
+            $('overlay').setStyle({cursor:'pointer'});
+            $('overlay').observeOnce("click", this.exitIdleState.bind(this));
+            $('activity_monitor_warning').observeOnce("click", this.exitIdleState.bind(this));
+            new Effect.Shake(this.warningPane);
 		}
-		displayLightBoxById("activity_monitor_warning");
-		$('overlay').setStyle({cursor:'pointer'});
-		$('overlay').observeOnce("click", this.exitIdleState.bind(this));
-		$('activity_monitor_warning').observeOnce("click", this.exitIdleState.bind(this));
-		new Effect.Shake(this.warningPane);
-		this.opaFx = new Effect.Opacity($('overlay'), {
-			from:0.4, 
-			to : 0.7,
-			duration: this._warningMinutes*60
-		});
 	},
 
 	/**

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
@@ -249,6 +249,7 @@ Class.create("FilesList", SelectableElements, {
 	 * Implementation of the IAjxpWidget methods
 	 */
 	destroy : function($super){
+        this.empty(true);
         $super();
         this._clearObservers();
         if(window[this.htmlElement.id]){

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
@@ -658,9 +658,14 @@ span.ajxp-caret-up{
     top:30%;
     text-align:center;
     font-size: 16px;
-    color: #5E7C90;
     font-weight:bold;
     cursor: pointer;
+    box-shadow: none;
+}
+
+#activity_monitor_warning div.dialogContent {
+    border-radius: 10px;
+    box-shadow: 1px 1px 46px rgba(0, 0, 0, 0.67);
 }
 
 #activity_monitor_warning span.click_anywhere{

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css