[Erp5-report] r31697 nicolas.dumazet - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_st...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jan 12 03:07:35 CET 2010
Author: nicolas.dumazet
Date: Tue Jan 12 03:07:32 2010
New Revision: 31697
URL: http://svn.erp5.org?rev=31697&view=rev
Log:
Revert my changes on context box buttons.
They were untested, and inducing performance loss.
31664 was also removing the possibility to add same-type object in the container
when in non-list mode.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml?rev=31697&r1=31696&r2=31697&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml [utf8] Tue Jan 12 03:07:32 2010
@@ -153,25 +153,20 @@
ui_actions actions/object_ui | nothing;\n
print_actions actions/object_print | nothing;\n
list_mode list_mode | nothing;\n
- can_modify_portal_content python: portal.portal_membership.checkPermission(\'Modify portal content\', here);\n
- can_delete_objects python: portal.portal_membership.checkPermission(\'Delete objects\', here);\n
- can_copy_or_move python: portal.portal_membership.checkPermission(\'Copy Or Move\', here);\n
- can_add_object_here python: len(here.getVisibleAllowedContentTypeList()) > 0;">\n
+ can_modify_portal_content python: portal.portal_membership.checkPermission(\'Modify portal content\', here)">\n
<span class="separator"><!--separator--></span>\n
<tal:block tal:condition="list_mode">\n
- <tal:block tal:condition="can_copy_or_move">\n
- <button class="cut" type="submit" name="Folder_cut:method" title="Cut"\n
- i18n:attributes="title" i18n:domain="ui"\n
- tal:condition="can_modify_portal_content">\n
- <span class="image"></span>\n
- <span class="description" i18n:translate="" i18n:domain="ui">Cut</span>\n
- </button>\n
- <button class="copy" type="submit" name="Folder_copy:method" title="Copy"\n
- i18n:attributes="title" i18n:domain="ui">\n
- <span class="image"></span>\n
- <span class="description" i18n:translate="" i18n:domain="ui">Copy</span>\n
- </button>\n
- </tal:block>\n
+ <button class="cut" type="submit" name="Folder_cut:method" title="Cut"\n
+ i18n:attributes="title" i18n:domain="ui"\n
+ tal:condition="can_modify_portal_content">\n
+ <span class="image"></span>\n
+ <span class="description" i18n:translate="" i18n:domain="ui">Cut</span>\n
+ </button>\n
+ <button class="copy" type="submit" name="Folder_copy:method" title="Copy"\n
+ i18n:attributes="title" i18n:domain="ui">\n
+ <span class="image"></span>\n
+ <span class="description" i18n:translate="" i18n:domain="ui">Copy</span>\n
+ </button>\n
<button class="paste" type="submit" name="Folder_paste:method" title="Paste"\n
i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n
@@ -184,9 +179,8 @@
<span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Print</span>\n
</button>\n
- <button tal:condition="python: list_mode and can_add_object_here"\n
+ <button class="new" type="submit" title="New"\n
tal:attributes="name python: list_mode and \'Folder_create:method\' or \'Base_createNewDocument:method\'"\n
- class="new" type="submit" title="New"\n
i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">New</span>\n
@@ -198,8 +192,7 @@
<span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Clone</span>\n
</button>\n
- <button tal:condition="python: list_mode and can_delete_objects" class="delete" type="submit" \n
- name="Folder_deleteObjectList:method" title="Delete"\n
+ <button tal:condition="list_mode" class="delete" type="submit" name="Folder_deleteObjectList:method" title="Delete"\n
i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Delete</span>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=31697&r1=31696&r2=31697&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log [utf8] Tue Jan 12 03:07:32 2010
@@ -1,8 +1,3 @@
-2010-01-07 Nicolas Dumazet
-* Dont show a New button if there are no Visible Allowed Content Types
-* Do not show Cut/Paste button if no "Copy or Move" permission
-* Do not show Delete button if no "Delete objects" permission
-
2009-12-11 Kazuhiko
* update FCKeditor to 2.6.5.
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=31697&r1=31696&r2=31697&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Tue Jan 12 03:07:32 2010
@@ -1,1 +1,1 @@
-867
+868
More information about the Erp5-report
mailing list