i18n and resize tweaks

pydio · Jul 24, 2014 · 71b15b6 · 71b15b6
1 parent af64625
commit 71b15b6
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 23 deletions.
diff --git a/core/src/plugins/access.fs/fsActions.xml b/core/src/plugins/access.fs/fsActions.xml
@@ -128,6 +128,9 @@
 			<processing>
 				<clientCallback prepareModal="true"><![CDATA[
 					var uploaders = ajaxplorer.getActiveExtensionByType("uploader");
+                    uploaders.sort(function(objA, objB){
+                        return objA.order - objB.order;
+                    });
 					if(uploaders.length){
 					    var uploader;
 					    if(window.actionArguments[0]){
@@ -157,9 +160,6 @@
 						    form.insert({top:chooser});
 						    var chooserList = new Element('ul');
                             chooser.insert(chooserList);
-                            uploaders.sort(function(objA, objB){
-                                return objA.order - objB.order;
-                            });
                             uploaders.each(function(up){
                                 var label = up.xmlNode.getAttribute("label");
                                 var desc = up.xmlNode.getAttribute("description")

diff --git a/core/src/plugins/access.fs/fsTemplatePart.xml b/core/src/plugins/access.fs/fsTemplatePart.xml
@@ -36,7 +36,7 @@
                         <div id="files_list_pane" ajxpClass="AjxpPane">
                             <div id="files_list_header" ajxpClass="AjxpPane">
                                 <div id="display_toolbar" class="text_only" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["default"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":5}'></div>
-                                <div style="float:left;position:fixed;" ajxpClass="AjxpPane"  id="buttons_bar_cont" ajxpOptions='{"flexTo":"files_list_header", "flexToMargin":30}'>
+                                <div style="float:left;position:fixed;" ajxpClass="AjxpPane"  id="buttons_bar_cont" ajxpOptions='{"flexTo":"files_list_header", "flexToMargin":30, "resize_events":["switchDisplayMode-FilesList-content_pane"]}'>
                                     <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "change_main"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
                                 </div>
                             </div>

diff --git a/core/src/plugins/action.cart/manifest.xml b/core/src/plugins/action.cart/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ajxp_plugin enabled="true" id="action.cart" label="CONF_MESSAGE[Selection Cart]" description="CONF_MESSAGE[Select files to a cart and download/share all at once]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+<ajxp_plugin enabled="false" id="action.cart" label="CONF_MESSAGE[Selection Cart]" description="CONF_MESSAGE[Select files to a cart and download/share all at once]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
 
     <plugin_info>
         <core_relation packaged="true" tested_version="follow_core"/>

diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -1348,7 +1348,10 @@ public function createSharedMinisite($httpVars, $repository, $accessDriver)
                 "REPOSITORY"=>$newId
             );
         }
-        if(isSet($httpVars["create_guest_user"]) && isSet($userId)){
+        if(isSet($data["PRELOG_USER"]))unset($data["PRELOG_USER"]);
+        if(isSet($data["PRESET_LOGIN"]))unset($data["PRESET_LOGIN"]);
+        if((isSet($httpVars["create_guest_user"]) && isSet($userId)) || (isSet($httpVars["guest_user_id"]))){
+            if(!isset($userId)) $userId = $httpVars["guest_user_id"];
             if(empty($httpVars["guest_user_pass"])){
                 $data["PRELOG_USER"] = $userId;
             }else{

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.FilesList.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
@@ -1111,6 +1111,7 @@ Class.create("FilesList", SelectableElements, {
 			ajaxplorer.user.setPreference("display", this._displayMode);
 			ajaxplorer.user.savePreference("display");
 		}
+        document.fire("ajaxplorer:switchDisplayMode-FilesList-" + this.htmlElement.id);
 		return this._displayMode;
 	},
 

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Modal.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Modal.js
@@ -232,6 +232,10 @@ Class.create("Modal", {
 		this.currentListensToWidth = false;
 		this.currentListensToHeight = false;
 		// WIDTH / HEIGHT
+        $(elementName).setStyle({
+            width:'auto',
+            height:'auto'
+        });
 		if(boxWidth != null){
 			if(boxWidth.indexOf("%") ==-1 && parseInt(boxWidth) > winWidth){
 				boxWidth = '90%';

diff --git a/core/src/plugins/meta.user/class.MetaCellRenderer.js b/core/src/plugins/meta.user/class.MetaCellRenderer.js
@@ -236,7 +236,7 @@ Class.create("MetaCellRenderer", {
                         td.update(editableDiv);
                         obj.linkEditableDiv(editableDiv);
                     }*/
-                    if(!td.innerHTML) td.update('No value');
+                    if(!td.innerHTML) td.update(MessageHash['meta.user.9']);
                 break;
                 default:
                 break;

diff --git a/core/src/plugins/meta.user/i18n/cs.php b/core/src/plugins/meta.user/i18n/cs.php
@@ -26,5 +26,6 @@
 "5" => "Úkoly",
 "6" => "Osobní",
 "7" => "Práce",
-"8" => "Důležité"
+"8" => "Důležité",
+"9" => "No Value",
 );
diff --git a/core/src/plugins/meta.user/i18n/de.php b/core/src/plugins/meta.user/i18n/de.php
@@ -30,5 +30,6 @@
 "5" => "Todo",
 "6" => "Persönlich",
 "7" => "Arbeit",
-"8" => "Wichtig"
+"8" => "Wichtig",
+"9" => "No Value",
 );
diff --git a/core/src/plugins/meta.user/i18n/en.php b/core/src/plugins/meta.user/i18n/en.php
@@ -26,5 +26,6 @@
 "5" => "Todo",
 "6" => "Personal",
 "7" => "Work",
-"8" => "Important"
+"8" => "Important",
+"9" => "No Value",
 );
diff --git a/core/src/plugins/meta.user/i18n/es.php b/core/src/plugins/meta.user/i18n/es.php
@@ -29,5 +29,6 @@
 "5" => "Pendiente",
 "6" => "A revisar",
 "7" => "Importante",
-"8" => "Urgente"
+"8" => "Urgente",
+"9" => "No Value",
 );
diff --git a/core/src/plugins/meta.user/i18n/fi.php b/core/src/plugins/meta.user/i18n/fi.php
@@ -32,5 +32,6 @@
 "5" => "Todo",
 "6" => "Henkilökohtainen",
 "7" => "Työ",
-"8" => "Tärkeä"
+"8" => "Tärkeä",
+"9" => "No Value",
 );
diff --git a/core/src/plugins/meta.user/i18n/fr.php b/core/src/plugins/meta.user/i18n/fr.php
@@ -26,5 +26,6 @@
 "5" => "A faire",
 "6" => "Personnel",
 "7" => "Travail",
-"8" => "Important"
+"8" => "Important",
+"9" => "Pas de valeurs",
 );
diff --git a/core/src/plugins/meta.user/i18n/pt.php b/core/src/plugins/meta.user/i18n/pt.php
@@ -26,5 +26,6 @@
 "5" => "Para Fazer",
 "6" => "Pessoal",
 "7" => "Trabalho",
-"8" => "Importante"
+"8" => "Importante",
+"9" => "No value",
 );
diff --git a/core/src/plugins/meta.user/i18n/si.php b/core/src/plugins/meta.user/i18n/si.php
@@ -28,5 +28,6 @@
 "5" => "Opravilo",
 "6" => "Osebno",
 "7" => "Služba",
-"8" => "Pomembno"
+"8" => "Pomembno",
+"9" => "No value",
 );
diff --git a/core/src/plugins/uploader.flex/i18n/conf/en.php b/core/src/plugins/uploader.flex/i18n/conf/en.php
@@ -19,7 +19,7 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 $mess=array(
-"Flash uploader" => "Flash uploader",
+"Flash uploader" => "Flash",
 "Legacy flash uploader, used when the browser does not support HTML5. If you want to force the usage of this uploader, deactivate the uploader.html, and remove the activeCondition tag from the uploader.flex manifest file." => "Legacy flash uploader, used when the browser does not support HTML5. If you want to force the usage of this uploader, deactivate the uploader.html, and remove the activeCondition tag from the uploader.flex manifest file.",
 "Miscalleneous" => "Miscalleneous",
 "HTTPS Policy" => "HTTPS Policy",

diff --git a/core/src/plugins/uploader.flex/i18n/conf/fr.php b/core/src/plugins/uploader.flex/i18n/conf/fr.php
@@ -19,7 +19,7 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 $mess=array(
-"Flash uploader" => "Uploader Flash",
+"Flash uploader" => "Flash",
 "Legacy flash uploader, used when the browser does not support HTML5. If you want to force the usage of this uploader, deactivate the uploader.html, and remove the activeCondition tag from the uploader.flex manifest file." => "Alternative à l'upload HTML5. Pour forcer l'utilisation de cet uploader, désactiver les autres, et commenter la partie activeCondition dans le manifest de ce plugin.",
 "Miscalleneous" => "Divers",
 "HTTPS Policy" => "HTTPS Policy",

diff --git a/core/src/plugins/uploader.html/i18n/conf/en.php b/core/src/plugins/uploader.html/i18n/conf/en.php
@@ -19,7 +19,7 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 $mess=array(
-"HTML Uploader" => "HTML Uploader",
+"HTML Uploader" => "Standard",
 "Auto-switching HTML5 or IFrame uploader." => "Auto-switching HTML5 or IFrame uploader.",
 "Default Behaviour" => "Default Behaviour",
 "Existing Files" => "Existing Files",

diff --git a/core/src/plugins/uploader.html/i18n/conf/fr.php b/core/src/plugins/uploader.html/i18n/conf/fr.php
@@ -19,7 +19,7 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 $mess=array(
-"HTML Uploader" => "Uploader HTML",
+"HTML Uploader" => "Standard",
 "Auto-switching HTML5 or IFrame uploader." => "Uploader HTML5 ou IFRAME.",
 "Default Behaviour" => "Comportement par défaut",
 "Existing Files" => "Fichiers existants",

diff --git a/core/src/plugins/uploader.jumploader/i18n/conf/en.php b/core/src/plugins/uploader.jumploader/i18n/conf/en.php
@@ -19,7 +19,7 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 $mess=array(
-"Jumploader" => "Jumploader",
+"Jumploader" => "Java (big files)",
 "Third-party JumpLoader JAVA applet allowing to upload folders, chunk big files, etc." => "Third-party JumpLoader JAVA applet allowing to upload folders, chunk big files, etc.",
 "Install Applet" => "Install Applet",
 );
diff --git a/core/src/plugins/uploader.jumploader/i18n/conf/fr.php b/core/src/plugins/uploader.jumploader/i18n/conf/fr.php
@@ -19,7 +19,7 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 $mess=array(
-"Jumploader" => "Jumploader",
+"Jumploader" => "Java (gros fichiers)",
 "Third-party JumpLoader JAVA applet allowing to upload folders, chunk big files, etc." => "Applet Java pour uploader de très gros fichiers",
 "Install Applet" => "Install Applet",
 );
diff --git a/core/src/plugins/uploader.plupload/manifest.xml b/core/src/plugins/uploader.plupload/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<uploader id="uploader.plupload" order="1" enabled="false" description="CONF_MESSAGE[PlUpload uploader support. Requires downloading and installing the PLupload sources.]" label="CONF_MESSAGE[PlUpload Support]" text="51" title="162" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+<uploader id="uploader.plupload" order="1" enabled="false" description="CONF_MESSAGE[PlUpload uploader support. Requires downloading and installing the PLupload sources.]" label="CONF_MESSAGE[PLUploader]" text="51" title="162" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <plugin_info>
         <core_relation packaged="true" tested_version="4.3"/>
         <plugin_author>lmanders</plugin_author>