From 55ca0003b7544cadfaca599be93ac1dc6bbc5ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Algrain?= <fxalgrain@tiolive.com> Date: Tue, 31 May 2011 11:20:38 +0200 Subject: [PATCH] Fix display consistency Transition message should be display under the page header Gadgets on home page should be forced to anonymous gadgets when this is required --- .../erp5_km_theme/WebSite_viewKnowledgePad.xml | 3 ++- .../erp5_km_theme/template_erp5_km_minimal.xml | 17 +++++++++-------- bt5/erp5_km/bt/revision | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewKnowledgePad.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewKnowledgePad.xml index 639ee81771..ddc06cfae0 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewKnowledgePad.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewKnowledgePad.xml @@ -68,7 +68,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <div tal:content="structure python: here.ERP5Site_viewHomeAreaRenderer(mode=\'web_front\', \n default_pad_group=\'\',\n create_default_pad=True, \n - make_security_check=True)"\n + make_security_check=True,\n + use_anonymous_knowledge_pad=context.getLayoutProperty(\'layout_force_anonymous_gadget\',False))"\n class="draggable_wrapper"/>\n </div>\n </tal:block>\n 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 d9bafad309..ec80fa953c 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 @@ -166,6 +166,13 @@ </div>\n \n <div id="center" class="center_fluid" tal:define="dummy python: request.set(\'editable_mode\', True)">\n + <!-- Headline Box -->\n + <tal:block tal:condition="python: layout_form is not None">\n + <tal:block tal:repeat="aggregate python: [(\'headline\', headline_area)]">\n + <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n + </tal:block>\n + </tal:block>\n +\n <!-- Splash Box -->\n <tal:block tal:condition="python: layout_form is not None\n and len(splash_area)\n @@ -175,16 +182,11 @@ </tal:block>\n </tal:block>\n \n - <!-- Headline Box -->\n + \n <!-- Layout form rendering -->\n <div id="km_left" \n tal:attributes="class python:\'alone\' * is_right_area_empty;\n id python:is_front_layout * \'km_front\' or \'km_left\'">\n - <tal:block tal:condition="python: layout_form is not None">\n - <tal:block tal:repeat="aggregate python: [(\'headline\', headline_area)]">\n - <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n - </tal:block>\n - </tal:block>\n <div id="master">\n <div id="main_content" tal:attributes="class python:(list_mode and \'list_mode\') or \'view_mode\'"\n tal:define="dummy python: request.set(\'editable_mode\', editable)">\n @@ -229,8 +231,7 @@ </tal:block>\n </tal:block>\n </body>\n -</html>\n - +</html> ]]></unicode> </value> </item> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index c7ecf2245a..02fa9676be 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1796 \ No newline at end of file +1797 \ No newline at end of file -- 2.30.9