Utilisation du workflow directement dans le listing des dossiers.

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index fa2a7df82e3d8a1e2dd80f018bc9cc2e40c3ca3c..c776485649fe7a4db9cfe6d1647b806db8128a8d 100644 (file)
Binary files a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo and b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo differ

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
index 18ef7b0cc7fcd3178270658f99043121f091f2a5..999c12a666ad6be8aeadda31b63ef596b647e447 100644 (file)
--- a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"

-"POT-Creation-Date: Mon Dec 15 15:35:05 2014\n"
-"PO-Revision-Date: 2014-12-15 15:41+0100\n"
+"POT-Creation-Date: Sat Feb 21 01:11:05 2015\n"
+"PO-Revision-Date: 2015-02-21 00:35+0100\n"

 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "Language: \n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "Language: \n"


@@ -218,7 +218,7 @@ msgid " Change and View "
 msgstr " Change and View "
 
 #: n/skins/content/folder_factories.pt:18
 msgstr " Change and View "
 
 #: n/skins/content/folder_factories.pt:18

-#: n/skins/custom_generic/folder_contents.py:103
+#: n/skins/custom_generic/folder_contents.py:104

 #: n/skins/custom_generic/personalize_form.pt:27
 #: n/skins/generic/gruf_macros.pt:256 n/skins/generic/gruf_macros.pt:378
 #: n/skins/generic/last_member_logs.pt:23
 #: n/skins/custom_generic/personalize_form.pt:27
 #: n/skins/generic/gruf_macros.pt:256 n/skins/generic/gruf_macros.pt:378
 #: n/skins/generic/last_member_logs.pt:23


@@ -525,16 +525,20 @@ msgstr "%d item moved to top.%d items moved to top."
 msgid "%d item moved up.%d items moved up."
 msgstr "%d item moved up.%d items moved up."
 
 msgid "%d item moved up.%d items moved up."
 msgstr "%d item moved up.%d items moved up."
 

-#: n/skins/custom_generic/folder_contents.py:99
+#: n/skins/custom_generic/folder_contents.py:100

 #: n/skins/photo_theme/search_results_macros.pt:14
 msgid "Type"
 msgstr "Type"
 
 #: n/skins/photo_theme/search_results_macros.pt:14
 msgid "Type"
 msgstr "Type"
 

-#: n/skins/custom_generic/folder_contents.py:107
+#: n/skins/custom_generic/folder_contents.py:108

 msgid "Last Modified"
 msgstr "Last Modified"
 
 msgid "Last Modified"
 msgstr "Last Modified"
 

-#: n/skins/custom_generic/folder_contents.py:117
+#: n/skins/custom_generic/folder_contents.py:112
+msgid "State"
+msgstr "State"
+
+#: n/skins/custom_generic/folder_contents.py:122

 msgid "Set Sorting as Default"
 msgstr "Set Sorting as Default"
 
 msgid "Set Sorting as Default"
 msgstr "Set Sorting as Default"
 


@@ -1199,30 +1203,6 @@ msgstr "Next"
 msgid "byline"
 msgstr "modified on ${date} at ${time} – creator: ${creator}"
 
 msgid "byline"
 msgstr "modified on ${date} at ${time} – creator: ${creator}"
 

-#: n/skins/generic/content_depublish_form.pt:8
-msgid "Depublish: \"${docTitle}\""
-msgstr "Depublish: \"${docTitle}\""
-
-#: n/skins/generic/content_depublish_form.pt:10
-msgid "depublish_transition_explanations"
-msgstr ""
-
-#: n/skins/generic/content_depublish_form.pt:15
-msgid "Select the destination state"
-msgstr "Select the destination state"
-
-#: n/skins/generic/content_depublish_form.pt:18
-msgid "Private"
-msgstr "Private"
-
-#: n/skins/generic/content_depublish_form.pt:22
-msgid "Shared"
-msgstr "Shared"
-
-#: n/skins/generic/content_depublish_form.pt:26
-msgid "Depublish"
-msgstr "Depublish"
-

 #: n/skins/generic/content_make_private_form.pt:10
 msgid "Make private: \"${docTitle}\""
 msgstr "Make private: \"${docTitle}\""
 #: n/skins/generic/content_make_private_form.pt:10
 msgid "Make private: \"${docTitle}\""
 msgstr "Make private: \"${docTitle}\""


