[Erp5-report] r39094 ivan - in /erp5/trunk/bt5/erp5_km: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: ivan
Date: Wed Oct 13 13:34:42 2010
New Revision: 39094

URL: http://svn.erp5.org?rev=39094&view=rev
Log:
Show current logged in user otherwise it's too confusing for users.

Modified:
    erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewUserInformationWidget.xml
    erp5/trunk/bt5/erp5_km/bt/revision

Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewUserInformationWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewUserInformationWidget.xml?rev=39094&r1=39093&r2=39094&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewUserInformationWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewUserInformationWidget.xml [utf8] Wed Oct 13 13:34:42 2010
@@ -2,16 +2,13 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_Cacheable__manager_id</string> </key>
-            <value> <string>web_section_user_ram_cache</string> </value>
+            <value> <string>web_section_ram_cache</string> </value>
         </item>
         <item>
             <key> <string>_bind_names</string> </key>
@@ -57,23 +54,26 @@
 </tal:block>\n
 \n
 <tal:block tal:define="current_web_site python:request.get(\'current_web_site\', here);\n
-                       portal_path python:request.get(\'current_web_site_url\', current_web_site.absolute_url());">\n
+                       portal_path python:request.get(\'current_web_site_url\', current_web_site.absolute_url());\n
+                       user_name python: here.portal_membership.getAuthenticatedMember();\n
+                       is_anonymous_user here/portal_membership/isAnonymousUser">\n
 \n
-<tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n
+<tal:block tal:condition="not:is_anonymous_user">\n
   <a id="login-logout-link" \n
      href="#" tal:attributes="href string:${portal_path}/WebSite_logout"\n
-    i18n:translate="" i18n:domain="ui">\n
-    Logout\n
-  </a>\n
+    i18n:translate="" i18n:domain="ui"\n
+    title="Log out"\n
+    i18n:attributes="title"\n
+    tal:content="user_name"/>\n
 </tal:block>\n
 \n
-<tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
+<tal:block tal:condition="is_anonymous_user">\n
   <a id="login-logout-link" \n
      href="#" \n
      tal:attributes="href string:${portal_path}/login_form"\n
-     i18n:translate="" i18n:domain="ui">\n
-     Login\n
-  </a>\n
+     i18n:translate="" i18n:domain="ui"\n
+     i18n:attributes="title"\n
+     title="Log in">Login</a>\n
 </tal:block>\n
 \n
 </tal:block>\n

Modified: erp5/trunk/bt5/erp5_km/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/bt/revision?rev=39094&r1=39093&r2=39094&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/bt/revision [utf8] Wed Oct 13 13:34:42 2010
@@ -1 +1 @@
-1590
\ No newline at end of file
+1591
\ No newline at end of file