Add a delay before loading path from router, Fix #710

Language handling on share link errors Set a max width on the home badges Load main CSS before main JS.
pydio · Nov 15, 2014 · 439efa5 · 439efa5
1 parent 57f30ad
commit 439efa5
Show file tree

Hide file tree

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

diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -1077,15 +1077,13 @@ public static function loadMinisite($data, $hash = '', $error = null)
     public static function loadShareByHash($hash){
         AJXP_Logger::debug(__CLASS__, __FUNCTION__, "Do something");
         AJXP_PluginsService::getInstance()->initActivePlugins();
+        if(isSet($_GET["lang"])){
+            ConfService::setLanguage($_GET["lang"]);
+        }
         $shareCenter = self::getShareCenter();
         $data = $shareCenter->loadPublicletData($hash);
         $mess = ConfService::getMessages();
         if($shareCenter->getShareStore()->isShareExpired($hash, $data)){
-            /*
-            if (strstr(realpath($_SERVER["SCRIPT_FILENAME"]),realpath(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"))) !== FALSE) {
-                $shareCenter->deleteExpiredPubliclet($hash, $data);
-            }
-            */
             AuthService::disconnect();
             self::loadMinisite(array(), $hash, $mess["share_center.165"]);
             return;

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.Ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js
@@ -125,7 +125,9 @@ Class.create("Ajaxplorer", {
                     }
                     ajaxplorer.triggerRepositoryChange(foundRepo.getId());
                 }else if(path){
-                    ajaxplorer.goTo(path);
+                    window.setTimeout(function(){
+                        ajaxplorer.goTo(path);
+                    }, 1000);
                 }
             }
 

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html b/core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html
@@ -5,10 +5,10 @@
         AJXP_REBASE
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
         AJXP_ADDITIONAL_JS_FRAMEWORKS
         <script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
         <link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
-        <link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
     </head>
 	<body bgcolor="#FFFFFF" text="#000000" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"  style="overflow:hidden;">		
 		<script type="text/javascript">