@@ -1233,6 +1213,7 @@ msgid "make_private_transition_explanations"
 msgstr ""
 
 #: n/skins/generic/content_make_private_form.pt:16
 msgstr ""
 
 #: n/skins/generic/content_make_private_form.pt:16

+#: n/skins/generic/content_reject_form.pt:25

 msgid "Make private"
 msgstr "Make private"
 
 msgid "Make private"
 msgstr "Make private"
 


@@ -1254,18 +1235,13 @@ msgid "Publish"
 msgstr "Publish"
 
 #: n/skins/generic/content_reject_form.pt:8
 msgstr "Publish"
 
 #: n/skins/generic/content_reject_form.pt:8

-msgid "Reject: \"${objectid}\""
-msgstr "Reject: \"${objectid}\""
+msgid "Make private: \"${objectid}\""
+msgstr "Make private: \"${objectid}\""

 
 #: n/skins/generic/content_reject_form.pt:9
 
 #: n/skins/generic/content_reject_form.pt:9

-msgid "reject_transition_explanations"
+msgid "Make this item private to disable public access"

 msgstr ""
 
 msgstr ""
 

-#: n/skins/generic/content_reject_form.pt:25
-#: n/skins/generic/pending_members.pt:30
-msgid "Reject"
-msgstr "Reject"
-

 #: n/skins/generic/content_retract_form.pt:8
 msgid "Retract: \"${objectid}\""
 msgstr "Retract: \"${objectid}\""
 #: n/skins/generic/content_retract_form.pt:8
 msgid "Retract: \"${objectid}\""
 msgstr "Retract: \"${objectid}\""


@@ -1644,6 +1620,10 @@ msgstr "Review members registration"
 msgid "Email"
 msgstr "Email"
 
 msgid "Email"
 msgstr "Email"
 

+#: n/skins/generic/pending_members.pt:30
+msgid "Reject"
+msgstr "Reject"
+

 #: n/skins/generic/pending_members.pt:35
 msgid "Register"
 msgstr "Register"
 #: n/skins/generic/pending_members.pt:35
 msgid "Register"
 msgstr "Register"


@@ -2015,6 +1995,10 @@ msgstr "(no email sent)"
 msgid "This item has not had any status changes."
 msgstr "This item has not had any status changes."
 
 msgid "This item has not had any status changes."
 msgstr "This item has not had any status changes."
 

+#: n/skins/generic/wf_redirect.py:12
+msgid "You are not allowed to change this content state."
+msgstr "You are not allowed to change this content state."
+

 #: n/skins/generic/widgets.pt:32 n/skins/generic/widgets.pt:33
 msgid "Edit metadata"
 msgstr "Edit metadata"
 #: n/skins/generic/widgets.pt:32 n/skins/generic/widgets.pt:33
 msgid "Edit metadata"
 msgstr "Edit metadata"


@@ -2937,6 +2921,24 @@ msgstr "Directory"
 msgid "Configure portal"
 msgstr "Configure portal"
 
 msgid "Configure portal"
 msgstr "Configure portal"
 

+#~ msgid "Depublish: \"${docTitle}\""
+#~ msgstr "Depublish: \"${docTitle}\""
+
+#~ msgid "Select the destination state"
+#~ msgstr "Select the destination state"
+
+#~ msgid "Private"
+#~ msgstr "Private"
+
+#~ msgid "Shared"
+#~ msgstr "Shared"
+
+#~ msgid "Depublish"
+#~ msgstr "Depublish"
+
+#~ msgid "Reject: \"${objectid}\""
+#~ msgstr "Reject: \"${objectid}\""
+

 #~ msgid "Configure Solr delegated indexes"
 #~ msgstr "Configure Solr delegated indexes"
 
 #~ msgid "Configure Solr delegated indexes"
 #~ msgstr "Configure Solr delegated indexes"
 

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index c99b2ea96e41425bc5e163f782387c6bfc700577..e1f30bcfc3348fe13e571b6a397dff4b876f4d10 100644 (file)
Binary files a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo and b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo differ

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index a6f708973e14a84b6952fcd9610d3a38f42e91fd..7e46c9a4b8200afc95381b0545e0bbe2988b65ca 100644 (file)
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -211,7 +211,7 @@ msgid " Change and View "
 msgstr " Changer et voir "
 
 #: n/skins/content/folder_factories.pt:18
 msgstr " Changer et voir "
 
 #: n/skins/content/folder_factories.pt:18

