Fix #1128 : add the ability to reject a previously accepted share.

pydio · Apr 6, 2016 · fe99a69 · fe99a69
1 parent d0521d0
commit fe99a69
Show file tree

Hide file tree

Showing 32 changed files with 153 additions and 41 deletions.
diff --git a/core/src/plugins/access.ajxp_home/res/home.css b/core/src/plugins/access.ajxp_home/res/home.css
@@ -131,6 +131,12 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+#home_account_pane #home_left_bar #workspaces_center .workspaces .workspace-entry .workspace-additional-action {
+  float: right;
+  margin-top: -40px;
+  padding: 12px;
+  border-radius: 50%;
+}
 #home_account_pane #home_left_bar #workspaces_center .workspaces .workspace-entry.ws_selector_title h3 {
   font-size: 13px;
   font-weight: 500;

diff --git a/core/src/plugins/access.ajxp_home/res/home.less b/core/src/plugins/access.ajxp_home/res/home.less
@@ -136,6 +136,13 @@
             text-overflow: ellipsis;
           }
 
+          .workspace-additional-action {
+            float: right;
+            margin-top: -40px;
+            padding: 12px;
+            border-radius: 50%;
+          }
+
           &.ws_selector_title{
             h3{
               font-size: 13px;

diff --git a/core/src/plugins/core.ajaxplorer/i18n/ca.php b/core/src/plugins/core.ajaxplorer/i18n/ca.php
@@ -643,5 +643,8 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/cs.php b/core/src/plugins/core.ajaxplorer/i18n/cs.php
@@ -641,5 +641,8 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/da.php b/core/src/plugins/core.ajaxplorer/i18n/da.php
@@ -644,6 +644,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/de.php b/core/src/plugins/core.ajaxplorer/i18n/de.php
@@ -648,5 +648,8 @@
 "545" => "Freigabe von entferntem System",
 "546" => "Dieses Element wurde von %%OWNER%% für Sie von einem entfernten System freigegeben. Möchten sie fortfahren?",
 "547" => "Akzeptieren",
-"548" => "Ablehnen"
+"548" => "Ablehnen",
+"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",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/en.php b/core/src/plugins/core.ajaxplorer/i18n/en.php
@@ -638,8 +638,11 @@
 "542" => "Upload error: a PHP extension stopped the upload process.",
 "543" => "Results limited to 100 out of %s.",
 "544" => "Show All",
-"545" => "Remote Share Dialog",
+"545" => "Remote Share",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 ); 
diff --git a/core/src/plugins/core.ajaxplorer/i18n/es.php b/core/src/plugins/core.ajaxplorer/i18n/es.php
@@ -646,5 +646,8 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/et.php b/core/src/plugins/core.ajaxplorer/i18n/et.php
@@ -642,6 +642,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/eus.php b/core/src/plugins/core.ajaxplorer/i18n/eus.php
@@ -640,6 +640,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/fi.php b/core/src/plugins/core.ajaxplorer/i18n/fi.php
@@ -642,6 +642,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/fr.php b/core/src/plugins/core.ajaxplorer/i18n/fr.php
@@ -639,8 +639,11 @@
 "543" => "Résultats limités au 100 premiers sur %s.",
 "544" => "Voir tout",
 "545" => "Partage à distance",
-"546" => "Cet item provient de %%OWNER%% d'un système distant. Souhaîtez-vous continuer ?",
+"546" => "Ce partage provient de %%OWNER%% d'un système distant. Souhaîtez-vous continuer ?",
 "547" => "Accepter",
-"548" => "Refuser"
+"548" => "Refuser",
+    "549" => "Vaous avez précedemment accepté ce partage depuis un système distant (par %%OWNER%%). Désirez-vous le rejeter désormais?",
+    "550" => "Rejeter ce partage",
+    "551" => "Rejeter",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/gr.php b/core/src/plugins/core.ajaxplorer/i18n/gr.php
@@ -639,6 +639,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
     /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/he.php b/core/src/plugins/core.ajaxplorer/i18n/he.php
@@ -639,6 +639,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/hu.php b/core/src/plugins/core.ajaxplorer/i18n/hu.php
@@ -644,6 +644,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/it.php b/core/src/plugins/core.ajaxplorer/i18n/it.php
@@ -659,6 +659,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/kr.php b/core/src/plugins/core.ajaxplorer/i18n/kr.php
@@ -648,6 +648,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/nl.php b/core/src/plugins/core.ajaxplorer/i18n/nl.php
@@ -645,6 +645,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/no.php b/core/src/plugins/core.ajaxplorer/i18n/no.php
@@ -643,6 +643,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pl.php b/core/src/plugins/core.ajaxplorer/i18n/pl.php
@@ -639,6 +639,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pt-br.php b/core/src/plugins/core.ajaxplorer/i18n/pt-br.php
@@ -643,6 +643,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pt.php b/core/src/plugins/core.ajaxplorer/i18n/pt.php
@@ -639,7 +639,10 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 /* password strength tester */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/ru.php b/core/src/plugins/core.ajaxplorer/i18n/ru.php
@@ -641,5 +641,8 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/si.php b/core/src/plugins/core.ajaxplorer/i18n/si.php
@@ -640,6 +640,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/sv.php b/core/src/plugins/core.ajaxplorer/i18n/sv.php
@@ -639,6 +639,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/tr.php b/core/src/plugins/core.ajaxplorer/i18n/tr.php
@@ -642,6 +642,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php b/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
@@ -642,6 +642,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/zh.php b/core/src/plugins/core.ajaxplorer/i18n/zh.php
@@ -651,6 +651,9 @@
 "545" => "Remote Share Dialog",
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
-"548" => "Decline"
+"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",
 /* END SENTENCE */
 );