Skip to content

erp5
erp5
Commit 83fbb652 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

* 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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 50 deletions
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/WebSection_getDocumentValue.xml
View file @ 83fbb652
......@@ -123,7 +123,6 @@ if len(web_page_list) == 0:\n
if len(web_page_list) == 0:\n
name_without_web_site = \'-\'.join(name.split(\'-\')[:-1])\n
if name_without_web_site:\n
name_without_web_site += \'%\'\n
# Search again without the website\n
web_page_list = portal_catalog(reference=name_without_web_site,\n
portal_type=valid_portal_type_list,\n
......@@ -136,7 +135,6 @@ if len(web_page_list) == 0:\n
if len(web_page_list) == 0:\n
name_without_portal_type = \'-\'.join(name.split(\'-\')[1:])\n
if name_without_portal_type:\n
name_without_portal_type = \'%\'+name_without_portal_type\n
# Search again without the portal_type\n
web_page_list = portal_catalog(reference=name_without_portal_type,\n
portal_type=valid_portal_type_list,\n
......@@ -149,7 +147,6 @@ 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
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
web_page_list = portal_catalog(reference=name_without_portal_type_and_web_site,\n
portal_type=valid_portal_type_list,\n
......@@ -162,7 +159,6 @@ 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
if name_without_web_site_and_view:\n
name_without_web_site_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
portal_type=valid_portal_type_list,\n
......@@ -246,7 +242,6 @@ return web_page\n
<string>len</string>
<string>_getitem_</string>
<string>name_without_web_site</string>
<string>_inplacevar_</string>
<string>name_without_portal_type</string>
<string>name_without_portal_type_and_web_site</string>
<string>name_without_web_site_and_view</string>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_captcha_layout/website_logo.xml
View file @ 83fbb652
......@@ -181,6 +181,10 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -216,7 +220,7 @@
<key> <string>default</string> </key>
<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>
</item>
......@@ -264,6 +268,10 @@
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value>
......@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -302,7 +307,7 @@
<key> <string>_text</string> </key>
<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>
</item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_citizen_form_layout/website_logo.xml
View file @ 83fbb652
......@@ -181,6 +181,10 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -216,7 +220,7 @@
<key> <string>default</string> </key>
<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>
</item>
......@@ -264,6 +268,10 @@
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value>
......@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -302,7 +307,7 @@
<key> <string>_text</string> </key>
<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>
</item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_citizen_workspace_layout/website_logo.xml
View file @ 83fbb652
......@@ -181,6 +181,10 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -216,7 +220,7 @@
<key> <string>default</string> </key>
<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>
</item>
......@@ -264,6 +268,10 @@
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value>
......@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -302,7 +307,7 @@
<key> <string>_text</string> </key>
<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>
</item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_dgid_agent_form_layout/website_logo.xml
View file @ 83fbb652
......@@ -181,6 +181,10 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -216,7 +220,7 @@
<key> <string>default</string> </key>
<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>
</item>
......@@ -264,6 +268,10 @@
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value>
......@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -302,7 +307,7 @@
<key> <string>_text</string> </key>
<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>
</item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_dgid_agent_workspace_layout/website_logo.xml
View file @ 83fbb652
......@@ -181,6 +181,10 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -216,7 +220,7 @@
<key> <string>default</string> </key>
<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>
</item>
......@@ -264,6 +268,10 @@
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value>
......@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -302,7 +307,7 @@
<key> <string>_text</string> </key>
<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>
</item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_help_layout/website_logo.xml
View file @ 83fbb652
......@@ -181,6 +181,10 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -216,7 +220,7 @@
<key> <string>default</string> </key>
<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>
</item>
......@@ -264,6 +268,10 @@
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string>text_area</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>ERP5 WebSite Logo</string> </value>
......@@ -289,11 +297,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -302,7 +307,7 @@
<key> <string>_text</string> </key>
<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>
</item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
View file @ 83fbb652
......@@ -41,7 +41,7 @@
<div>\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
<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
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
View file @ 83fbb652
......@@ -42,7 +42,7 @@
<div>\n
<a name="top"></a>\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
<tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
<a class="login" tal:attributes="href python:\'%s/EGov_viewLoginForm\' % context.getWebSiteValue().absolute_url()"\n
......
bt5/erp5_egov/bt/revision
View file @ 83fbb652
307
\ No newline at end of file
308
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7