[Erp5-report] r17090 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Oct 22 14:43:14 CEST 2007
Author: jerome
Date: Mon Oct 22 14:43:13 2007
New Revision: 17090
URL: http://svn.erp5.org?rev=17090&view=rev
Log:
2007-10-22 jerome
* Restore link to favicon, directly as favicon.ico, not in /images. This way, if a favicon.ico already exists, it will have priority.
Added:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/favicon.ico.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/template_tool_id_list
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
Added: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/favicon.ico.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/favicon.ico.xml?rev=17090&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/favicon.ico.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/favicon.ico.xml Mon Oct 22 14:43:13 2007
@@ -1,0 +1,69 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>OFS.Image</string>
+ <string>Image</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_EtagSupport__etag</string> </key>
+ <value> <string>ts90540175.03</string> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string>favicon.ico</string> </value>
+ </item>
+ <item>
+ <key> <string>content_type</string> </key>
+ <value> <string>image/png</string> </value>
+ </item>
+ <item>
+ <key> <string>data</string> </key>
+ <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
+WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1woUDxkNuMnMxgAAABl0RVh0Q29tbWVudABDcmVhdGVk
+IHdpdGggR0lNUFeBDhcAAAFvSURBVDjLpZPPS8JwGMafzS2lmLXRUhITLDLIeVA6mIV4CAKpUxD0
+N/QvBJ06dOvcpWN/QacuUWfNEBHNzB+byso0ElO31aFTztqo9/h+Hz4878P3IfYOTj/wj6F+elgV
+5sGzDPqKAkXRQJIEKAuJUr2JdEE0BsTXBAAErDQFkiQwUFT0BypS+aqxA5qyoNPt4+jswvAEctTS
+xbMoSk+mMhgJ8Dg5FET57yHOOTlc3+YRjwjgWQbNdgdXyRzab11zDtwODmFhHpLcQqfbw2bYj+P9
+HXD2CZ3WIkS3D4eXlcYLblJ51J9fkSnWIMotxEI+kASBu/uqsYPH2vcA0wUR770BXDxr7oThUTUN
+APAgycaAaHBRJ5ph7bBZaZ19HYCfYhAJLOhEW+sBJHMV5MqN3wFuB4tl7yxiIR9sYzR4lsHuxgqm
+JxmcnF9C0/S9I4bbGFzyIOz3ghm3odz4Kk6mKEFRNXMfKZEtIZEtma7zJ/IDe8w7zbzrAAAAAElF
+TkSuQmCC</string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <int>16</int> </value>
+ </item>
+ <item>
+ <key> <string>precondition</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <int>519</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <int>16</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml?rev=17090&r1=17089&r2=17090&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml Mon Oct 22 14:43:13 2007
@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
- <tuple/>
+ <tuple>
+ <string>Products.PageTemplates.ZopePageTemplate</string>
+ <string>ZopePageTemplate</string>
+ </tuple>
+ <none/>
</tuple>
</pickle>
<pickle>
@@ -120,6 +123,10 @@
<tal:block tal:repeat="js js_list">\n
<script tal:attributes="src js" type="text/javascript"></script>\n
</tal:block>\n
+\n
+ <link rel="icon" tal:attributes="href string:${portal/portal_url}/favicon.ico" type="image/x-icon"/>\n
+ <link rel="shortcut icon" tal:attributes="href string:${portal/portal_url}/favicon.ico" type="image/x-icon"/>\n
+\n
</head>\n
<body>\n
<form id="main_form"\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=17090&r1=17089&r2=17090&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Mon Oct 22 14:43:13 2007
@@ -1,3 +1,6 @@
+2007-10-22 jerome
+* Restore link to favicon, directly as favicon.ico, not in /images. This way, if a favicon.ico already exists, it will have priority.
+
2007-09-23 yo
* Remove the links to the favicon, as it breaks existing settings.
* Ignore an error if form is None. This may happen when standard_error_message is called.
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=17090&r1=17089&r2=17090&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Mon Oct 22 14:43:13 2007
@@ -1,1 +1,1 @@
-419
+422
Added: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/template_tool_id_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/template_tool_id_list?rev=17090&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list