From edbc7008d92e1b7099e353b8ce281b4e102609a0 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Tue, 11 May 2010 08:21:42 +0000
Subject: [PATCH] Show toolbar for logged in users.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35160 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../toolbar.xml                               | 22 +++++++++++++++++--
 .../erp5_km_minimal_front_layout.xml          |  2 +-
 .../erp5_km_theme/km_css/layout.css.xml       | 14 ++++++++++++
 .../template_erp5_km_minimal.xml              |  7 +++++-
 bt5/erp5_km/bt/revision                       |  2 +-
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/toolbar.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/toolbar.xml
index 852c535c23..c3dddd1758 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/toolbar.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/toolbar.xml
@@ -151,7 +151,9 @@
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>external_validator</string> </key>
@@ -218,7 +220,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string>hiddenLabel</string> </value>
+                    <value> <string>hidden_label</string> </value>
                 </item>
                 <item>
                     <key> <string>default</string> </key>
@@ -310,4 +312,20 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>not: here/portal_membership/isAnonymousUser</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml
index fa04e53a73..ba84b8d495 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml
@@ -71,8 +71,8 @@
                 <string>headline</string>
                 <string>bottom gadget (Bottom Gadget)</string>
                 <string>right column gadget (Right Gadget)</string>
-                <string>footer</string>
                 <string>web-toolbar</string>
+                <string>footer</string>
               </list>
             </value>
         </item>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
index e7a75b469e..08477ba1d7 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
@@ -938,6 +938,7 @@ fieldset.right .gadget {\n
 \toverflow: hidden;\n
 \tposition: relative;\n
 \tmargin-top: -4.6em;\n
+\tpadding-bottom: 20px;\n
 \n
 }\n
 \n
@@ -1390,6 +1391,19 @@ fieldset.right_registration select {\n
   max-width: 170px;\n
 \n
 }\n
+\n
+/* Web Toolbar */\n
+div.web-toolbar{\n
+  padding-left: 200px;\n
+  color: auto;\n
+  height: 30px;\n
+}\n
+\n
+div.web-toolbar h3{\n
+  color:#000000;\n
+  height: 30px;\n
+}\n
+\n
 
 
 ]]></string> </value>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
index 487d7e0ba8..4a830cfc68 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
@@ -111,6 +111,7 @@
                                                      layout_form.id == \'erp5_km_minimal_front_layout\';\n
                              global header_title python:\'%s | %s\' % (here.getTranslatedTitleOrId(), website.getTranslatedTitleOrId());\n
                              global css_list_template python:[\n
+                                    \'%s/erp5_web_toolbar.css\' % portal_path,\n
                                     \'%s/km_css/layout.css\' % portal_path,\n
                                     \'%s/km_css/splash.css\' % portal_path,\n
                                     \'%s/km_css/color.css\' % portal_path,\n
@@ -119,7 +120,7 @@
                                     \'%s/km_css/erp5_km_common.css\' % portal_path,\n
                                     \'%s/km_css/erp5_knowledge_box.css\' % portal_path,\n
                                     \'%s/km_css/erp5_knowledge_box_web.css\' % portal_path,\n
-                                    \'%s/erp5_web_toolbar.css\' % portal_path,\n
+\n
 ];\n
                              global js_list python:[\n
                                    \'%s/erp5_km_utils.js\' % portal_path,\n
@@ -192,6 +193,10 @@
                       <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
                   </tal:block>\n
                 </tal:block>\n
+                <!-- Web toolbar -->\n
+                  <tal:block tal:repeat="aggregate python: [(\'toolbox\', splash_area)]">\n
+                      <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
+                  </tal:block>\n
                 <div id="content_back_km">\n
                   <!-- Headline Box -->\n
                   <!-- Layout form rendering -->\n
diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision
index ec7f702f21..ccebf25358 100644
--- a/bt5/erp5_km/bt/revision
+++ b/bt5/erp5_km/bt/revision
@@ -1 +1 @@
-1372
\ No newline at end of file
+1373
\ No newline at end of file
-- 
2.30.9