-#: n/skins/custom_generic/folder_contents.py:103
+#: n/skins/custom_generic/folder_contents.py:104

 #: n/skins/custom_generic/personalize_form.pt:27
 #: n/skins/generic/gruf_macros.pt:256 n/skins/generic/gruf_macros.pt:378
 #: n/skins/generic/last_member_logs.pt:23
 #: n/skins/custom_generic/personalize_form.pt:27
 #: n/skins/generic/gruf_macros.pt:256 n/skins/generic/gruf_macros.pt:378
 #: n/skins/generic/last_member_logs.pt:23


@@ -518,16 +518,20 @@ msgstr "%d élément déplacé en haut.%d éléments déplacés en haut."
 msgid "%d item moved up.%d items moved up."
 msgstr "%d élément déplacé vers le haut.%d éléments déplacés vers le haut."
 
 msgid "%d item moved up.%d items moved up."
 msgstr "%d élément déplacé vers le haut.%d éléments déplacés vers le haut."
 

-#: n/skins/custom_generic/folder_contents.py:99
+#: n/skins/custom_generic/folder_contents.py:100

 #: n/skins/photo_theme/search_results_macros.pt:14
 msgid "Type"
 msgstr "Type"
 
 #: n/skins/photo_theme/search_results_macros.pt:14
 msgid "Type"
 msgstr "Type"
 

-#: n/skins/custom_generic/folder_contents.py:107
+#: n/skins/custom_generic/folder_contents.py:108

 msgid "Last Modified"
 msgstr "Modifié le"
 
 msgid "Last Modified"
 msgstr "Modifié le"
 

-#: n/skins/custom_generic/folder_contents.py:117
+#: n/skins/custom_generic/folder_contents.py:112
+msgid "State"
+msgstr "État"
+
+#: n/skins/custom_generic/folder_contents.py:122

 msgid "Set Sorting as Default"
 msgstr "Définir comme tri par défaut"
 
 msgid "Set Sorting as Default"
 msgstr "Définir comme tri par défaut"
 


@@ -1202,33 +1206,6 @@ msgstr "Suivant"
 msgid "byline"
 msgstr "modifié le ${date} à ${time} – créateur : ${creator}"
 
 msgid "byline"
 msgstr "modifié le ${date} à ${time} – créateur : ${creator}"
 

-#: n/skins/generic/content_depublish_form.pt:8
-msgid "Depublish: \"${docTitle}\""
-msgstr "Dépublier : « ${docTitle} »"
-
-#: n/skins/generic/content_depublish_form.pt:10
-msgid "depublish_transition_explanations"
-msgstr ""
-"La dépublication de ce document annulera son partage entre tout les membres "
-"du site et permettra à son créateur de le modifier à nouveau. Vous devez "
-"choisir quel sera l'état de destination pour effectuer l'opération."
-
-#: n/skins/generic/content_depublish_form.pt:15
-msgid "Select the destination state"
-msgstr "Sélectionnez l'état de destination"
-
-#: n/skins/generic/content_depublish_form.pt:18
-msgid "Private"
-msgstr "Privé"
-
-#: n/skins/generic/content_depublish_form.pt:22
-msgid "Shared"
-msgstr "Partagé"
-
-#: n/skins/generic/content_depublish_form.pt:26
-msgid "Depublish"
-msgstr "Dépublier"
-

 #: n/skins/generic/content_make_private_form.pt:10
 msgid "Make private: \"${docTitle}\""
 msgstr "Rendre privé : « ${docTitle} »"
 #: n/skins/generic/content_make_private_form.pt:10
 msgid "Make private: \"${docTitle}\""
 msgstr "Rendre privé : « ${docTitle} »"


@@ -1241,6 +1218,7 @@ msgstr ""
 "même ainsi que les coordonnateurs."
 
 #: n/skins/generic/content_make_private_form.pt:16
 "même ainsi que les coordonnateurs."
 
 #: n/skins/generic/content_make_private_form.pt:16

+#: n/skins/generic/content_reject_form.pt:25

 msgid "Make private"
 msgstr "Rendre privé"
 
 msgid "Make private"
 msgstr "Rendre privé"
 


@@ -1264,19 +1242,12 @@ msgid "Publish"
 msgstr "Publier"
 
 #: n/skins/generic/content_reject_form.pt:8
 msgstr "Publier"
 
 #: n/skins/generic/content_reject_form.pt:8

