Refix LogoWidget

pydio · Nov 28, 2014 · 621f93f · 621f93f
1 parent 769922d
commit 621f93f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
@@ -692,7 +692,7 @@
                 }
                 div.widget_logo{
                     height: 90px;
-                    background-position: 86px 76px !important;
+                    background-position: 86px 76px;
                 }
                 div#widget_title{
                     color: rgba(255,255,255,0.8);

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
@@ -180,18 +180,24 @@ Class.create("LogoWidget", AjxpPane, {
         }
         var htHeight = parseInt(this.htmlElement.getHeight());
 
-        if(!configs.get('SKIP_BY_LOGO')){
+        var has_by = false;
+        if(!configs.get('SKIP_BY_LOGO') && !this.imageIsDefault){
             this.htmlElement.setStyle({
                 backgroundImage : 'url(' + window.ajxpResourcesFolder + '/images/white_by.png)',
                 backgroundSize : '66px',
                 backgroundPosition : (imgW+16) + 'px '+ (htHeight - 18) +'px'
             });
+            has_by = true;
+        }else{
+            this.htmlElement.setStyle({
+                backgroundImage : 'none'
+            });
         }
         if(this.titleDiv){
             this.titleDiv.setStyle({
                 position:'absolute',
                 left : (imgW + 16) + 'px',
-                top : (htHeight - 42) + 'px',
+                top : (htHeight - (has_by?42:39)) + 'px',
                 fontSize : '19px'
             });
         }