Shorter string on small screens

pydio · Sep 2, 2013 · 402c35f · 402c35f
1 parent ed8b9b1
commit 402c35f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php b/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
@@ -647,7 +647,7 @@ function switchAction($action, $httpVars, $fileVars){
                 $basePath = AuthService::getLoggedUser()->getGroupPath();
                 if(empty ($basePath)) $basePath = "/";
                 if(!empty($httpVars["group_path"])){
-                    $newUser->setGroupPath($basePath.ltrim($httpVars["group_path"], "/"));
+                    $newUser->setGroupPath( rtrim($basePath, "/")."/".ltrim($httpVars["group_path"], "/"));
                 }else{
                     $newUser->setGroupPath($basePath);
                 }

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpBootstrap.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpBootstrap.js
@@ -344,7 +344,11 @@ Class.create("AjxpBootstrap", {
 	 */
 	insertBasicSkeleton : function(desktopNode){
         var elem = new Element("div", {style:"position: absolute;z-index: 10000; bottom: 0; right: 0; color: #666;font-family: Arial;font-size: 11px;text-align: right;padding: 3px; padding-right: 10px;"});
-        elem.update('AjaXplorer Community - Free non supported version &copy; C. du Jeu 2008-2013 - <a target="_blank" href="http://ajaxplorer.info/">http://ajaxplorer.info/</a>');
+        if(document.viewport.getWidth() < 500){
+            elem.update('AjaXplorer Community &copy; C. du Jeu 2008-2013');
+        }else{
+            elem.update('AjaXplorer Community - Free non supported version &copy; C. du Jeu 2008-2013 - <a target="_blank" href="http://ajaxplorer.info/">http://ajaxplorer.info/</a>');
+        }
         $(desktopNode).insert({after:elem});
         disableTextSelection(elem);
 		if($('all_forms')) return;