[Erp5-report] r12207 - /erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widg...

[nobody at svn.erp5.org]

Author: kristian
Date: Mon Jan 22 16:30:04 2007
New Revision: 12207

URL: http://svn.erp5.org?rev=12207&view=rev
Log:
2007-01-22 JPS
* Fix for Web Pages to work with the admin toolbox.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml?rev=12207&r1=12206&r2=12207&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml Mon Jan 22 16:30:04 2007
@@ -85,7 +85,10 @@
 result = []\n
 portal_type = context.getPortalType()\n
 request = context.REQUEST\n
-current_web_section = request.current_web_section\n
+if(portal_type == \'Web Page\'):\n
+  current_web_section = context.getParent()\n
+else:\n
+  current_web_section = request.current_web_section\n
 current_web_section_pt = current_web_section.getPortalType()\n
 action_dict = request.get(\'actions\', {}) # actions needs to be renamed to action_dict\n
 exchange_action_list = action_dict.get(\'object_exchange\', [])\n
@@ -100,12 +103,12 @@
 \n
 \n
 # Append a button to edit the current document\n
-if not request.form.get(\'editable_mode\', 0): result.append(dict(\n
+if not request.form.get(\'editable_mode\', 0): \n
+  result.append(dict(\n
   url   = "%s/view?editable_mode:int=1&%s" % (editable_absolute_url, http_parameters),\n
   icon  = context.getIcon() or \'file_icon.gif\',\n
   title = translateString("Edit ${portal_type}", mapping=dict(portal_type=portal_type)),\n
-  label = "%s Icon" % portal_type,\n
-))\n
+  label = "%s Icon" % portal_type,))\n
 else: result.append(dict(\n
   url   = "%s/view?editable_mode=&%s" % (editable_absolute_url, http_parameters),\n
   icon  = context.getIcon() or \'file_icon.gif\',\n

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml?rev=12207&r1=12206&r2=12207&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml Mon Jan 22 16:30:04 2007
@@ -101,7 +101,7 @@
   -->\n
   <div name="adminSection" class="adminSection"\n
        tal:condition="here/isDocument | python: (portal_type in [\'Web Site\', \'Web Section\']\n
-                                             and here.WebSite_getDefaultWebPageValue())">\n
+                                             and here.WebSection_getDefaultDocumentValue() )">\n
 \n
       <h3>\n
         <span id="create_new_document_title"></span>\n