-msgid "Reject: \"${objectid}\""
-msgstr "Rejeter : « ${objectid} »"
+msgid "Make private: \"${objectid}\""
+msgstr "Rendre privé : « ${objectid} »"

 
 #: n/skins/generic/content_reject_form.pt:9
 
 #: n/skins/generic/content_reject_form.pt:9

-msgid "reject_transition_explanations"
-msgstr ""
-"Rejeter la publication de ce document pour que son propriétaire puisse "
-"continuer à travailler."
-
-#: n/skins/generic/content_reject_form.pt:25
-#: n/skins/generic/pending_members.pt:30
-msgid "Reject"
-msgstr "Rejeter"
+msgid "Make this item private to disable public access"
+msgstr "Rendre cet élément privé pour désactiver l'accès public."

 
 #: n/skins/generic/content_retract_form.pt:8
 msgid "Retract: \"${objectid}\""
 
 #: n/skins/generic/content_retract_form.pt:8
 msgid "Retract: \"${objectid}\""


@@ -1663,6 +1634,10 @@ msgstr "Modérer l'inscription des membres"
 msgid "Email"
 msgstr "E-mail"
 
 msgid "Email"
 msgstr "E-mail"
 

+#: n/skins/generic/pending_members.pt:30
+msgid "Reject"
+msgstr "Rejeter"
+

 #: n/skins/generic/pending_members.pt:35
 msgid "Register"
 msgstr "Inscrire"
 #: n/skins/generic/pending_members.pt:35
 msgid "Register"
 msgstr "Inscrire"


@@ -2044,6 +2019,10 @@ msgstr "(pas d'e-mail envoyé)"
 msgid "This item has not had any status changes."
 msgstr "Cet élément n'a pas encore eu de changement d'état."
 
 msgid "This item has not had any status changes."
 msgstr "Cet élément n'a pas encore eu de changement d'état."
 

+#: n/skins/generic/wf_redirect.py:12
+msgid "You are not allowed to change this content state."
+msgstr "Vous n'êtes pas autorisé à changer l'état de ce contenu."
+

 #: n/skins/generic/widgets.pt:32 n/skins/generic/widgets.pt:33
 msgid "Edit metadata"
 msgstr "Éditer les métadonnées"
 #: n/skins/generic/widgets.pt:32 n/skins/generic/widgets.pt:33
 msgid "Edit metadata"
 msgstr "Éditer les métadonnées"


@@ -2971,6 +2950,36 @@ msgstr "Annuaire"
 msgid "Configure portal"
 msgstr "Configurer portail"
 
 msgid "Configure portal"
 msgstr "Configurer portail"
 

+#~ msgid "Depublish: \"${docTitle}\""
+#~ msgstr "Dépublier : « ${docTitle} »"
+
+#~ msgid "depublish_transition_explanations"
+#~ msgstr ""
+#~ "La dépublication de ce document annulera son partage entre tout les "
+#~ "membres du site et permettra à son créateur de le modifier à nouveau. "
+#~ "Vous devez choisir quel sera l'état de destination pour effectuer "
+#~ "l'opération."
+
+#~ msgid "Select the destination state"
+#~ msgstr "Sélectionnez l'état de destination"
+
+#~ msgid "Private"
+#~ msgstr "Privé"
+
+#~ msgid "Shared"
+#~ msgstr "Partagé"
+
+#~ msgid "Depublish"
+#~ msgstr "Dépublier"
+
+#~ msgid "Reject: \"${objectid}\""
+#~ msgstr "Rejeter : « ${objectid} »"
+
+#~ msgid "reject_transition_explanations"
+#~ msgstr ""
+#~ "Rejeter la publication de ce document pour que son propriétaire puisse "
+#~ "continuer à travailler."
+

 #~ msgid "Configure Solr delegated indexes"
 #~ msgstr "Configurer les index délégués à Solr"
 
 #~ msgid "Configure Solr delegated indexes"
 #~ msgstr "Configurer les index délégués à Solr"
 

diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot
index f288f5aa1feaa4292028e6864fefa18a56860772..7b88fdc1f349d30e2969485784663d59b4b388d4 100644 (file)
--- a/Products/Plinn/locales/plinn.pot
+++ b/Products/Plinn/locales/plinn.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"

