From: rich Date: Thu, 4 Nov 2004 22:18:46 +0000 (+0000) Subject: Added favicon to most pages. The quality of the Windows favicon.ico X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=97b0572c0f41683a532c90d25adf2ecb275c2698;p=cocanwiki.git 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. --- 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 0000000..7a1b446 Binary files /dev/null and b/html/_graphics/favicon.png differ diff --git a/html/favicon.ico b/html/favicon.ico new file mode 100644 index 0000000..5d81d14 Binary files /dev/null and b/html/favicon.ico differ 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 @@ ::if(has_host_css)::::end:: ::if(has_page_css)::::end:: + +

::title_html::