bugfix : checkIdAvailable était exécutée via l'acquisition…

[Plinn.git] / skins / generic / main_template_macros.pt

diff --git a/skins/generic/main_template_macros.pt b/skins/generic/main_template_macros.pt
index 47bc193..ba60bc6 100644 (file)
--- a/skins/generic/main_template_macros.pt
+++ b/skins/generic/main_template_macros.pt
@@ -37,12 +37,13 @@ global specialCtxHeader options/specialCtxHeader|nothing"
                />
 
 
                />
 
 

-<div metal:define-macro="top_bar">
+<div id="top_bar" metal:define-macro="top_bar">

        <table id="Masthead" cellspacing="0" border="0">
                <tr>
        <table id="Masthead" cellspacing="0" border="0">
                <tr>

-                       <td id="PortalLogo"><a href="#" tal:attributes="href string:${portal_url}?noajax=1; title portal_object/title_or_id"><img src="logo.gif" tal:define="logo here/logo.gif" tal:attributes="src logo/absolute_url; alt portal_object/title_or_id; height logo/height; width logo/width" /></a></td>
+                       <td id="PortalLogo"><a href="#" tal:attributes="href string:${portal_url}?noajax=1; title portal_object/title_or_id"><img src="logo.gif" tal:define="logo here/logo.png" tal:attributes="src logo/absolute_url; alt portal_object/title_or_id; height logo/height; width logo/width" /></a></td>

                        <!-- nav_bar / search_form -->
                        <!-- nav_bar / search_form -->

-                       <td id="NavBar" align="right" i18n:domain="cmf_default">
+                       <td id="NavBar" align="right" i18n:domain="cmf_default"
+          tal:condition="not:isAnon">

                                <form action="search" method="get" tal:attributes="action string:${portal_url}/search">
                                        <table>
                                                <tr><td><input name="SearchableText" size="16" /><input type="submit" value="Search" i18n:attributes="value" /></td></tr>
                                <form action="search" method="get" tal:attributes="action string:${portal_url}/search">
                                        <table>
                                                <tr><td><input name="SearchableText" size="16" /><input type="submit" value="Search" i18n:attributes="value" /></td></tr>


@@ -56,7 +57,8 @@ global specialCtxHeader options/specialCtxHeader|nothing"
 </div>
 
   
 </div>
 
   

-<div tal:define="uname python: (isAnon and [''] or [member.getMemberFullName(nameBefore=0)])[0]" metal:define-macro="user_menu_bar">
+<div id="user_menu_bar" metal:define-macro="user_menu_bar"
+     tal:define="uname python: (isAnon and [''] or [member.getMemberFullName(nameBefore=0)])[0]">

        <table id="MemberActionsBox" border="0" cellspacing="0" i18n:domain="cmf_default">
                <tr>
                        <td class="ActionTitle" tal:content="uname">Guest</td>
        <table id="MemberActionsBox" border="0" cellspacing="0" i18n:domain="cmf_default">
                <tr>
                        <td class="ActionTitle" tal:content="uname">Guest</td>


@@ -75,7 +77,7 @@ global specialCtxHeader options/specialCtxHeader|nothing"
 
 <div metal:define-macro="Breadcrumbs" tal:omit-tag="">
        <span tal:content="here/absolute_url" id="BC_Object_URL" style="display:none"></span>
 
 <div metal:define-macro="Breadcrumbs" tal:omit-tag="">
        <span tal:content="here/absolute_url" id="BC_Object_URL" style="display:none"></span>

-  <span i18n:translate="">You are here:</span> <span tal:omit-tag="" tal:repeat="bc options/breadcrumbs|here/breadcrumbs"><a href="." tal:attributes="href bc/url" tal:content="python:bc['title'] or bc['id']">ID</a><span tal:condition="not: repeat/bc/end" tal:omit-tag=""> <img src="fleche_bc.gif" alt="/" height="14" width="11" tal:attributes="src string:${portal_url}/fleche_bc.gif" border="0" /> </span> </span>
+  <span i18n:translate="">You are here:</span> <span tal:omit-tag="" tal:repeat="bc options/breadcrumbs|here/breadcrumbs"><a href="." tal:attributes="href bc/url" tal:content="python:bc['title'] or bc['id']" tal:omit-tag="not:bc/url">ID</a><span tal:condition="not: repeat/bc/end" tal:omit-tag=""> <img src="fleche_bc.gif" alt="/" height="14" width="11" tal:attributes="src string:${portal_url}/fleche_bc.gif" border="0" /> </span> </span>

 </div>
 
 
 </div>