-"POT-Creation-Date: Mon Dec 15 15:39:47 2014\n"
+"POT-Creation-Date: Sat Feb 21 01:11:05 2015\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"


@@ -217,7 +217,7 @@ msgid " Change and View "
 msgstr ""
 
 #: n/skins/content/folder_factories.pt:18
 msgstr ""
 
 #: n/skins/content/folder_factories.pt:18

-#: n/skins/custom_generic/folder_contents.py:103
+#: n/skins/custom_generic/folder_contents.py:104

 #: n/skins/custom_generic/personalize_form.pt:27
 #: n/skins/generic/gruf_macros.pt:256
 #: n/skins/generic/gruf_macros.pt:378
 #: n/skins/custom_generic/personalize_form.pt:27
 #: n/skins/generic/gruf_macros.pt:256
 #: n/skins/generic/gruf_macros.pt:378


@@ -524,16 +524,20 @@ msgstr ""
 msgid "%d item moved up.%d items moved up."
 msgstr ""
 
 msgid "%d item moved up.%d items moved up."
 msgstr ""
 

-#: n/skins/custom_generic/folder_contents.py:99
+#: n/skins/custom_generic/folder_contents.py:100

 #: n/skins/photo_theme/search_results_macros.pt:14
 msgid "Type"
 msgstr ""
 
 #: n/skins/photo_theme/search_results_macros.pt:14
 msgid "Type"
 msgstr ""
 

-#: n/skins/custom_generic/folder_contents.py:107
+#: n/skins/custom_generic/folder_contents.py:108

 msgid "Last Modified"
 msgstr ""
 
 msgid "Last Modified"
 msgstr ""
 

-#: n/skins/custom_generic/folder_contents.py:117
+#: n/skins/custom_generic/folder_contents.py:112
+msgid "State"
+msgstr ""
+
+#: n/skins/custom_generic/folder_contents.py:122

 msgid "Set Sorting as Default"
 msgstr ""
 
 msgid "Set Sorting as Default"
 msgstr ""
 


@@ -1097,30 +1101,6 @@ msgstr ""
 msgid "byline"
 msgstr ""
 
 msgid "byline"
 msgstr ""
 

-#: n/skins/generic/content_depublish_form.pt:8
-msgid "Depublish: \"${docTitle}\""
-msgstr ""
-
-#: n/skins/generic/content_depublish_form.pt:10
-msgid "depublish_transition_explanations"
-msgstr ""
-
-#: n/skins/generic/content_depublish_form.pt:15
-msgid "Select the destination state"
-msgstr ""
-
-#: n/skins/generic/content_depublish_form.pt:18
-msgid "Private"
-msgstr ""
-
-#: n/skins/generic/content_depublish_form.pt:22
-msgid "Shared"
-msgstr ""
-
-#: n/skins/generic/content_depublish_form.pt:26
-msgid "Depublish"
-msgstr ""
-

 #: n/skins/generic/content_make_private_form.pt:10
 msgid "Make private: \"${docTitle}\""
 msgstr ""
 #: n/skins/generic/content_make_private_form.pt:10
 msgid "Make private: \"${docTitle}\""
 msgstr ""


@@ -1131,6 +1111,7 @@ msgid "make_private_transition_explanations"
 msgstr ""
 
 #: n/skins/generic/content_make_private_form.pt:16
 msgstr ""
 
 #: n/skins/generic/content_make_private_form.pt:16

+#: n/skins/generic/content_reject_form.pt:25

 msgid "Make private"
 msgstr ""
 
 msgid "Make private"
 msgstr ""
 


@@ -1152,16 +1133,11 @@ msgid "Publish"
 msgstr ""
 
 #: n/skins/generic/content_reject_form.pt:8
 msgstr ""
 
 #: n/skins/generic/content_reject_form.pt:8

-msgid "Reject: \"${objectid}\""
+msgid "Make private: \"${objectid}\""

 msgstr ""
 
 #: n/skins/generic/content_reject_form.pt:9
 msgstr ""
 
 #: n/skins/generic/content_reject_form.pt:9

-msgid "reject_transition_explanations"
-msgstr ""
-
-#: n/skins/generic/content_reject_form.pt:25
-#: n/skins/generic/pending_members.pt:30
-msgid "Reject"
+msgid "Make this item private to disable public access"

 msgstr ""
 
 #: n/skins/generic/content_retract_form.pt:8
 msgstr ""
 
 #: n/skins/generic/content_retract_form.pt:8


