Commit c29dacb1 authored by Jérome Perrin's avatar Jérome Perrin

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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17091 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 45bf3f9f
<?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>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Image" module="OFS.Image"/>
<tuple/>
</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/x-ico</string> </value>
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAA
AEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wCegV8AzsCvALaghgDl3dQA8e3oAMKwmwCpj3EA
3NHFAPj18wDVyboAvKiQAMi4pQDr5t8Ar5Z6AKSJaQDi2c4A0sS0AJt9WgC5pIwA7unjAKyTdgCz
nYIAy7upAMWznwD6+PcA18y+AL6qlAD28/AAoINiAKaLbADTxrcA0MKxAJx/XADw6+YAqI1vAOTb
0gDBrpkAxrWhAOvk3QC3oYgAuKOKAMe3owCdgF4A0cOzAM/BsADKuqgAm35bALqljADs5t8AqI5v
AK6WegC4o4sAwa+ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAABMTExMTExMTExMTExMTExMTExMTMQklEiksExMTExMTExMTFAEH
HjMhJQITExMTExMTEyQFExMTExsRIhMTExMTExMTNhMTExMIARcTExMTExMTExMTExMTMBouExMT
ExMTExMTExMTEywaJRMTExMTExMTEw8TExMqASATExMTExMTExMFLTUDHQofExMTExMTExMTIDQN
Cy8QExMTExMTExMTEyYMExMTExMTExMTExMTExMPLRMTExMTExMTExMTExMTAgUTExMTExMTExMT
ExMTExMOMiMGFSgWExMTExMTExMTHBgrGScNBBMTExMTExMTExMTExMTExMTExMAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAA
ACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AnoFfAM6/rgDm3tYA
tZ+FAPPv6wDCsJsA2c7BAKmPcQC8qJAA7ejhAODXzACvlnoAyLekAPr49gCkiGgA08a3ALijiwD3
9PEAm31aAN3TxwCym4AA1sq8APDs5gC/q5UAxbSfAMq7qAChhWQA/Pv6AKeMbQDRw7MA6+XeAOjh
2QD18u4Aq5F0AK2UdwDi2c8A29HEAPj29AClimsA2My+ANXIuQDMvawA/v39AJ1/XQCfg2EAoodm
AO/q5AC0nYMA39XKAMCtlwDDsp0A8e3oAKiNbwCxmn4AvamSANDCsQDGtaEAzLyqAPv6+QCcflsA
9vPwAPTw7ADu6eMArpV5AN7UyQC5pIwAvqqTANLEtADHtqIA/v7+AP39/AD6+fcAn4JgAKCDYgD4
9fMA9/XyAKOHZwD08e4ApotrAKiOcADr5t8ArZV4ALSehADZzcAAvquUANbJuwDTxbYAyrqnAJt+
WwCdgF0A9fLvAPPw7ADw7OcAqI5vAPDr5gDm3tUA4tnOAN7VyQDZzsAAw7CbAMSynQDVyLoAyrqo
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUFBQUFBQUFBQUFBQUFBQUFBQUFBQU
FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUAhYzAx8a
EksUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFEQGAQFJUk8BD2cJFBQUFBQUFBQUFBQUFBQUFBQUFBRV
AQFABVoUFBA5LEkKFBQUFBQUFBQUFBQUFBQUFBQUFEUBXRwUFBQUFBQxSAFZFBQUFBQUFBQUFBQU
FBQUFBQUOAEzFBQUFBQUFBRFAUdUFBQUFBQUFBQUFBQUFBQUFBRfASMUFBQUFBQUFC4/ASIcFBQU
FBQUFBQUFBQUFBQUFBRNUBQUFBQUFBQUFGUBAUYUFBQUFBQUFBQUFBQUFBQUFBovFBQUFBQUFBQU
UwEBMBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQCSAEBJBQUFBQUFBQUFBQUFBQUFBQUFBQU
FBQUFBQUFBQwAQEKFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFCEBAWgUFBQUFBQUFBQUFBQU
FBQUFBQUFBQUFBQUFBQUXAEBOhQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFCgBAQEFFBQUFBQU
FBQUFBQUFBQUFBQUB1YUFBQUFBQUFwEBHU4UFBQUFBQUFBQUFBQUFBQUFBRXASpbFBQUWg5IAQEb
FBQUFBQUFBQUFBQUFBQUFBQUFDQdYxMMKylAAQEBJS0UFBQUFBQUFBQUFBQUFBQUFBQUNwFREiAd
AQFHGBkUFBQUFBQUFBQUFBQUFBQUFBQUFBQuR0QUFD0JQUoUFBQUFBQUFBQUFBQUFBQUFBQUFBQU
FBReWBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFEIhFBQUFBQUFBQUFBQUFBQUFBQUFBQU
FBQUFBQUFBQUOzwtFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBRDAQ0UFBQUFBQUFBQUFBQU
FBQUFBQUFBQUFBQUFBQUFB4BZhQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFCdkFBQUFBQU
FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUBD4IFWJhIWElMiYpEBQUFBQUFBQUFBQUFBQUFBQUFBQR
AQEBAQEBAQEBAQFVFBQUFBQUFBQUFBQUFBQUFBQUFDMBATxMP2ALMDUGXCc2FBQUFBQUFBQUFBQU
FBQUFBQUWkpaFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU
FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <long>3638</long> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> <tuple>
<tuple/> <string>Products.PageTemplates.ZopePageTemplate</string>
<string>ZopePageTemplate</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -120,6 +123,10 @@ IDEAS:\n ...@@ -120,6 +123,10 @@ IDEAS:\n
<tal:block tal:repeat="js js_list">\n <tal:block tal:repeat="js js_list">\n
<script tal:attributes="src js" type="text/javascript"></script>\n <script tal:attributes="src js" type="text/javascript"></script>\n
</tal:block>\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 </head>\n
<body>\n <body>\n
<form id="main_form"\n <form id="main_form"\n
......
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 2007-09-23 yo
* Remove the links to the favicon, as it breaks existing settings. * 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. * Ignore an error if form is None. This may happen when standard_error_message is called.
......
419 422
\ 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