[Erp5-report] r28558 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web/...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Aug 21 21:05:31 CEST 2009


Author: kazuhiko
Date: Fri Aug 21 21:05:31 2009
New Revision: 28558

URL: http://svn.erp5.org?rev=28558&view=rev
Log:
* use smaller import/export icon.
* display image/document/web page modules in toolbar.

Added:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/import_export.png.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml
Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewToolbarWidget.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.css.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Added: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/import_export.png.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/import_export.png.xml?rev=28558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/import_export.png.xml (added)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/import_export.png.xml [utf8] Fri Aug 21 21:05:31 2009
@@ -1,0 +1,63 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Cacheable__manager_id</string> </key>
+            <value> <string>http_cache</string> </value>
+        </item>
+        <item>
+            <key> <string>_EtagSupport__etag</string> </key>
+            <value> <string>ts50880849.08</string> </value>
+        </item>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>import_export.png</string> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>image/png</string> </value>
+        </item>
+        <item>
+            <key> <string>data</string> </key>
+            <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABlUlEQVQ4y6XSu07CYBgGYEZvwMHF
+RW/FC/AOXDzgYTFG0YQQRTzFwYgYTZxMXFwcDAQRTRhEQUEIQi0HOVgRlaOlFFrwta2IipJA/JJ3
+6/e0/9tfJquOwx1kfOQ9vGSsFtdNGDYHCbPFBaP5CuvbB22yRuNwhxjUDceXkWc4BMMJUPHM25mN
+eN3ZNbQ3DfDlCgosh0D4EalMAXS+CNOpEy0BTKGEPuUJCDKC4J1wxNtIZW//GMq5zY6mAJ7nhTdC
+Qs7tPuiPLnBotGJCsbglLV57Qt3iA81EROzOAKyXBORjM1oJiEb9Xc0CYtSrBri9EQyNTn8AkRYA
+8Qv0JicIP4XBkSrgJanOPztQqaQOiqWvDjI5FrGHNAJ3jwKg0DYuUViu9PTWAHGZLfIIvXJwUWlY
+/HHIGwLCMloo5SfQ4vJv4N9fIExZOPcn8nmVxWucTDN4TtJ4eqERo1IYGJ6q7yD46y9I4BtQKFZA
+MzxyNId0lkU8kUW/vA7wEFFmVrOGhRXdV5Z10HzL/NKGFPWiFuOTagl4B7InaMck44AjAAAAAElF
+TkSuQmCC</string> </value>
+        </item>
+        <item>
+            <key> <string>height</string> </key>
+            <value> <int>16</int> </value>
+        </item>
+        <item>
+            <key> <string>precondition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>size</string> </key>
+            <value> <int>462</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>width</string> </key>
+            <value> <int>16</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml?rev=28558&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml (added)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml [utf8] Fri Aug 21 21:05:31 2009
@@ -1,0 +1,160 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>from Products.ERP5Type.Cache import CachingMethod\n
+\n
+# by default we use following modules in toolbar.\n
+if module_id_list is None:\n
+  module_id_list = [\'image_module\',\n
+                    \'document_module\',\n
+                    \'web_page_module\',\n
+                   ]\n
+\n
+portal = context.getPortalObject()\n
+user = portal.portal_membership.getAuthenticatedMember().getUserName()\n
+\n
+def getModuleItemList(user=None):\n
+  gettext = portal.Localizer.erp5_ui.gettext\n
+\n
+  item_list = []\n
+  for module_id in module_id_list:\n
+    module = portal.restrictedTraverse(module_id, None)\n
+    if module is not None:\n
+      if portal.portal_membership.checkPermission(\'View\', module):\n
+        item_list.append((gettext(module.getTitleOrId()), module.absolute_url_path()))\n
+\n
+  item_list.sort(key=lambda x: x[0])\n
+  return item_list\n
+\n
+getModuleItemList = CachingMethod(getModuleItemList,  \n
+  id=(\'WebSection_getToolbarModuleItemList\', portal.Localizer.get_selected_language(), portal.portal_url()),\n
+      cache_factory=\'erp5_ui_short\')\n
+\n
+return getModuleItemList(user=user)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>module_id_list=None</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>1</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>module_id_list</string>
+                            <string>Products.ERP5Type.Cache</string>
+                            <string>CachingMethod</string>
+                            <string>None</string>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>portal</string>
+                            <string>user</string>
+                            <string>getModuleItemList</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <tuple>
+                <none/>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSection_getToolbarModuleItemList</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewToolbarWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewToolbarWidget.xml?rev=28558&r1=28557&r2=28558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewToolbarWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewToolbarWidget.xml [utf8] Fri Aug 21 21:05:31 2009
@@ -61,7 +61,7 @@
   <!-- Edit button menu -->\n
   <li class="toolboxSection">\n
     <h3 class="menu_title" i18n:translate="" i18n:domain="ui">Edit</h3>\n
-    <div class="menu" style="display:none">\n
+    <div class="menu">\n
       <ul tal:define="edit_link_list python: here.Base_getAdminToolboxEditShortcutList()">\n
         <li tal:repeat="link edit_link_list">\n
           <a tal:attributes="href python: link[\'url\']">\n
@@ -87,7 +87,7 @@
   -->\n
   <li class="toolboxSection">\n
     <h3 class="menu_title"><tal:block tal:content="portal_type"/> Actions</h3>\n
-    <div class="menu" style="display:none">\n
+    <div class="menu">\n
       <label i18n:translate="" i18n:domain="ui">Add</label>\n
       <ul>\n
         <tal:block tal:define="allowed_content_type_list here/getVisibleAllowedContentTypeList | python:[] ">\n
@@ -180,7 +180,7 @@
         <tal:block tal:replace="string:Clone $portal_type"/>\n
       </span>\n
     </h3>\n
-    <div class="menu" style="display:none">\n
+    <div class="menu">\n
       <fieldset style="display:block;">\n
         <div class="field">\n
           <label i18n:translate="" i18n:domain="ui">Title</label>\n
@@ -292,6 +292,25 @@
       " />\n
     </div>\n
   </li>\n
+\n
+  <!-- Module panel.\n
+       Some modules that should be useful for web management will be listed.\n
+  -->\n
+  <li class="toolboxSection">\n
+    <h3 class="menu_title" i18n:translate="" i18n:domain="ui">Module</h3>\n
+    <div class="menu">\n
+      <ul>\n
+        <li tal:define="module_list here/WebSection_getToolbarModuleItemList"\n
+            tal:repeat="module module_list">\n
+          <button class="menu-link"\n
+                  tal:attributes="name string:Base_doModule:method;\n
+                                  value python: module[1];\n
+                                  title python: module[0]"\n
+                  tal:content="python: module[0]"></button>\n
+        </li>\n
+      </ul>\n
+    </div>\n
+  </li>\n
   <script type="text/javascript" src="erp5_web_toolbar.js" tal:attributes="src string:$portal_url/erp5_web_toolbar.js"></script>\n
 </ul>\n
 </tal:block>

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.css.xml?rev=28558&r1=28557&r2=28558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/erp5_web_toolbar.css.xml [utf8] Fri Aug 21 21:05:31 2009
@@ -43,7 +43,7 @@
 <tal:block>\n
 div.web-toolbar {\n
   z-index:999;\n
-  font-size:12px !important;\n
+  font-size:11px !important;\n
   bottom:0;\n
   left:0;\n
   position:fixed;\n
@@ -55,9 +55,10 @@
   margin:0;\n
 }\n
 div.web-toolbar h3 {\n
+  height:20px;\n
   font-size:100%;\n
   font-weight:bold;\n
-  padding:0 10px;\n
+  padding:3px 10px;\n
   cursor:pointer;\n
 }\n
 div.web-toolbar h3:hover {\n
@@ -92,23 +93,6 @@
 div.web-toolbar div.hiddenLabel label {\n
   display: none!important;\n
 }\n
-\n
-/* Sub section title */\n
-div.web-toolbar h3 {\n
-  font-size:120% !important /*Non-IE6*/; font-size:100% /*IE6*/;\n
-  margin:0;\n
-}\n
-\n
-/* Title */\n
-div.web-toolbar > div > h3 {\n
-  background: #f77;\n
-  padding: 0.5em 0;\n
-  margin: 0;\n
-  color: #fff;\n
-  cursor: pointer;\n
-}\n
-\n
-div.web-toolbar > div > h3:hover {background: #f00}\n
 \n
 div.web-toolbar li {\n
   margin: 0;\n
@@ -162,7 +146,7 @@
   margin: 0.3em 0;\n
   width:100%;\n
   font-family:sans-serif;\n
-  font-size:90%;\n
+  font-size:100%;\n
 }\n
 div.web-toolbar li > a span,\n
 div.web-toolbar button {\n

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=28558&r1=28557&r2=28558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Fri Aug 21 21:05:31 2009
@@ -1,1 +1,1 @@
-842
+843




More information about the Erp5-report mailing list