summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 15:12:01 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 15:12:01 +0000
commitfa96eab12016e2f29a0a3522f1229039fbbf2c5e (patch)
tree1b64018645954c1666a51087afb2a7421b1a68fb
parent42973f687ca3a312303330b0ac50ef618a13381c (diff)
* Updated ikiwiki.svgz from Recai, includes an icon and is used to generate
a multi-resolution favicon.ico.
-rw-r--r--IkiWiki/Plugin/favicon.pm2
-rw-r--r--basewiki/favicon.icobin0 -> 22382 bytes
-rw-r--r--debian/changelog4
-rw-r--r--doc/logo.mdwn13
-rw-r--r--doc/logo/ikiwiki.svgzbin3818 -> 13891 bytes
-rw-r--r--doc/plugins/favicon.mdwn5
-rw-r--r--templates/editpage.tmpl2
-rw-r--r--templates/misc.tmpl2
-rw-r--r--templates/page.tmpl2
-rw-r--r--templates/recentchanges.tmpl2
10 files changed, 23 insertions, 9 deletions
diff --git a/IkiWiki/Plugin/favicon.pm b/IkiWiki/Plugin/favicon.pm
index 518d2c2ff..864131d1e 100644
--- a/IkiWiki/Plugin/favicon.pm
+++ b/IkiWiki/Plugin/favicon.pm
@@ -17,7 +17,7 @@ sub pagetemplate (@) { #{{{
my $template=$params{template};
if ($template->query(name => "favicon")) {
- $template->param(favicon => "favicon.png");
+ $template->param(favicon => "favicon.ico");
}
} # }}}
diff --git a/basewiki/favicon.ico b/basewiki/favicon.ico
new file mode 100644
index 000000000..cf1b5d3cb
--- /dev/null
+++ b/basewiki/favicon.ico
Binary files differ
diff --git a/debian/changelog b/debian/changelog
index f9d63df91..10a1feeec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,8 +44,10 @@ ikiwiki (1.27) UNRELEASED; urgency=low
* Version the libcgi-session-perl dependency, some features that need
the new version are used in some cases (sslcookie).
* Numerous tla fixes from Clint.
+ * Updated ikiwiki.svgz from Recai, includes an icon and is used to generate
+ a multi-resolution favicon.ico.
- -- Joey Hess <joeyh@debian.org> Fri, 15 Sep 2006 22:28:31 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 16 Sep 2006 10:30:35 -0400
ikiwiki (1.26) unstable; urgency=low
diff --git a/doc/logo.mdwn b/doc/logo.mdwn
index 87ff32a8f..55ce6e955 100644
--- a/doc/logo.mdwn
+++ b/doc/logo.mdwn
@@ -11,7 +11,18 @@ added).
[[SVG_source|ikiwiki.svgz]], can be used to generate a logo at any size
with a command like:
- `inkscape -z -D -w 90 -e ikiwiki.png ikiwiki.svgz`
+
+ inkscape -z -w 90 -i logo -e ikiwiki.png ikiwiki.svgz
+
+ The [[favicon.ico]] can also be generated from this file, as follows:
+
+ for s in 16 32 64; do
+ inkscape -z -w $s -i favicon -e favicon-$s.png ikiwiki.svgz
+ done
+ icotool -c -o favicon.ico favicon-*.png && rm -f favicon-*.png
+
+ Some other alternate icons are also included in the svg file and can
+ be extracted by specifying their names.
Contributed by Recai Oktaş
diff --git a/doc/logo/ikiwiki.svgz b/doc/logo/ikiwiki.svgz
index b4b7e6af4..b43ae9be2 100644
--- a/doc/logo/ikiwiki.svgz
+++ b/doc/logo/ikiwiki.svgz
Binary files differ
diff --git a/doc/plugins/favicon.mdwn b/doc/plugins/favicon.mdwn
index f301433fa..efa3b1535 100644
--- a/doc/plugins/favicon.mdwn
+++ b/doc/plugins/favicon.mdwn
@@ -2,5 +2,6 @@
[[tag type/chrome]]
If this plugin is enabled, then an icon link is added to pages, for web
-browsers to display. The icon is currently hardcoded to be a favicon.png,
-which must be in the root of the wiki.
+browsers to display. The icon is currently hardcoded to be a favicon.ico,
+which must be in the root of the wiki. The [[logo]] page explains how this
+icon was generated.
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 0bec3d6b2..a5c44dc4c 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
<TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/png" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-ico" />
</TMPL_IF>
</head>
<body>
diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index e48627393..b2a9eace8 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
<TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/png" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-ico" />
</TMPL_IF>
</head>
<body>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 746fa63ef..577b11a8e 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
<TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/png" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-ico" />
</TMPL_IF>
<TMPL_IF NAME="RSSLINK"><TMPL_VAR RSSLINK></TMPL_IF>
<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl
index d9eea14e7..ebd74a984 100644
--- a/templates/recentchanges.tmpl
+++ b/templates/recentchanges.tmpl
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
<TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/png" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-ico" />
</TMPL_IF>
</head>
<body>