From 97b0572c0f41683a532c90d25adf2ecb275c2698 Mon Sep 17 00:00:00 2001
From: rich <rich>
Date: Thu, 4 Nov 2004 22:18:46 +0000
Subject: [PATCH] Added favicon to most pages.  The quality of the Windows
 favicon.ico file is a bit rubbish because the transparency level didn't work
 too well.  Mozilla should use the PNG file which has 8 bit transparency.

Updated MANIFEST.

Updated deps.
---
 MANIFEST                   |   2 ++
 conf/cocanwiki.conf        |   5 +++--
 html/_graphics/favicon.png | Bin 0 -> 483 bytes
 html/favicon.ico           | Bin 0 -> 518 bytes
 scripts/.depend            |  12 ++++++++----
 templates/page.html        |   2 ++
 6 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 html/_graphics/favicon.png
 create mode 100644 html/favicon.ico

diff --git a/MANIFEST b/MANIFEST
index 96c645b..32ec9d5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -36,6 +36,7 @@ html/_graphics/cross.png
 html/_graphics/edit.png
 html/_graphics/error.png
 html/_graphics/external.png
+html/_graphics/favicon.png
 html/_graphics/file.png
 html/_graphics/files.png
 html/_graphics/home.png
@@ -60,6 +61,7 @@ html/_js/upload.js
 html/_js/visualise_links.js
 html/_js/wz_jsgraphics.js
 html/_static/markup.html
+html/favicon.ico
 html/robots.txt
 scripts/.cvsignore
 scripts/.depend
diff --git a/conf/cocanwiki.conf b/conf/cocanwiki.conf
index 4c0ae5a..d029e30 100644
--- a/conf/cocanwiki.conf
+++ b/conf/cocanwiki.conf
@@ -1,5 +1,5 @@
 # Apache configuration for COCANWIKI.
-# $Id: cocanwiki.conf,v 1.19 2004/11/02 18:47:54 rich Exp $
+# $Id: cocanwiki.conf,v 1.20 2004/11/04 22:18:47 rich Exp $
 
 # Uncomment the following lines if necessary.  You will probably need
 # to adjust the paths to reflect where cocanwiki is really installed.
@@ -48,7 +48,8 @@ ErrorDocument 500 /_bin/crash.cmo
 
 RewriteEngine on
 
-# The robots.txt file needs special treatment.
+# The favicon.ico and robots.txt files need special treatment.
+RewriteRule ^/favicon.ico /favicon.ico [PT,L]
 RewriteRule ^/robots.txt /robots.txt [PT,L]
 
 # Global scripts.
diff --git a/html/_graphics/favicon.png b/html/_graphics/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a1b4460abb975256dab60a1bfd7a00137580bc1
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-Ri1QrD?oysLG0000TbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAXI2&AV*0}Q14_VZU6uQSxH1eRCwB@(?3X-Q4|L7-~ITqsG$hjqoAB3X;K>Q
z)EG_;4&~4sG$gJ@5J3=u+0al!OF~3AxL%wqXwgL^nu0))1P#sW&=KC={638CbpAf~
zIrlu5|2(N*vKANc90RzUvJd|X@CifVe!;nv)n-knPjd&C8=<o}(XQ(Wkg{F=puCi_
zjdoo(ZtG$UXYej%E0KSOS7ASHup7j6ET#xN#hu7+VLWATYB7MX_=)o=+o{D(yoiVW
z%>dULtd8MzEo#bUYcY@YM)S+&==%&FVzM>fFHGYoe&7^tw>DQ(<Hg4?jGbtJ<G2<6
zY>d*0ZEWLx>a)f!p5P)@v5>NvLkX!CBSC)%SFwqYc#FxDE%yYd#UtE{+&WI9VhtyQ
z`h%3+|4T@<7{x>b_;bp3L%xd<JA$cN+&D;yS6co;4;wBW1TYsuf^YE?_s=xGhrJ!O
Z_5cnTW)RlrM1}wW002ovPDHLkV1kdI%8vj5

literal 0
HcmV?d00001

diff --git a/html/favicon.ico b/html/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5d81d1491491d3a9bd97a451c443bb8ced5bc635
GIT binary patch
literal 518
zcmZ9IF-`+95JkV^VjF~0QlNM%M46HziuV+pgEB>=7$POd;0heUQ3^_~u!svd-4<4c
zKfAbLR?jm#_P0kLFqoljXV6$0;DLEQpZ-5sKePA9+>(wMej0IHr)4_LI?325K8K;{
zy^@>cvQ2KV$ybVrJ26q@v=`}}NcPeLE&`Sp@PQ7vSpxS@z-k3-7A6kfO4hS~^bNHn
zE9?!Vco`#<U2&Yj<#C2OOR*^^Vw1@JB=UU}xx7;ws11^UCeAt=Z(j@+8-w-M#O>O|
z66|^KM;ZL|PMx7<eOvdgJJC?T=A<Rnua0$%|9<r+ppxmp&;Z3x9!H8^Ti}fs9`1lE
o`^7OUtc8|eekOfB1NoEtU)&4q(Mi?sY2}et3VW)l=)dZJ0arh|jsO4v

literal 0
HcmV?d00001

diff --git a/scripts/.depend b/scripts/.depend
index c12925f..d45740b 100644
--- a/scripts/.depend
+++ b/scripts/.depend
@@ -122,8 +122,10 @@ edit_host_css.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \
     lib/cocanwiki_strings.cmx 
 edit_host_css_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
 edit_host_css_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_template.cmx 
-edit_host_settings.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo 
-edit_host_settings.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx 
+edit_host_settings.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo \
+    lib/cocanwiki_strings.cmo 
+edit_host_settings.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \
+    lib/cocanwiki_strings.cmx 
 edit_host_settings_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
 edit_host_settings_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_template.cmx 
 edit_image.cmo: lib/cocanwiki.cmo lib/cocanwiki_emailnotify.cmo \
@@ -290,8 +292,10 @@ restore_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_diff.cmi \
     lib/cocanwiki_ok.cmo lib/cocanwiki_template.cmi 
 restore_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_diff.cmx \
     lib/cocanwiki_ok.cmx lib/cocanwiki_template.cmx 
-search.cmo: lib/cocanwiki.cmo 
-search.cmx: lib/cocanwiki.cmx 
+search.cmo: lib/cocanwiki.cmo lib/cocanwiki_date.cmo \
+    lib/cocanwiki_strings.cmo lib/cocanwiki_template.cmi lib/wikilib.cmi 
+search.cmx: lib/cocanwiki.cmx lib/cocanwiki_date.cmx \
+    lib/cocanwiki_strings.cmx lib/cocanwiki_template.cmx lib/wikilib.cmx 
 send_feedback.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo \
     lib/cocanwiki_template.cmi 
 send_feedback.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \
diff --git a/templates/page.html b/templates/page.html
index 0ef940e..926736f 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -9,6 +9,8 @@
 <link rel="alternate stylesheet" href="/_css/easytoread.css" type="text/css" title="High contrast, big fonts"/>
 ::if(has_host_css)::<link rel="stylesheet" href="/_global.css" type="text/css" title="Standard"/>::end::
 ::if(has_page_css)::<link rel="stylesheet" href="/::page_html_tag::/styles.css::if(is_old_version)::?version=::old_version::::end::" type="text/css" title="Standard"/>::end::
+<link rel="icon" href="/_graphics/favicon.png" type="image/png" />
+<link rel="SHORTCUT ICON" href="/favicon.ico" type="image/x-icon" />
 </head><body>
 
 <h1><span>::title_html::</span></h1>
-- 
1.8.3.1