[Erp5-report] r39283 gabriel - in /experimental/bt5/erp5_web_ung_theme: SkinTemplateItem/po...

[nobody at svn.erp5.org]

Author: gabriel
Date: Mon Oct 18 16:47:56 2010
New Revision: 39283

URL: http://svn.erp5.org?rev=39283&view=rev
Log:
refactor code to show the login name in header

Modified:
    experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
    experimental/bt5/erp5_web_ung_theme/bt/revision

Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml?rev=39283&r1=39282&r2=39283&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] Mon Oct 18 16:47:56 2010
@@ -44,7 +44,6 @@
                             portal_path python:website.absolute_url();\n
                             current_main_section here/WebSite_getMainSection;\n
                             editable request/editable_mode | python: 1;\n
-                            person python: here.ERP5Site_getAuthenticatedMemberPersonValue();\n
                             list_mode list_mode | nothing;\n
                             dialog_mode dialog_mode | nothing;\n
                             has_no_layout python: layout_form is None;\n
@@ -61,12 +60,12 @@
           <a href="#">Email</a> <a href="#">Documents</a> <a href="#">Calendar</a>\n
         </div>\n
         <div class="header-user">\n
-          <tal:block tal:condition="python: person is None">\n
+          <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
              <a tal:attributes="href string:${portal_path}/login_form">Sign in</a>\n
           </tal:block>\n
-          <tal:block tal:condition="python: person is not None">\n
-            <a tal:content="person/getDefaultEmailText"/>\n
-          </tal:block>\n
+          <tal:block tal:condition="python:not here.portal_membership.isAnonymousUser()">\n
+            <a tal:content="here/portal_membership/getAuthenticatedMember"/>\n
+          </tal:block>          \n
           | <a href="#">Settings</a> | <a href="#">Help</a> |\n
           <a tal:attributes="href string:${portal_path}/logout">Sign out</a>\n
         </div>\n
@@ -113,9 +112,9 @@
         <div class="main-status">\n
           Starred\n
         </div>\n
-        <div class="main-content">\n
+        <!--<div class="main-content">\n
           <tal:block metal:define-slot="main">Here goes the editor or the listbox</tal:block>\n
-        </div>\n
+        </div>-->\n
       </div>\n
     </div>\n
           </tal:block>\n

Modified: experimental/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/bt/revision?rev=39283&r1=39282&r2=39283&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Oct 18 16:47:56 2010
@@ -1 +1 @@
-6
\ No newline at end of file
+7
\ No newline at end of file