From 402c35f12fb425d6cd05bb989e1284eec32c84e8 Mon Sep 17 00:00:00 2001 From: cdujeu Date: Mon, 2 Sep 2013 10:58:25 +0200 Subject: [PATCH] Shorter string on small screens --- .../access.ajxp_conf/class.ajxp_confAccessDriver.php | 2 +- .../gui.ajax/res/js/ajaxplorer/class.AjxpBootstrap.js | 6 +++++- 2 files changed, 6 insertions(+), 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 index b847f13049..99e28573a7 100644 --- 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 index 10bb3ad174..4c141e54b0 100644 --- 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 © C. du Jeu 2008-2013 - http://ajaxplorer.info/'); + if(document.viewport.getWidth() < 500){ + elem.update('AjaXplorer Community © C. du Jeu 2008-2013'); + }else{ + elem.update('AjaXplorer Community - Free non supported version © C. du Jeu 2008-2013 - http://ajaxplorer.info/'); + } $(desktopNode).insert({after:elem}); disableTextSelection(elem); if($('all_forms')) return;