projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42973f6)
* Updated ikiwiki.svgz from Recai, includes an icon and is used to generate
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sat, 16 Sep 2006 15:12:01 +0000 (15:12 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sat, 16 Sep 2006 15:12:01 +0000 (15:12 +0000)
  a multi-resolution favicon.ico.

IkiWiki/Plugin/favicon.pm patch | blob | history
basewiki/favicon.ico [new file with mode: 0644] patch | blob
debian/changelog patch | blob | history
doc/logo.mdwn patch | blob | history
doc/logo/ikiwiki.svgz patch | blob | history
doc/plugins/favicon.mdwn patch | blob | history
templates/editpage.tmpl patch | blob | history
templates/misc.tmpl patch | blob | history
templates/page.tmpl patch | blob | history
templates/recentchanges.tmpl patch | blob | history

diff --git a/IkiWiki/Plugin/favicon.pm b/IkiWiki/Plugin/favicon.pm
index 518d2c2ff4f26ed13da55b5f73634ff0e050197c..864131d1e128ce5d1b84776a945d1ba9c6f89a1f 100644 (file)
--- 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 (file)
index 0000000..cf1b5d3
Binary files /dev/null and b/basewiki/favicon.ico differ
diff --git a/debian/changelog b/debian/changelog
index f9d63df9127bc93aaab3218b2272dd768dafb82a..10a1feeec747916afdac105b07d7bc6456a89614 100644 (file)
--- 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 87ff32a8fa7f47992fc7f0aea35d42320264e671..55ce6e9558856c35ee5d40b91af5087bc2efa505 100644 (file)
--- 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 b4b7e6af4af264db861f839bdf654edd7b2b0400..b43ae9be2b37d9b8ca4ddbb9f4717c9b7e50d83e 100644 (file)
Binary files a/doc/logo/ikiwiki.svgz and b/doc/logo/ikiwiki.svgz differ
diff --git a/doc/plugins/favicon.mdwn b/doc/plugins/favicon.mdwn
index f301433fa9030ed3add3b3c1dfb7cdf2dbc5232e..efa3b1535caeadd197f7b993bcc1197bace96392 100644 (file)
--- 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 0bec3d6b2653e172364bb122113ece3608753900..a5c44dc4c650b765ef7f00fc8ef4c381cf33494c 100644 (file)
--- 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 e48627393cda72c8c5c590c2fc41c49d09e87b81..b2a9eace8ef4f82ca49ce43c46811cc5b5da255c 100644 (file)
--- 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 746fa63ef2d182fa5354c77c2812b4c403c5cb12..577b11a8eea05df50ddae94e5e8cc65b33bcb299 100644 (file)
--- 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 d9eea14e789a4f29901b403dcc5edeb274dab349..ebd74a984d44cc4e0ecbdca8dbe098079eaa7a4f 100644 (file)
--- 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>
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.