@@ -1541,6 +1517,10 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
 msgid "Email"
 msgstr ""
 

+#: n/skins/generic/pending_members.pt:30
+msgid "Reject"
+msgstr ""
+

 #: n/skins/generic/pending_members.pt:35
 msgid "Register"
 msgstr ""
 #: n/skins/generic/pending_members.pt:35
 msgid "Register"
 msgstr ""


@@ -1864,6 +1844,10 @@ msgstr ""
 msgid "This item has not had any status changes."
 msgstr ""
 
 msgid "This item has not had any status changes."
 msgstr ""
 

+#: n/skins/generic/wf_redirect.py:12
+msgid "You are not allowed to change this content state."
+msgstr ""
+

 #: n/skins/generic/widgets.pt:32
 #: n/skins/generic/widgets.pt:33
 msgid "Edit metadata"
 #: n/skins/generic/widgets.pt:32
 #: n/skins/generic/widgets.pt:33
 msgid "Edit metadata"

diff --git a/Products/Plinn/skins/control/content_status_modify.py b/Products/Plinn/skins/control/content_status_modify.py
index b8818d0a640c8e13cd0c765b0c1025085165db32..66361fe3b337f115248fd557250e0d4c1b1a4ae1 100644 (file)
--- a/Products/Plinn/skins/control/content_status_modify.py
+++ b/Products/Plinn/skins/control/content_status_modify.py
@@ -14,7 +14,7 @@ if REQUEST :
        kw.update(REQUEST.form)
        
 try :
        kw.update(REQUEST.form)
        
 try :

-       target = context.getActionInfo('object/history')['url']
+       target = context.getParentNode().getActionInfo('object/view')['url']

 except ValueError :
        target = context.getActionInfo('object/view')['url']
 
 except ValueError :
        target = context.getActionInfo('object/view')['url']
 

diff --git a/Products/Plinn/skins/custom_generic/folder_contents.py b/Products/Plinn/skins/custom_generic/folder_contents.py
index d4737f4518b42ca124c08a19bd07983e4502c931..e2d1764027b5772507446e3e561b463f368390dc 100755 (executable)
--- a/Products/Plinn/skins/custom_generic/folder_contents.py
+++ b/Products/Plinn/skins/custom_generic/folder_contents.py
@@ -11,7 +11,8 @@ from Products.CMFDefault.permissions import ListFolderContents
 from Products.CMFDefault.permissions import ManageProperties
 from Products.CMFDefault.permissions import ViewManagementScreens
 from Products.CMFDefault.permissions import ModifyPortalContent
 from Products.CMFDefault.permissions import ManageProperties
 from Products.CMFDefault.permissions import ViewManagementScreens
 from Products.CMFDefault.permissions import ModifyPortalContent

-from Products.CMFDefault.utils import html_marshal, Message as _
+from Products.CMFDefault.utils import html_marshal#, Message as _
+from Products.Plinn.utils import Message as _

 
 mtool = getToolByName(script, 'portal_membership')
 checkPermission = mtool.checkPermission
 
 mtool = getToolByName(script, 'portal_membership')
 checkPermission = mtool.checkPermission


@@ -107,6 +108,10 @@ columns = ( {'key': 'Type',
              'title': _('Last Modified'),
              'width': None,
              'colspan': None}
              'title': _('Last Modified'),
              'width': None,
              'colspan': None}

+            , {'key': 'review_state',
+             'title': _('State'),
+             'width': None,
+             'colspan': None}

             )
 
 for column in columns:  
             )
 
 for column in columns:  


@@ -166,6 +171,7 @@ for item in batch_obj:
          'modified': item.modified.strftime(locale_date_fmt),
          'title_or_id': item.Title or item_id,
          'type': item.Type or None,
          'modified': item.modified.strftime(locale_date_fmt),
          'title_or_id': item.Title or item_id,
          'type': item.Type or None,

