From e2cf04f039e40f0d8ea4d0bd67485d0479aaf5d1 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Fri, 19 Feb 2010 08:57:33 +0000 Subject: [PATCH] follow up r32773 : make possible to use menu bar on small window, before, "Modules" and "Languages" goes below "My favourites" and become impossible to select. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32840 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../tiolive_base/navigation_box_render.xml | 10 +++++----- bt5/tiolive_base/bt/revision | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml index ced1fbef7b..17de109b2e 100644 --- a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml +++ b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml @@ -112,18 +112,18 @@ </fieldset>\n <span class="second">\n \n -<p id="tiologin"\n +<span id="tiologin"\n tal:condition="here/portal_membership/isAnonymousUser"><a href="#" id="link-login" \n tal:attributes="href string:${context_url}/login_form"\n - i18n:translate="" i18n:domain="ui">Login</a></p> \n + i18n:translate="" i18n:domain="ui">Login</a></span>\n \n -<p id="tiologin"\n +<span id="tiologin"\n tal:define="user_name python:here.portal_membership.getAuthenticatedMember().getUserName()"\n tal:condition="not:here/portal_membership/isAnonymousUser"><a href="#" id="link-login" \n tal:attributes="href string:${context_url}/logout"\n i18n:translate="" i18n:domain="ui">Logout</a>\n <img tal:attributes="src string:${context_url}/tiolive_base_image/icon-login.png" id=\'user-img\' alt=\'user\' />\n - <tal:block tal:replace="user_name">jp</tal:block></p> \n + <tal:block tal:replace="user_name">jp</tal:block></span>\n <fieldset id="fieldset-tiosearch"\n tal:define="search_default_text python:here.Base_translateString(\'Search\')">\n <input type="hidden" name="all_languages" value="1" />\n @@ -132,7 +132,7 @@ onfocus string:if (this.value==\'${search_default_text}\') this.value=\'\';"\n onfocus="this.value=\'\';"\n onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_viewQuickSearchResultList\');" />\n - <button type="submit" class="input-submit" value="" alt="Search"\n + <button type="submit" class="input-submit" value=""\n name="ERP5Site_viewQuickSearchResultList:method"/> \n </fieldset>\n </span>\n diff --git a/bt5/tiolive_base/bt/revision b/bt5/tiolive_base/bt/revision index eebd1d10b6..4b6f9c39e5 100644 --- a/bt5/tiolive_base/bt/revision +++ b/bt5/tiolive_base/bt/revision @@ -1 +1 @@ -61 \ No newline at end of file +64 \ No newline at end of file -- 2.30.9