Commit 83fbb652 authored by Fabien Morin's avatar Fabien Morin

* rename the erp5-website-logo.png into website-logo.png to be able to display

other logo than erp5 (like safi logo)
* remove uses of % in the search of the best help webpage : get the
corresponding page or get nothing (get a help page of another portal type is
useless)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23680 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 896ce77a
...@@ -123,7 +123,6 @@ if len(web_page_list) == 0:\n ...@@ -123,7 +123,6 @@ if len(web_page_list) == 0:\n
if len(web_page_list) == 0:\n if len(web_page_list) == 0:\n
name_without_web_site = \'-\'.join(name.split(\'-\')[:-1])\n name_without_web_site = \'-\'.join(name.split(\'-\')[:-1])\n
if name_without_web_site:\n if name_without_web_site:\n
name_without_web_site += \'%\'\n
# Search again without the website\n # Search again without the website\n
web_page_list = portal_catalog(reference=name_without_web_site,\n web_page_list = portal_catalog(reference=name_without_web_site,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
...@@ -136,7 +135,6 @@ if len(web_page_list) == 0:\n ...@@ -136,7 +135,6 @@ if len(web_page_list) == 0:\n
if len(web_page_list) == 0:\n if len(web_page_list) == 0:\n
name_without_portal_type = \'-\'.join(name.split(\'-\')[1:])\n name_without_portal_type = \'-\'.join(name.split(\'-\')[1:])\n
if name_without_portal_type:\n if name_without_portal_type:\n
name_without_portal_type = \'%\'+name_without_portal_type\n
# Search again without the portal_type\n # Search again without the portal_type\n
web_page_list = portal_catalog(reference=name_without_portal_type,\n web_page_list = portal_catalog(reference=name_without_portal_type,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
...@@ -149,7 +147,6 @@ if len(web_page_list) == 0:\n ...@@ -149,7 +147,6 @@ if len(web_page_list) == 0:\n
if len(web_page_list) == 0:\n if len(web_page_list) == 0:\n
name_without_portal_type_and_web_site = \'-\'.join(name.split(\'-\')[1:-1])\n name_without_portal_type_and_web_site = \'-\'.join(name.split(\'-\')[1:-1])\n
if name_without_portal_type_and_web_site:\n if name_without_portal_type_and_web_site:\n
name_without_portal_type_and_web_site = \'%\'+name_without_portal_type_and_web_site+\'%\'\n
# Search again without the portal_type and web_site\n # Search again without the portal_type and web_site\n
web_page_list = portal_catalog(reference=name_without_portal_type_and_web_site,\n web_page_list = portal_catalog(reference=name_without_portal_type_and_web_site,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
...@@ -162,7 +159,6 @@ if len(web_page_list) == 0:\n ...@@ -162,7 +159,6 @@ if len(web_page_list) == 0:\n
if len(web_page_list) == 0:\n if len(web_page_list) == 0:\n
name_without_web_site_and_view = \'-\'.join(name.split(\'-\')[:-2])\n name_without_web_site_and_view = \'-\'.join(name.split(\'-\')[:-2])\n
if name_without_web_site_and_view:\n if name_without_web_site_and_view:\n
name_without_web_site_and_view += \'%\'\n
# Search again without the portal_type and view\n # Search again without the portal_type and view\n
web_page_list = portal_catalog(reference=name_without_web_site_and_view,\n web_page_list = portal_catalog(reference=name_without_web_site_and_view,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
...@@ -246,7 +242,6 @@ return web_page\n ...@@ -246,7 +242,6 @@ return web_page\n
<string>len</string> <string>len</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>name_without_web_site</string> <string>name_without_web_site</string>
<string>_inplacevar_</string>
<string>name_without_portal_type</string> <string>name_without_portal_type</string>
<string>name_without_portal_type_and_web_site</string> <string>name_without_portal_type_and_web_site</string>
<string>name_without_web_site_and_view</string> <string>name_without_web_site_and_view</string>
......
...@@ -181,6 +181,10 @@ ...@@ -181,6 +181,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<a href="http://erp5.org"><img src="erp5-website-logo.png"/></a> <a href="http://erp5.org"><img src="website-logo.png"/></a>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -264,6 +268,10 @@ ...@@ -264,6 +268,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value> <value> <string>ERP5 WebSite Logo</string> </value>
...@@ -289,11 +297,8 @@ ...@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -302,7 +307,7 @@ ...@@ -302,7 +307,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: """<a href="%s" title="%s"><img src="erp5-website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId()) python: """<a href="%s" title="%s"><img src="website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId())
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -181,6 +181,10 @@ ...@@ -181,6 +181,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<a href="http://erp5.org"><img src="erp5-website-logo.png"/></a> <a href="http://erp5.org"><img src="website-logo.png"/></a>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -264,6 +268,10 @@ ...@@ -264,6 +268,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value> <value> <string>ERP5 WebSite Logo</string> </value>
...@@ -289,11 +297,8 @@ ...@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -302,7 +307,7 @@ ...@@ -302,7 +307,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: """<a href="%s" title="%s"><img src="erp5-website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId()) python: """<a href="%s" title="%s"><img src="website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId())
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -181,6 +181,10 @@ ...@@ -181,6 +181,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<a href="http://erp5.org"><img src="erp5-website-logo.png"/></a> <a href="http://erp5.org"><img src="website-logo.png"/></a>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -264,6 +268,10 @@ ...@@ -264,6 +268,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value> <value> <string>ERP5 WebSite Logo</string> </value>
...@@ -289,11 +297,8 @@ ...@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -302,7 +307,7 @@ ...@@ -302,7 +307,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: """<a href="%s" title="%s"><img src="erp5-website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId()) python: """<a href="%s" title="%s"><img src="website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId())
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -181,6 +181,10 @@ ...@@ -181,6 +181,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<a href="http://erp5.org"><img src="erp5-website-logo.png"/></a> <a href="http://erp5.org"><img src="website-logo.png"/></a>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -264,6 +268,10 @@ ...@@ -264,6 +268,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value> <value> <string>ERP5 WebSite Logo</string> </value>
...@@ -289,11 +297,8 @@ ...@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -302,7 +307,7 @@ ...@@ -302,7 +307,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: """<a href="%s" title="%s"><img src="erp5-website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId()) python: """<a href="%s" title="%s"><img src="website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId())
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -181,6 +181,10 @@ ...@@ -181,6 +181,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<a href="http://erp5.org"><img src="erp5-website-logo.png"/></a> <a href="http://erp5.org"><img src="website-logo.png"/></a>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -264,6 +268,10 @@ ...@@ -264,6 +268,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value> <value> <string>ERP5 WebSite Logo</string> </value>
...@@ -289,11 +297,8 @@ ...@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -302,7 +307,7 @@ ...@@ -302,7 +307,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: """<a href="%s" title="%s"><img src="erp5-website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId()) python: """<a href="%s" title="%s"><img src="website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId())
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -181,6 +181,10 @@ ...@@ -181,6 +181,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<a href="http://erp5.org"><img src="erp5-website-logo.png"/></a> <a href="http://erp5.org"><img src="website-logo.png"/></a>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -264,6 +268,10 @@ ...@@ -264,6 +268,10 @@
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value> <value> <string>ERP5 WebSite Logo</string> </value>
...@@ -289,11 +297,8 @@ ...@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -302,7 +307,7 @@ ...@@ -302,7 +307,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: """<a href="%s" title="%s"><img src="erp5-website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId()) python: """<a href="%s" title="%s"><img src="website-logo.png" alt="Web Site Logo"/></a>""" % (here.getWebSiteValue().absolute_url(), here.getWebSiteValue().getTitleOrId())
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div>\n <div>\n
<a name="top"></a>\n <a name="top"></a>\n
<div style="background-image: url(img/erp5-website-logo.png); background-repeat:no-repeat; height: 40px;padding-top: 20px; padding-left: 130px;">\n <div style="background-image: url(img/website-logo.png); background-repeat:no-repeat; height: 40px;padding-top: 20px; padding-left: 130px;">\n
<ul class="onleft">\n <ul class="onleft">\n
<li><tal:block i18n:translate="" i18n:domain="ui">Application Number</tal:block> : <span class="value"><tal:block tal:replace="here/getId"></tal:block></span></li>\n <li><tal:block i18n:translate="" i18n:domain="ui">Application Number</tal:block> : <span class="value"><tal:block tal:replace="here/getId"></tal:block></span></li>\n
<li><tal:block i18n:translate="" i18n:domain="ui">Status</tal:block> : <span class="value" tal:attributes="class python:\'%s_state\' % context.getValidationState()"><tal:block tal:replace="here/getTranslatedValidationStateTitle"/></span></li>\n <li><tal:block i18n:translate="" i18n:domain="ui">Status</tal:block> : <span class="value" tal:attributes="class python:\'%s_state\' % context.getValidationState()"><tal:block tal:replace="here/getTranslatedValidationStateTitle"/></span></li>\n
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div>\n <div>\n
<a name="top"></a>\n <a name="top"></a>\n
\n \n
<div style="background-image: url(img/erp5-website-logo.png); background-repeat:no-repeat; height: 40px;padding-top: 20px; padding-left: 130px;">\n <div style="background-image: url(img/website-logo.png); background-repeat:no-repeat; height: 40px;padding-top: 20px; padding-left: 130px;">\n
<span class="onright">\n <span class="onright">\n
<tal:block tal:condition="here/portal_membership/isAnonymousUser">\n <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
<a class="login" tal:attributes="href python:\'%s/EGov_viewLoginForm\' % context.getWebSiteValue().absolute_url()"\n <a class="login" tal:attributes="href python:\'%s/EGov_viewLoginForm\' % context.getWebSiteValue().absolute_url()"\n
......
307 308
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment