Permalink
Browse files

Fix some details on search engine: toggle RecycleBin results visibili…

…ty, fix headers displayed when reloading list, fix results limit string, fix random sorting.
  • Loading branch information...
1 parent 8ea5725 commit ba92c0c27ff1230e2c27319e5939f111ac42926d @cdujeu cdujeu committed Sep 10, 2016
Showing with 279 additions and 293 deletions.
  1. +1 −1 core/src/plugins/access.fs/FsAccessDriver.php
  2. +2 −2 core/src/plugins/access.fs/fsActions.xml
  3. +3 −2 core/src/plugins/core.ajaxplorer/i18n/ca.php
  4. +20 −21 core/src/plugins/core.ajaxplorer/i18n/cs.php
  5. +2 −1 core/src/plugins/core.ajaxplorer/i18n/da.php
  6. +5 −4 core/src/plugins/core.ajaxplorer/i18n/de.php
  7. +2 −1 core/src/plugins/core.ajaxplorer/i18n/en.php
  8. +2 −1 core/src/plugins/core.ajaxplorer/i18n/es.php
  9. +7 −6 core/src/plugins/core.ajaxplorer/i18n/et.php
  10. +7 −6 core/src/plugins/core.ajaxplorer/i18n/eus.php
  11. +7 −6 core/src/plugins/core.ajaxplorer/i18n/fi.php
  12. +2 −1 core/src/plugins/core.ajaxplorer/i18n/fr.php
  13. +8 −7 core/src/plugins/core.ajaxplorer/i18n/gr.php
  14. +7 −6 core/src/plugins/core.ajaxplorer/i18n/he.php
  15. +7 −6 core/src/plugins/core.ajaxplorer/i18n/hu.php
  16. +2 −1 core/src/plugins/core.ajaxplorer/i18n/it.php
  17. +2 −1 core/src/plugins/core.ajaxplorer/i18n/ja.php
  18. +7 −6 core/src/plugins/core.ajaxplorer/i18n/kr.php
  19. +7 −6 core/src/plugins/core.ajaxplorer/i18n/nl.php
  20. +7 −6 core/src/plugins/core.ajaxplorer/i18n/no.php
  21. +7 −6 core/src/plugins/core.ajaxplorer/i18n/pl.php
  22. +2 −1 core/src/plugins/core.ajaxplorer/i18n/pt-br.php
  23. +7 −6 core/src/plugins/core.ajaxplorer/i18n/pt.php
  24. +27 −26 core/src/plugins/core.ajaxplorer/i18n/ru.php
  25. +7 −6 core/src/plugins/core.ajaxplorer/i18n/si.php
  26. +7 −6 core/src/plugins/core.ajaxplorer/i18n/sv.php
  27. +7 −6 core/src/plugins/core.ajaxplorer/i18n/tr.php
  28. +7 −6 core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
  29. +7 −6 core/src/plugins/core.ajaxplorer/i18n/zh.php
  30. +11 −4 core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
  31. +80 −126 core/src/plugins/gui.ajax/res/js/ui/prototype/class.SearchEngine.js
  32. +1 −1 core/src/plugins/gui.ajax/res/themes/orbit/css/components/searchengine.less
  33. +2 −2 core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
