[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - use 'share' instead of 'sharing'
Yvo Schubbe
cvs-admin at zope.org
Tue May 21 19:16:45 UTC 2013
Log message for revision 130248:
- use 'share' instead of 'sharing'
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
A Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_share.pt
D Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_sharing.pt
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst 2013-05-21 19:16:44 UTC (rev 130248)
@@ -49,10 +49,10 @@
- [x] folder_rename_control.py -> ContentsView.handle_rename_success
- [x] folder_rename_template.pt -> folder_rename.pt
-[x] IFolderish @@sharing.html:
-------------------------------
-- [x] folder_localrole_edit.py -> FolderSharingView
-- [x] folder_localrole_form.pt -> folder_sharing.pt
+[x] IFolderish @@share.html:
+----------------------------
+- [x] folder_localrole_edit.py -> FolderShareView
+- [x] folder_localrole_form.pt -> folder_share.pt
[x] IMutableMinimalDublinCore @@properties.html:
------------------------------------------------
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml 2013-05-21 19:16:44 UTC (rev 130248)
@@ -28,9 +28,9 @@
<browser:page
for="Products.CMFCore.interfaces.IFolderish"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="sharing.html"
- class=".folder.FolderSharingView"
- template="folder_sharing.pt"
+ name="share.html"
+ class=".folder.FolderShareView"
+ template="folder_share.pt"
permission="cmf.ChangeLocalRoles"
/>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2013-05-21 19:16:44 UTC (rev 130248)
@@ -551,7 +551,8 @@
return 'local_pt' in self.context.objectIds()
-class FolderSharingView(EditFormBase):
+# XXX: quick-and-dirty port from oldstyle skin
+class FolderShareView(EditFormBase):
"""Set local roles.
"""
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_share.pt (from rev 130245, Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_sharing.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_share.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_share.pt 2013-05-21 19:16:44 UTC (rev 130248)
@@ -0,0 +1,187 @@
+<html metal:use-macro="context/@@standard_macros/page">
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<tal:case tal:condition="not: view/searching">
+<!-- Search -->
+
+<h2 i18n:translate="">Assign local roles: Search Members</h2>
+
+<form method="post" action="folder_localrole_form"
+ tal:attributes="action request/ACTUAL_URL"
+>
+
+<table class="FormLayout">
+ <tr>
+ <th i18n:translate="">Search by</th>
+ <td>
+ <select name="search_param">
+ <option value="username" i18n:translate="">User Name</option>
+ <option value="email" i18n:translate="">Email Address</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th i18n:translate="">Search Term</th>
+ <td><input type="text" name="search_term" size="30" /></td>
+ </tr>
+ <tr>
+ <td><br /></td>
+ <td>
+ <input type="submit" name="role_submit" value="Search"
+ i18n:attributes="value" />
+ </td>
+ </tr>
+</table>
+
+</form>
+
+
+<!-- End search -->
+</tal:case>
+
+<tal:case tal:condition="view/searching">
+<!-- Assignment -->
+
+<h2 i18n:translate="">Assign local roles: Search Results</h2>
+
+<tal:case tal:condition="view/found">
+
+ <p i18n:translate="">Select Member(s) and a role to assign:</p>
+
+ <form method="post" action="folder_localrole_edit"
+ tal:attributes="action request/ACTUAL_URL"
+ >
+ <input type="hidden" name="ADD" value="add" />
+
+ <table class="FormLayout">
+
+ <tr>
+ <td width="16"><br /></td>
+ <th style="text-align:left;" i18n:translate="">User</th>
+ <th style="text-align:left;" i18n:translate="">Email address</th>
+ </tr>
+
+ <tr tal:repeat="member view/found">
+ <td width="16">
+ <input type="checkbox" name="member_ids:list"
+ value=""
+ tal:attributes="value member/username" />
+ </td>
+ <td tal:content="member/username"> Username 1 </td>
+ <td tal:content="member/email"> Email 1 </td>
+ </tr>
+
+ <tr tal:condition="nothing">
+ <td width="16">
+ <input type="checkbox" name="member_ids:list" value="" />
+ </td>
+ <td> Username 2 </td>
+ <td> Email 2 </td>
+ </tr>
+
+ <tr>
+ <td colspan="3"><br /></td>
+ </tr>
+
+ <tr>
+ <th colspan="2" i18n:translate="">Role to assign:</th>
+ <td>
+ <select name="member_role">
+ <option tal:repeat="role view/roles"
+ tal:content="role"> Role1 </option>
+ <option tal:condition="nothing"> Role2 </option>
+ <option tal:condition="nothing"> Role3 </option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="3"><br /></td>
+ </tr>
+
+ <tr>
+ <td width="16"><br /></td>
+ <td colspan="2">
+ <input type="submit" value="Assign Roles" i18n:attributes="value" />
+ </td>
+ </tr>
+
+ </table>
+ </form>
+</tal:case>
+
+<tal:case tal:condition="not: view/found">
+ <p i18n:translate="">Sorry, no members matched your search.</p>
+</tal:case>
+
+<!-- End assignment -->
+</tal:case>
+
+<hr />
+
+<h2 i18n:translate="">Currently assigned local roles</h2>
+
+<p i18n:translate="">These users currently have local roles assigned in this
+ folder:</p>
+
+<form method="post" action="folder_localrole_edit"
+ tal:attributes="action request/ACTUAL_URL"
+>
+ <input type="hidden" name="DELETE" value="delete" />
+ <input type="hidden" name="member_role" value="" />
+
+ <table class="FormLayout">
+ <tr>
+ <td width="16"><br /></td>
+ <th style="text-align:left;" i18n:translate="">User</th>
+ <th style="text-align:left;" i18n:translate="">Role(s)</th>
+ </tr>
+
+ <tr tal:repeat="role_tuple view/lroles">
+ <td width="16" tal:define="user_name python: role_tuple[0]">
+ <input type="checkbox" name="member_ids:list"
+ value="id"
+ tal:attributes="value user_name"
+ tal:condition="python: user_name != view.auth_name" />
+ <br tal:condition="python: user_name == view.auth_name" />
+ </td>
+ <td tal:content="python: role_tuple[0]">Username 1</td>
+ <td tal:content="python: ', '.join(role_tuple[1])">
+ Role1, Role2
+ </td>
+ </tr>
+
+ <tr tal:condition="nothing">
+ <td width="16">
+ <input type="checkbox" name="member_ids:list" value="id" />
+ </td>
+ <td> Username 2 </td>
+ <td> Role3 </td>
+ </tr>
+
+ <tr tal:condition="nothing">
+ <td width="16">
+ <br />
+ </td>
+ <td> Auth username </td>
+ <td> Role1, Role2, Role3 </td>
+ </tr>
+
+ <tr>
+ <td colspan="3"><br /></td>
+ </tr>
+
+ <tr>
+ <td><br /></td>
+ <td colspan="2">
+ <input type="submit" value="Delete" i18n:attributes="value" />
+ </td>
+ </tr>
+
+</table>
+</form>
+</metal:slot>
+
+</body>
+</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_sharing.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_sharing.pt 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_sharing.pt 2013-05-21 19:16:44 UTC (rev 130248)
@@ -1,187 +0,0 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<body>
-
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<tal:case tal:condition="not: view/searching">
-<!-- Search -->
-
-<h2 i18n:translate="">Assign local roles: Search Members</h2>
-
-<form method="post" action="folder_localrole_form"
- tal:attributes="action request/ACTUAL_URL"
->
-
-<table class="FormLayout">
- <tr>
- <th i18n:translate="">Search by</th>
- <td>
- <select name="search_param">
- <option value="username" i18n:translate="">User Name</option>
- <option value="email" i18n:translate="">Email Address</option>
- </select>
- </td>
- </tr>
- <tr>
- <th i18n:translate="">Search Term</th>
- <td><input type="text" name="search_term" size="30" /></td>
- </tr>
- <tr>
- <td><br /></td>
- <td>
- <input type="submit" name="role_submit" value="Search"
- i18n:attributes="value" />
- </td>
- </tr>
-</table>
-
-</form>
-
-
-<!-- End search -->
-</tal:case>
-
-<tal:case tal:condition="view/searching">
-<!-- Assignment -->
-
-<h2 i18n:translate="">Assign local roles: Search Results</h2>
-
-<tal:case tal:condition="view/found">
-
- <p i18n:translate="">Select Member(s) and a role to assign:</p>
-
- <form method="post" action="folder_localrole_edit"
- tal:attributes="action request/ACTUAL_URL"
- >
- <input type="hidden" name="ADD" value="add" />
-
- <table class="FormLayout">
-
- <tr>
- <td width="16"><br /></td>
- <th style="text-align:left;" i18n:translate="">User</th>
- <th style="text-align:left;" i18n:translate="">Email address</th>
- </tr>
-
- <tr tal:repeat="member view/found">
- <td width="16">
- <input type="checkbox" name="member_ids:list"
- value=""
- tal:attributes="value member/username" />
- </td>
- <td tal:content="member/username"> Username 1 </td>
- <td tal:content="member/email"> Email 1 </td>
- </tr>
-
- <tr tal:condition="nothing">
- <td width="16">
- <input type="checkbox" name="member_ids:list" value="" />
- </td>
- <td> Username 2 </td>
- <td> Email 2 </td>
- </tr>
-
- <tr>
- <td colspan="3"><br /></td>
- </tr>
-
- <tr>
- <th colspan="2" i18n:translate="">Role to assign:</th>
- <td>
- <select name="member_role">
- <option tal:repeat="role view/roles"
- tal:content="role"> Role1 </option>
- <option tal:condition="nothing"> Role2 </option>
- <option tal:condition="nothing"> Role3 </option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td colspan="3"><br /></td>
- </tr>
-
- <tr>
- <td width="16"><br /></td>
- <td colspan="2">
- <input type="submit" value="Assign Roles" i18n:attributes="value" />
- </td>
- </tr>
-
- </table>
- </form>
-</tal:case>
-
-<tal:case tal:condition="not: view/found">
- <p i18n:translate="">Sorry, no members matched your search.</p>
-</tal:case>
-
-<!-- End assignment -->
-</tal:case>
-
-<hr />
-
-<h2 i18n:translate="">Currently assigned local roles</h2>
-
-<p i18n:translate="">These users currently have local roles assigned in this
- folder:</p>
-
-<form method="post" action="folder_localrole_edit"
- tal:attributes="action request/ACTUAL_URL"
->
- <input type="hidden" name="DELETE" value="delete" />
- <input type="hidden" name="member_role" value="" />
-
- <table class="FormLayout">
- <tr>
- <td width="16"><br /></td>
- <th style="text-align:left;" i18n:translate="">User</th>
- <th style="text-align:left;" i18n:translate="">Role(s)</th>
- </tr>
-
- <tr tal:repeat="role_tuple view/lroles">
- <td width="16" tal:define="user_name python: role_tuple[0]">
- <input type="checkbox" name="member_ids:list"
- value="id"
- tal:attributes="value user_name"
- tal:condition="python: user_name != view.auth_name" />
- <br tal:condition="python: user_name == view.auth_name" />
- </td>
- <td tal:content="python: role_tuple[0]">Username 1</td>
- <td tal:content="python: ', '.join(role_tuple[1])">
- Role1, Role2
- </td>
- </tr>
-
- <tr tal:condition="nothing">
- <td width="16">
- <input type="checkbox" name="member_ids:list" value="id" />
- </td>
- <td> Username 2 </td>
- <td> Role3 </td>
- </tr>
-
- <tr tal:condition="nothing">
- <td width="16">
- <br />
- </td>
- <td> Auth username </td>
- <td> Role1, Role2, Role3 </td>
- </tr>
-
- <tr>
- <td colspan="3"><br /></td>
- </tr>
-
- <tr>
- <td><br /></td>
- <td colspan="2">
- <input type="submit" value="Delete" i18n:attributes="value" />
- </td>
- </tr>
-
-</table>
-</form>
-</metal:slot>
-
-</body>
-</html>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml 2013-05-21 19:16:44 UTC (rev 130248)
@@ -19,7 +19,7 @@
<alias from="(Default)" to="index_html"/>
<alias from="index.html" to="index_html"/>
<alias from="properties" to="folder_edit_form"/>
- <alias from="sharing" to="folder_localrole_form"/>
+ <alias from="share" to="folder_localrole_form"/>
<alias from="view" to="index_html"/>
<action title="View" action_id="view" category="object" condition_expr=""
icon_expr="string:${portal_url}/preview_icon.png" link_target=""
@@ -33,7 +33,7 @@
</action>
<action title="Local Roles" action_id="localroles" category="object"
condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
- link_target="" url_expr="string:${object_url}/sharing" visible="True">
+ link_target="" url_expr="string:${object_url}/share" visible="True">
<permission value="Change local roles"/>
</action>
<action title="Folder contents" action_id="folderContents" category="object"
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml 2013-05-21 19:16:44 UTC (rev 130248)
@@ -18,7 +18,7 @@
<alias from="(Default)" to="index_html"/>
<alias from="index.html" to="index_html"/>
<alias from="properties" to="folder_edit_form"/>
- <alias from="sharing" to="folder_localrole_form"/>
+ <alias from="share" to="folder_localrole_form"/>
<alias from="view" to="index_html"/>
<action title="View" action_id="view" category="object" condition_expr=""
icon_expr="string:${portal_url}/preview_icon.png" link_target=""
@@ -32,7 +32,7 @@
</action>
<action title="Local Roles" action_id="localroles" category="object"
condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
- link_target="" url_expr="string:${object_url}/sharing" visible="True">
+ link_target="" url_expr="string:${object_url}/share" visible="True">
<permission value="Change local roles"/>
</action>
<action title="Folder contents" action_id="folderContents" category="object"
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml 2013-05-21 19:16:44 UTC (rev 130248)
@@ -4,6 +4,6 @@
<alias from="folder_contents" to="@@edit.html"/>
<alias from="index.html" to="@@view.html"/>
<alias from="properties" to="@@properties.html"/>
- <alias from="sharing" to="@@sharing.html"/>
+ <alias from="share" to="@@share.html"/>
<alias from="view" to="@@view.html"/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml 2013-05-21 19:16:44 UTC (rev 130248)
@@ -4,6 +4,6 @@
<alias from="folder_contents" to="@@edit.html"/>
<alias from="index.html" to="@@view.html"/>
<alias from="properties" to="@@properties.html"/>
- <alias from="sharing" to="@@sharing.html"/>
+ <alias from="share" to="@@share.html"/>
<alias from="view" to="@@view.html"/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2013-05-21 19:16:44 UTC (rev 130248)
@@ -457,7 +457,7 @@
'file_edit_form': 'edit',
'file_view': 'view',
'folder_edit_form': 'properties',
- 'folder_localrole_form': 'sharing',
+ 'folder_localrole_form': 'share',
'image_edit_form': 'edit',
'image_view': 'view',
'link_edit_form': 'edit',
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py 2013-05-21 04:34:04 UTC (rev 130247)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py 2013-05-21 19:16:44 UTC (rev 130248)
@@ -64,11 +64,11 @@
logger.info("Updated '{0}' action.".format(k))
_ALIASES = {
- 'CMF BTree Folder': {'sharing': '@@sharing.html'},
+ 'CMF BTree Folder': {'share': '@@share.html'},
'Discussion Item': {'(Default)': '@@view.html', 'view': '@@view.html'},
'Document': {'gethtml': '@@source.html'},
'File': {'view': '@@view.html'},
- 'Folder': {'sharing': '@@sharing.html'},
+ 'Folder': {'share': '@@share.html'},
'Image': {'view': '@@view.html'},
'News Item': {'gethtml': '@@source.html'}}
More information about the checkins
mailing list