+                'state': item.review_state,

          'url': item_url } )
 
 options['batch'] = { 'listColumnInfos': tuple(columns),
          'url': item_url } )
 
 options['batch'] = { 'listColumnInfos': tuple(columns),

diff --git a/Products/Plinn/skins/generic/content_publish_form.pt b/Products/Plinn/skins/generic/content_publish_form.pt
index 4abe8fb26889e12a37a28c6db494b4ddfed9e953..46bc8eac27e6eaf4d2e72ad3a7b644c7b354f614 100644 (file)
--- a/Products/Plinn/skins/generic/content_publish_form.pt
+++ b/Products/Plinn/skins/generic/content_publish_form.pt
@@ -17,7 +17,7 @@
         <legend i18n:translate="">Notify by e-mail</legend>
         <div tal:repeat="member creators" tal:omit-tag="">
           <label>
         <legend i18n:translate="">Notify by e-mail</legend>
         <div tal:repeat="member creators" tal:omit-tag="">
           <label>

-            <input type="checkbox" name="recipients:list" value="membre" tal:attributes="value member/id" checked="checked" />
+            <input type="checkbox" name="recipients:list" value="membre" tal:attributes="value member/id"/>

             <span tal:replace="member/getMemberFullName">membre</span>
           </label><br/>
         </div>
             <span tal:replace="member/getMemberFullName">membre</span>
           </label><br/>
         </div>

diff --git a/Products/Plinn/skins/generic/content_reject_form.pt b/Products/Plinn/skins/generic/content_reject_form.pt
index 6f2381cd4eb33012e36513ca959965966ee6ca50..dc3886d73f0bac0595bceb86e7508216874d87d8 100644 (file)
--- a/Products/Plinn/skins/generic/content_reject_form.pt
+++ b/Products/Plinn/skins/generic/content_reject_form.pt
@@ -5,8 +5,8 @@
 <body>
 <div metal:fill-slot="main" i18n:domain="plinn">
 
 <body>
 <div metal:fill-slot="main" i18n:domain="plinn">
 

-<h2 i18n:translate="">Reject: "<span tal:replace="here/title_or_id" i18n:name="objectid">Item</span>"</h2>
-       <div i18n:translate="reject_transition_explanations">reject_transition_explanations</div>
+<h2 i18n:translate="">Make private: "<span tal:replace="here/title_or_id" i18n:name="objectid">Item</span>"</h2>
+       <div i18n:translate="">Make this item private to disable public access</div>

 </div>
 
 <form action="dummy">
 </div>
 
 <form action="dummy">


@@ -16,13 +16,13 @@
         <legend i18n:translate="">Notify by e-mail</legend>
         <div tal:repeat="member python:here.getAllMembersInRole('Owner')" tal:omit-tag="">
           <label>
         <legend i18n:translate="">Notify by e-mail</legend>
         <div tal:repeat="member python:here.getAllMembersInRole('Owner')" tal:omit-tag="">
           <label>

-            <input type="checkbox" name="recipients:list" value="membre" tal:attributes="value member/id" checked="checked" />
+            <input type="checkbox" name="recipients:list" value="membre" tal:attributes="value member/id" />

             <span tal:replace="member/getMemberFullName">Membre full name</span>
           </label><br/>
         </div>
       </fieldset>
      <input type="hidden" name="workflow_action" value="reject" />
             <span tal:replace="member/getMemberFullName">Membre full name</span>
           </label><br/>
         </div>
       </fieldset>
      <input type="hidden" name="workflow_action" value="reject" />

-     <input type="submit" value="Reject" i18n:attributes="value" />
+     <input type="submit" value="Make private" i18n:attributes="value" />

     </div>
 </form>
 </body>
     </div>
 </form>
 </body>

diff --git a/Products/Plinn/skins/generic/folder_contents_macros.pt b/Products/Plinn/skins/generic/folder_contents_macros.pt
index b03e11d3bbdb0ee70829839453db6f778f4151c9..bff0d80edd166b123c8d548bcb992af71fe5e94b 100644 (file)
--- a/Products/Plinn/skins/generic/folder_contents_macros.pt
+++ b/Products/Plinn/skins/generic/folder_contents_macros.pt
@@ -61,6 +61,10 @@
           <td>
             <span tal:replace="item_info/modified">2001</span>
           </td>
           <td>
             <span tal:replace="item_info/modified">2001</span>
           </td>

+          <td>
+            <a tal:attributes="href string:${item_info/url}/wf_redirect"
+               tal:content="item_info/state"i18n:translate="">pending</a>
+          </td>

         </tr>
 </tbody>
       </tbody>
         </tr>
 </tbody>
       </tbody>

diff --git a/Products/Plinn/skins/generic/folder_jsupload_snippet.py b/Products/Plinn/skins/generic/folder_jsupload_snippet.py
index f932675a2b7d71b2bc36ccc21ec807a2b5bfc388..b6a082abfe0bccdd94247f1af1bf445ed394d30d 100644 (file)
--- a/Products/Plinn/skins/generic/folder_jsupload_snippet.py
+++ b/Products/Plinn/skins/generic/folder_jsupload_snippet.py
@@ -1,6 +1,7 @@
 ##parameters=ob
 from Products.CMFCore.utils import getUtilityByInterfaceName
 utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool')
 ##parameters=ob
 from Products.CMFCore.utils import getUtilityByInterfaceName
 utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool')

+wftool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IWorkflowTool')

 locale_date_fmt = context.locale_date_fmt()
 infos = {'checkbox' : True,
          'url' : ob.absolute_url(),
 locale_date_fmt = context.locale_date_fmt()
 infos = {'checkbox' : True,
          'url' : ob.absolute_url(),


@@ -10,6 +11,7 @@ infos = {'checkbox' : True,
          'position' : context.getObjectPosition(ob.getId()),
          'type' : ob.Type() or None,
          'id' : ob.getId(),
          'position' : context.getObjectPosition(ob.getId()),
          'type' : ob.Type() or None,
          'id' : ob.getId(),

-         'icon': '%s/%s' % (utool(), ob.getIcon())}
+         'icon': '%s/%s' % (utool(), ob.getIcon()),
+                'state' : wftool.getInfoFor(ob, 'review_state')}

 
 return context.folder_jsupload_snippet_template(listItemInfos=[infos])
\ No newline at end of file
 
 return context.folder_jsupload_snippet_template(listItemInfos=[infos])
\ No newline at end of file

diff --git a/Products/Plinn/skins/generic/wf_redirect.py b/Products/Plinn/skins/generic/wf_redirect.py
new file mode 100644 (file)
index 0000000..7179333
--- /dev/null
+++ b/Products/Plinn/skins/generic/wf_redirect.py
@@ -0,0 +1,12 @@
+##parameters=
+from Products.Plinn.utils import listWorkflowActions
+
+actions = listWorkflowActions(context)
+redirect = context.REQUEST.RESPONSE.redirect
+if actions :
+       return redirect(actions[0]['url'])
+else :
+       from ZTUtils import make_query as mq
+       from Products.Plinn.utils import transtlate as _
+       return redirect('%s?%s' % (actions[0]['url'],
+                                                          mq(portal_status_message = _('You are not allowed to change this content state.'))))
\ No newline at end of file

diff --git a/Products/Plinn/update-i18n.sh b/Products/Plinn/update-i18n.sh
index d2283eb188e530a52081d847fe7871fe0004d601..409133a5f714b513f365f283a3f6edf956a4a0e2 100755 (executable)
--- a/Products/Plinn/update-i18n.sh
+++ b/Products/Plinn/update-i18n.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 #! /bin/sh
 

-i18nextract --path . --site_zcml ../../etc/site.zcml --domain plinn -o locales
+i18nextract --path . --site_zcml /export/zope_instances/jma/etc/site.zcml --domain plinn -o locales

 
 cat locales/plinn.pot locales/plinn-manual.pot > locales/plinn-all.pot
 mv locales/plinn-all.pot locales/plinn.pot
 
 cat locales/plinn.pot locales/plinn-manual.pot > locales/plinn-all.pot
 mv locales/plinn-all.pot locales/plinn.pot

diff --git a/Products/Plinn/utils.py b/Products/Plinn/utils.py
index de68f22698a44df3965f158ef5d54120fbb19279..f15fd0984c5bf39839bc42b33f273d14ff517546 100755 (executable)
--- a/Products/Plinn/utils.py
+++ b/Products/Plinn/utils.py
@@ -76,10 +76,10 @@ def thisObjectComeFromPortalSkin(ob, portal=None):
         except BadRequest :
             return False
 
         except BadRequest :
             return False
 

-security.declarePublic('listActionProviders_')
-def listActionProviders_(context) :
-    atool = getToolByName(context, 'portal_actions')
-    return atool.listActionProviders()
+security.declarePublic('listWorkflowActions')
+def listWorkflowActions(context) :
+       wftool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IWorkflowTool')
+       return wftool.listActions(object=context)

 
 def capitalizeCompoundGivenName(givenName) :
     givenName = givenName.strip()
 
 def capitalizeCompoundGivenName(givenName) :
     givenName = givenName.strip()