Fix clickable zone in the LogoWidget and customization

pydio · Sep 9, 2014 · eaf0b2f · eaf0b2f
1 parent 22b856e
commit eaf0b2f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
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.LogoWidget.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.LogoWidget.js
@@ -77,7 +77,7 @@ Class.create("LogoWidget", AjxpPane, {
             }
             if(!configs.get("CUSTOM_TOP_LOGO") || configs.get("CUSTOM_TOP_LOGO") == 'ajxp-remove-original'){
                 if(this.image){
-                    this.image.remove();
+                    if(this.image.parentNode) this.image.remove();
                     this.image = null;
                 }
                 this.resizeImage(configs, true);
@@ -99,6 +99,7 @@ Class.create("LogoWidget", AjxpPane, {
             }
             if(!this.image){
                 this.image  = new Image();
+                this.image.addClassName('custom_logo_image');
                 this.image.src = url;
                 this.image.onload = function(){
                     this.resizeImage(configs, true);
@@ -110,7 +111,7 @@ Class.create("LogoWidget", AjxpPane, {
                 }.bind(this);
             }
         }else if(configs.get("CUSTOM_TOP_LOGO") == 'ajxp-remove-original' && this.image){
-            this.image.remove();
+            if(this.image.parentNode) this.image.remove();
             this.image = null;
             this.htmlElement.setAttribute('style', '');
         }
@@ -149,7 +150,7 @@ Class.create("LogoWidget", AjxpPane, {
             imgH = 0;
         }
         // Reset height
-        this.htmlElement.setStyle({paddingTop:'9px'});
+        this.htmlElement.setStyle({paddingTop:(ajxpBootstrap.parameters.get("theme") == 'orbit' ? 0: '9px')});
         if(imgH > parseInt(this.htmlElement.getHeight())){
             var elPadding = parseInt(this.htmlElement.getStyle('paddingTop')) + (imgH - parseInt(this.htmlElement.getHeight()));
             this.htmlElement.setStyle({paddingTop: elPadding + 'px'});
@@ -160,22 +161,27 @@ Class.create("LogoWidget", AjxpPane, {
             this.htmlElement.setStyle({
                 backgroundImage : 'url(' + window.ajxpResourcesFolder + '/images/white_by.png)',
                 backgroundSize : '66px',
-                backgroundPosition : (imgW+10) + 'px '+ (htHeight - 16) +'px'
+                backgroundPosition : (imgW+8) + 'px '+ (htHeight - 16) +'px'
             });
         }
         if(this.titleDiv){
             this.titleDiv.setStyle({
                 position:'absolute',
                 left : (imgW + 8) + 'px',
-                top : (htHeight - 37) + 'px',
+                top : (htHeight - 39) + 'px',
                 fontSize : '19px'
             });
         }
 
-        if(insert){
+        if(!(this.htmlElement.down('img.custom_logo_image'))){
             this.htmlElement.insert(this.image);
         }
 
+        if(this.htmlElement.down('.linked')){
+            this.htmlElement.down('.linked').setStyle({height:htHeight+'px'});
+        }
+
+
     }
 
 

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
@@ -87,6 +87,7 @@ a:link, a:visited, a:hover, a:active, a:focus {
 
 .linked{
     cursor: pointer;
+    z-index: 10;
 }
 
 body, html
@@ -1451,7 +1452,8 @@ div.dialogBox.form-login_form_dynamic div.dialogButtons input.dialogButton
 #topPane{
     float:left;
     width:280px;
-    background-color: rgba(50,50,50,0.80);
+    background-color: rgba(50,50,50,0.93);
+    /*background-color: rgba(32, 32, 32, 0.93);*/
 }
 
 #cpane_container{

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