@@ -1362,7 +1362,7 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
$metaData = [];
if (RecycleBinManager::recycleEnabled() && $dir == "") {
- $metaData["repo_has_recycle"] = "true";
+ $metaData["repo_has_recycle"] = RecycleBinManager::getRelativeRecycle();
}
$parentAjxpNode = new AJXP_Node($nonPatchedPath, $metaData);
$parentAjxpNode->loadNodeInfo(false, true, ($lsOptions["l"]?"all":"minimal"));
@@ -834,8 +834,8 @@
<clientCallback prepareModal="true"><![CDATA[
var onLoad = function(oForm){
var message = MessageHash[177];
- var repoHasRecycle = ajaxplorer.getContextHolder().getRootNode().getMetadata().get("repo_has_recycle");
- if(repoHasRecycle && repoHasRecycle == "true" && ajaxplorer.getContextNode().getAjxpMime() != "ajxp_recycle"){
+ var repoHasRecycle = pydio.getContextHolder().getRootNode().getMetadata().get("repo_has_recycle");
+ if(repoHasRecycle && pydio.getContextNode().getAjxpMime() != "ajxp_recycle"){
message = MessageHash[176];
}
$(oForm).getElementsBySelector('span[id="delete_message"]')[0].innerHTML = message;
@@ -593,7 +593,6 @@
"534" => "Contrasenya emprada per acceder",
"535" => "Enviar contrasenya per correu electrònic",
"536" => "Enviar un correu electrònic de benvinguda incloent la contrasenya per al nou usuari",
-
"plugtype.title.access" => "Drivers de repositori",
"plugtype.desc.access" => "Plugins que defineixen com un repositori accedirà tant al seu back-end (sistema d'arxius o similar) i a les principals accions y dissenys.",
"plugtype.title.action" => "Plugins d'acció",
@@ -653,4 +652,6 @@
"551" => "Reject",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
-);
+"554" => "%s result(s) in Recycle Bin",
+
+);
@@ -1,23 +1,23 @@
<?php
/*
- * Copyright 2007-2014 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio. If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
+* Copyright 2007-2014 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+* This file is part of Pydio.
+*
+* Pydio is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Pydio is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
+*
+* The latest code can be found at <http://pyd.io/>.
+*/
$mess=array(
"languageLabel" => "Čeština",
"date_intl_locale" => "cs_CZ",
@@ -257,7 +257,6 @@
"204" => "Velikost souboru \"",
"205" => "\" překračuje povolený limit (",
"206" => "Mb).\\nSoubor nebude nahrán.",
-/* END SENTENCE */
"207" => "Nemáte právo zápisu na tento adresář",
"208" => "Nemáte právo čtení z tohoto adresáře",
"209" => "Vnitřní chyba serveru, kontaktujte prosím svého administrátora!",
@@ -433,7 +432,6 @@
"375" => "Varování: nebyli jste aktivní více než __IDLE__, budete odhlášeni za __LOGOUT__",
"376" => "Klikněte kamkoliv pro aktivaci",
"378" => "Varování: heslo je prázdné nebo příliš krátké!",
-/* password strength tester */
"379" => "Nespolehlivé slovo!",
"380" => "Příliš krátké",
"381" => "Velmi slabé",
@@ -651,4 +649,5 @@
"551" => "Reject",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
-);
+"554" => "%s result(s) in Recycle Bin",
+);
@@ -654,5 +654,6 @@
"551" => "Reject",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -24,7 +24,7 @@
* + update: Axel Otterstätter <axel.otterstaetter@googlemail.com>
* + update: Stefan Huber <sh@signalwerk.ch>
* + update: Martin Schaible <martin@martinschaible.ch>
-*******************************************************************************/
+*******************************************************************************/
$mess=array(
"languageLabel" => "Deutsch",
"date_intl_locale" => "de_DE",
@@ -264,7 +264,6 @@
"204" => "Die Datei \"",
"205" => "\" ist größer als die maximal erlaubte Dateigröße (",
"206" => "Mb).\\nDie Datei konnte nicht hochgeladen werden.",
-/* END SENTENCE */
"207" => "Sie haben keine Schreibrechte in diesem Ordner",
"208" => "Sie haben keine Leserechte in diesem Ordner",
"209" => "Ein interner Serverfehler ist aufgetreten. Wenden Sie sich bitte an den Systemadministrator!",
@@ -440,7 +439,6 @@
"375" => "Achtung, Inaktivität seit mehr als __IDLE__. Ein automatischer Logout erfolgt in __LOGOUT__.",
"376" => "Zum Zurücksetzen irgendwo klicken",
"378" => "Achtung! Sie haben entweder ein leeres oder ein zu kurzes Passwort eingegeben!",
-/* password strength tester */
"379" => "Unsicheres Passwort!",
"380" => "Zu kurz",
"381" => "Sehr unsicher",
@@ -658,4 +656,7 @@
"551" => "Ablehnen",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
-);
+"554" => "%s result(s) in Recycle Bin",
+/* END SENTENCE */
+/* password strength tester */
+);
@@ -650,5 +650,6 @@
"550" => "Reject this share",
"551" => "Reject",
"552" => "Please provide password.",
-"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!"
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
);
@@ -656,4 +656,5 @@
"551" => "Reject",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
-);
+"554" => "%s result(s) in Recycle Bin",
+);
@@ -647,10 +647,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -645,10 +645,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -647,10 +647,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -650,6 +650,7 @@
"550" => "Rejeter ce partage",
"551" => "Rejeter",
"552" => "Please provide a password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!"
+ "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+ "554" => "%s résultat(s) dans la Corbeille",
/* END SENTENCE */
);
@@ -644,10 +644,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
- /* END SENTENCE */
-);
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+/* END SENTENCE */
+);
@@ -644,10 +644,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -649,10 +649,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -669,5 +669,6 @@
"551" => "Reject",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -654,6 +654,7 @@
"551" => "Reject",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* 文章はここまで */
/* 文章終了 */
-);
+);
@@ -653,10 +653,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -650,10 +650,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -648,10 +648,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -644,10 +644,11 @@
"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
"547" => "Accept",
"548" => "Decline",
- "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
- "550" => "Reject this share",
- "551" => "Reject",
- "552" => "Please provide password.",
- "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
@@ -653,5 +653,6 @@
"551" => "Reject",
"552" => "Please provide password.",
"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
/* END SENTENCE */
-);
+);
Oops, something went wrong.

0 comments on commit ba92c0c

Please sign in to comment.