From 0e336ca8d49c813f535e69d9e727aa58356d5197 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 6 Feb 2012 18:12:57 +0100 Subject: moved files to template hierarchy for merging with core --- lib/tpl/dokuwiki/images/apple-touch-icon.png | Bin 0 -> 17728 bytes lib/tpl/dokuwiki/images/bullet.png | Bin 0 -> 199 bytes lib/tpl/dokuwiki/images/closed.png | Bin 0 -> 165 bytes lib/tpl/dokuwiki/images/favicon.ico | Bin 0 -> 7406 bytes lib/tpl/dokuwiki/images/link_icon.gif | Bin 0 -> 942 bytes lib/tpl/dokuwiki/images/logo.png | Bin 0 -> 12212 bytes lib/tpl/dokuwiki/images/mail_icon.gif | Bin 0 -> 918 bytes lib/tpl/dokuwiki/images/open.png | Bin 0 -> 174 bytes lib/tpl/dokuwiki/images/pagetools-license.txt | 4 ++++ lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 0 -> 14507 bytes lib/tpl/dokuwiki/images/pagetools-sprite.xcf | Bin 0 -> 34257 bytes lib/tpl/dokuwiki/images/pagetools.xcf | Bin 0 -> 14393 bytes lib/tpl/dokuwiki/images/resizecol.png | Bin 0 -> 225 bytes lib/tpl/dokuwiki/images/search.png | Bin 0 -> 400 bytes lib/tpl/dokuwiki/images/toc-arrows.png | Bin 0 -> 322 bytes lib/tpl/dokuwiki/images/toc-bullet.png | Bin 0 -> 211 bytes lib/tpl/dokuwiki/images/windows.gif | Bin 0 -> 223 bytes 17 files changed, 4 insertions(+) create mode 100644 lib/tpl/dokuwiki/images/apple-touch-icon.png create mode 100644 lib/tpl/dokuwiki/images/bullet.png create mode 100644 lib/tpl/dokuwiki/images/closed.png create mode 100644 lib/tpl/dokuwiki/images/favicon.ico create mode 100644 lib/tpl/dokuwiki/images/link_icon.gif create mode 100644 lib/tpl/dokuwiki/images/logo.png create mode 100644 lib/tpl/dokuwiki/images/mail_icon.gif create mode 100644 lib/tpl/dokuwiki/images/open.png create mode 100644 lib/tpl/dokuwiki/images/pagetools-license.txt create mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.png create mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.xcf create mode 100644 lib/tpl/dokuwiki/images/pagetools.xcf create mode 100644 lib/tpl/dokuwiki/images/resizecol.png create mode 100644 lib/tpl/dokuwiki/images/search.png create mode 100644 lib/tpl/dokuwiki/images/toc-arrows.png create mode 100644 lib/tpl/dokuwiki/images/toc-bullet.png create mode 100644 lib/tpl/dokuwiki/images/windows.gif (limited to 'lib/tpl/dokuwiki/images') diff --git a/lib/tpl/dokuwiki/images/apple-touch-icon.png b/lib/tpl/dokuwiki/images/apple-touch-icon.png new file mode 100644 index 000000000..45fa4e7b0 Binary files /dev/null and b/lib/tpl/dokuwiki/images/apple-touch-icon.png differ diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png new file mode 100644 index 000000000..5da537443 Binary files /dev/null and b/lib/tpl/dokuwiki/images/bullet.png differ diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png new file mode 100644 index 000000000..3691ebc17 Binary files /dev/null and b/lib/tpl/dokuwiki/images/closed.png differ diff --git a/lib/tpl/dokuwiki/images/favicon.ico b/lib/tpl/dokuwiki/images/favicon.ico new file mode 100644 index 000000000..8b9616abb Binary files /dev/null and b/lib/tpl/dokuwiki/images/favicon.ico differ diff --git a/lib/tpl/dokuwiki/images/link_icon.gif b/lib/tpl/dokuwiki/images/link_icon.gif new file mode 100644 index 000000000..815ccb1b1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/link_icon.gif differ diff --git a/lib/tpl/dokuwiki/images/logo.png b/lib/tpl/dokuwiki/images/logo.png new file mode 100644 index 000000000..8b794dd64 Binary files /dev/null and b/lib/tpl/dokuwiki/images/logo.png differ diff --git a/lib/tpl/dokuwiki/images/mail_icon.gif b/lib/tpl/dokuwiki/images/mail_icon.gif new file mode 100644 index 000000000..50a87a9a0 Binary files /dev/null and b/lib/tpl/dokuwiki/images/mail_icon.gif differ diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png new file mode 100644 index 000000000..40ff129be Binary files /dev/null and b/lib/tpl/dokuwiki/images/open.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-license.txt b/lib/tpl/dokuwiki/images/pagetools-license.txt new file mode 100644 index 000000000..299624c62 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools-license.txt @@ -0,0 +1,4 @@ +Icon set: iPhone toolbar icons +Designer: TheWorkingGroup.ca +License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] +URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png new file mode 100644 index 000000000..a0f4036ff Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf new file mode 100644 index 000000000..07c1d83fb Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf differ diff --git a/lib/tpl/dokuwiki/images/pagetools.xcf b/lib/tpl/dokuwiki/images/pagetools.xcf new file mode 100644 index 000000000..034b39a42 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools.xcf differ diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png new file mode 100644 index 000000000..f0111507c Binary files /dev/null and b/lib/tpl/dokuwiki/images/resizecol.png differ diff --git a/lib/tpl/dokuwiki/images/search.png b/lib/tpl/dokuwiki/images/search.png new file mode 100644 index 000000000..2adfc7357 Binary files /dev/null and b/lib/tpl/dokuwiki/images/search.png differ diff --git a/lib/tpl/dokuwiki/images/toc-arrows.png b/lib/tpl/dokuwiki/images/toc-arrows.png new file mode 100644 index 000000000..9f441eb26 Binary files /dev/null and b/lib/tpl/dokuwiki/images/toc-arrows.png differ diff --git a/lib/tpl/dokuwiki/images/toc-bullet.png b/lib/tpl/dokuwiki/images/toc-bullet.png new file mode 100644 index 000000000..a6f0169c3 Binary files /dev/null and b/lib/tpl/dokuwiki/images/toc-bullet.png differ diff --git a/lib/tpl/dokuwiki/images/windows.gif b/lib/tpl/dokuwiki/images/windows.gif new file mode 100644 index 000000000..4f12acce1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/windows.gif differ -- cgit v1.2.3 From efba7aa366d89abfa91f142ff60fe2a33322307e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 04:17:14 +0000 Subject: improved closed item in sitemap for RTL languages --- lib/tpl/dokuwiki/images/closed-rtl.png | Bin 0 -> 170 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/closed-rtl.png (limited to 'lib/tpl/dokuwiki/images') diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png new file mode 100644 index 000000000..85ebd59e1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/closed-rtl.png differ -- cgit v1.2.3 From 0cec12dbebb29837b4bc322d5c1931cd79dc3848 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 10 Mar 2012 17:26:30 +0100 Subject: readded footer buttons from the old template as discussed at https://github.com/splitbrain/dokuwiki/pull/82#r419699 --- lib/tpl/dokuwiki/images/button-css.png | Bin 0 -> 299 bytes lib/tpl/dokuwiki/images/button-donate.gif | Bin 0 -> 187 bytes lib/tpl/dokuwiki/images/button-dw.png | Bin 0 -> 404 bytes lib/tpl/dokuwiki/images/button-php.gif | Bin 0 -> 207 bytes lib/tpl/dokuwiki/images/button-rss.png | Bin 0 -> 191 bytes lib/tpl/dokuwiki/images/button-xhtml.png | Bin 0 -> 321 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/button-css.png create mode 100644 lib/tpl/dokuwiki/images/button-donate.gif create mode 100644 lib/tpl/dokuwiki/images/button-dw.png create mode 100644 lib/tpl/dokuwiki/images/button-php.gif create mode 100644 lib/tpl/dokuwiki/images/button-rss.png create mode 100644 lib/tpl/dokuwiki/images/button-xhtml.png (limited to 'lib/tpl/dokuwiki/images') diff --git a/lib/tpl/dokuwiki/images/button-css.png b/lib/tpl/dokuwiki/images/button-css.png new file mode 100644 index 000000000..706325e1c Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-css.png differ diff --git a/lib/tpl/dokuwiki/images/button-donate.gif b/lib/tpl/dokuwiki/images/button-donate.gif new file mode 100644 index 000000000..bba284e21 Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-donate.gif differ diff --git a/lib/tpl/dokuwiki/images/button-dw.png b/lib/tpl/dokuwiki/images/button-dw.png new file mode 100644 index 000000000..97272d968 Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-dw.png differ diff --git a/lib/tpl/dokuwiki/images/button-php.gif b/lib/tpl/dokuwiki/images/button-php.gif new file mode 100644 index 000000000..19aefb08f Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-php.gif differ diff --git a/lib/tpl/dokuwiki/images/button-rss.png b/lib/tpl/dokuwiki/images/button-rss.png new file mode 100644 index 000000000..f2438043f Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-rss.png differ diff --git a/lib/tpl/dokuwiki/images/button-xhtml.png b/lib/tpl/dokuwiki/images/button-xhtml.png new file mode 100644 index 000000000..ec686442c Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-xhtml.png differ -- cgit v1.2.3 From 83112a8af043de8ff379b16483077b78ffe2204f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 10 Mar 2012 22:53:31 +0100 Subject: Build the pagetools sprite programatically with imagemagick This makes it easier to modify or extend the icons in the sprite. Just place the source files in the pagetools directory and run the build script. --- lib/tpl/dokuwiki/images/pagetools-build.sh | 56 +++++++++++++++++++++ lib/tpl/dokuwiki/images/pagetools-license.txt | 4 -- lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 14507 -> 10389 bytes lib/tpl/dokuwiki/images/pagetools-sprite.xcf | Bin 34257 -> 0 bytes lib/tpl/dokuwiki/images/pagetools/01_edit.png | Bin 0 -> 740 bytes lib/tpl/dokuwiki/images/pagetools/02_create.png | Bin 0 -> 808 bytes lib/tpl/dokuwiki/images/pagetools/03_draft.png | Bin 0 -> 828 bytes lib/tpl/dokuwiki/images/pagetools/04_show.png | Bin 0 -> 458 bytes lib/tpl/dokuwiki/images/pagetools/05_source.png | Bin 0 -> 753 bytes lib/tpl/dokuwiki/images/pagetools/06_revert.png | Bin 0 -> 752 bytes lib/tpl/dokuwiki/images/pagetools/07_revisions.png | Bin 0 -> 1144 bytes lib/tpl/dokuwiki/images/pagetools/08_backlink.png | Bin 0 -> 844 bytes lib/tpl/dokuwiki/images/pagetools/09_subscribe.png | Bin 0 -> 589 bytes lib/tpl/dokuwiki/images/pagetools/10_top.png | Bin 0 -> 465 bytes .../dokuwiki/images/pagetools/11_mediamanager.png | Bin 0 -> 441 bytes lib/tpl/dokuwiki/images/pagetools/12_back.png | Bin 0 -> 483 bytes lib/tpl/dokuwiki/images/pagetools/license.txt | 4 ++ 17 files changed, 60 insertions(+), 4 deletions(-) create mode 100755 lib/tpl/dokuwiki/images/pagetools-build.sh delete mode 100644 lib/tpl/dokuwiki/images/pagetools-license.txt delete mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.xcf create mode 100644 lib/tpl/dokuwiki/images/pagetools/01_edit.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/02_create.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/03_draft.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/04_show.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/05_source.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/06_revert.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/07_revisions.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/08_backlink.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/09_subscribe.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/10_top.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/12_back.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/license.txt (limited to 'lib/tpl/dokuwiki/images') diff --git a/lib/tpl/dokuwiki/images/pagetools-build.sh b/lib/tpl/dokuwiki/images/pagetools-build.sh new file mode 100755 index 000000000..202e222e9 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools-build.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# +# This script generates a sprite from the unprocessed toolbar icons by combining them +# and overlaying a color layer for the active state +# +# The final sprite is optimized with optipng +# +# The script currently expects a Linux system with current versions of the imagemagick +# and optipng binaries in the path +# +# @author Andreas Gohr + +OUT=`dirname $0` +IN="$OUT/pagetools" + +if [ ! -d "$IN" ]; then + echo "Input folder $IN not found" + exit 1 +fi + +if [ -z "$TEMP" ]; then + TEMP="/tmp" +fi + +if [ ! -d "$TEMP" ]; then + echo "No temp directory available" + exit 1 +fi + +# add up all images twice +montage `for X in $IN/*.png; do echo -n "$X $X "; done` -background transparent -tile 1x -geometry 30x45 -gravity north $TEMP/icons.png + +# darken the image +convert $TEMP/icons.png \( +clone -fill '#cccccc' -colorize 100% \) -compose multiply -composite $TEMP/darkicons.png + +# create the mask to highlight an active icon +convert -size 30x30 xc:'#2b73b7' -gamma 0.7 $TEMP/active.png + +# create the full mask +montage `for X in $IN/*.png; do echo -n "$TEMP/active.png "; done` -background transparent -tile 1x -geometry 30x60+0+15 -gravity south $TEMP/activemask.png + +# apply mask +convert $TEMP/darkicons.png $TEMP/activemask.png \ +\( -clone 0 -alpha extract \) \ +\( -clone 0 -clone 1 -compose overlay -composite \) \ +-delete 0,1 +swap -alpha off -compose copy_opacity -composite $OUT/pagetools-sprite.png + +# optimize final sprite +optipng -o5 $OUT/pagetools-sprite.png + +# remove temporary images +rm -f $TEMP/icons.png +rm -f $TEMP/darkicons.png +rm -f $TEMP/active.png +rm -f $TEMP/activemask.png + diff --git a/lib/tpl/dokuwiki/images/pagetools-license.txt b/lib/tpl/dokuwiki/images/pagetools-license.txt deleted file mode 100644 index 299624c62..000000000 --- a/lib/tpl/dokuwiki/images/pagetools-license.txt +++ /dev/null @@ -1,4 +0,0 @@ -Icon set: iPhone toolbar icons -Designer: TheWorkingGroup.ca -License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] -URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png index a0f4036ff..0e8b4a9bf 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf deleted file mode 100644 index 07c1d83fb..000000000 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/pagetools/01_edit.png b/lib/tpl/dokuwiki/images/pagetools/01_edit.png new file mode 100644 index 000000000..ad4a737d8 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/01_edit.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/02_create.png b/lib/tpl/dokuwiki/images/pagetools/02_create.png new file mode 100644 index 000000000..e4fc5d3b1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/02_create.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/03_draft.png b/lib/tpl/dokuwiki/images/pagetools/03_draft.png new file mode 100644 index 000000000..a13d8c3b4 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/03_draft.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/04_show.png b/lib/tpl/dokuwiki/images/pagetools/04_show.png new file mode 100644 index 000000000..6f64b1bd1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/04_show.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/05_source.png b/lib/tpl/dokuwiki/images/pagetools/05_source.png new file mode 100644 index 000000000..bcc4fa21f Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/05_source.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/06_revert.png b/lib/tpl/dokuwiki/images/pagetools/06_revert.png new file mode 100644 index 000000000..7b8457e5e Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/06_revert.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/07_revisions.png b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png new file mode 100644 index 000000000..d918bce05 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/08_backlink.png b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png new file mode 100644 index 000000000..2c0823a72 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png new file mode 100644 index 000000000..30e039dbc Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/10_top.png b/lib/tpl/dokuwiki/images/pagetools/10_top.png new file mode 100644 index 000000000..e4bf1d49d Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/10_top.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png new file mode 100644 index 000000000..36116802f Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/12_back.png b/lib/tpl/dokuwiki/images/pagetools/12_back.png new file mode 100644 index 000000000..d154651ec Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/12_back.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/license.txt b/lib/tpl/dokuwiki/images/pagetools/license.txt new file mode 100644 index 000000000..299624c62 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools/license.txt @@ -0,0 +1,4 @@ +Icon set: iPhone toolbar icons +Designer: TheWorkingGroup.ca +License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] +URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ -- cgit v1.2.3 From d43eb44110dd836cad0da96d1f027260c2581d89 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 11 Mar 2012 10:48:29 +0100 Subject: Another go at building the pagetool sprite with a script This time PHP and libGD is used so it should work on Windows as well. The image quality is much better this time and the active highlight color is read directly from the template's style.ini --- lib/tpl/dokuwiki/images/pagetools-build.php | 121 +++++++++++++++++++++++++++ lib/tpl/dokuwiki/images/pagetools-build.sh | 56 ------------- lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 10389 -> 8178 bytes lib/tpl/dokuwiki/images/pagetools.xcf | Bin 14393 -> 0 bytes 4 files changed, 121 insertions(+), 56 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/pagetools-build.php delete mode 100755 lib/tpl/dokuwiki/images/pagetools-build.sh delete mode 100644 lib/tpl/dokuwiki/images/pagetools.xcf (limited to 'lib/tpl/dokuwiki/images') diff --git a/lib/tpl/dokuwiki/images/pagetools-build.php b/lib/tpl/dokuwiki/images/pagetools-build.php new file mode 100644 index 000000000..1b7262ad5 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools-build.php @@ -0,0 +1,121 @@ + + * @todo Maybe add some more error checking + */ +$GAMMA = 0.8; +$OPTIPNG = '/usr/bin/optipng'; + +// load input images +$input = glob('pagetools/*.png'); +sort($input); +$cnt = count($input); +if(!$cnt){ + die("No input images found. This script needs to be called from within the image directory!\n"); +} + +// create destination image +$DST = imagecreatetruecolor(30,$cnt*45*2); +imagesavealpha($DST, true); +$C_trans = imagecolorallocatealpha($DST, 0, 0, 0, 127); +imagefill($DST, 0, 0, $C_trans); + +// load highlight color from style.ini +$ini = parse_ini_file('../style.ini',true); +$COLOR = hex2rgb($ini['replacements']['__link__']); +$C_active = imagecolorallocate($DST, $COLOR['r'],$COLOR['g'],$COLOR['b']); + +// add all the icons to the sprite image +for($i=0; $i<$cnt; $i++){ + $base = $i*90; + + $IN = imagecreatefrompng($input[$i]); + imagesavealpha($IN, true); + imagecolorscale($IN,$GAMMA); + imagecopy($DST,$IN, 0,$base, 0,0, 30,30); + imagedestroy($IN); + + $IN = imagecreatefrompng($input[$i]); + imagesavealpha($IN, true); + imagecolorscale($IN,$GAMMA); + imagecopy($DST,$IN, 0,$base+45, 0,0, 30,30); + imagedestroy($IN); + + imagelayereffect($DST, IMG_EFFECT_OVERLAY); + imagefilledrectangle($DST, 0,$base+45, 30,$base+45+30, $C_active); + imagelayereffect($DST, IMG_EFFECT_NORMAL); +} + +// output sprite +imagepng($DST,'pagetools-sprite.png'); +imagedestroy($DST); + +// optimize if possible +if(is_executable($OPTIPNG)){ + system("$OPTIPNG -o5 'pagetools-sprite.png'"); +} + +/** + * Convert a hex color code to an rgb array + */ +function hex2rgb($hex) { + // strip hash + $hex = str_replace('#', '', $hex); + + // normalize short codes + if(strlen($hex) == 3){ + $hex = substr($hex,0,1). + substr($hex,0,1). + substr($hex,1,1). + substr($hex,1,1). + substr($hex,2,1). + substr($hex,2,1); + } + + // calc rgb + return array( + 'r' => hexdec(substr($hex, 0, 2)), + 'g' => hexdec(substr($hex, 2, 2)), + 'b' => hexdec(substr($hex, 4, 2)) + ); +} + +/** + * Scale (darken/lighten) a given image + * + * @param ressource $img The truetype GD image to work on + * @param float $scale Scale the colors by this value ( <1 darkens, >1 lightens) + */ +function imagecolorscale(&$img, $scale){ + $w = imagesx($img); + $h = imagesy($img); + + imagealphablending($img, false); + for($x = 0; $x < $w; $x++){ + for($y = 0; $y < $h; $y++){ + $rgba = imagecolorat($img, $x, $y); + $a = ($rgba >> 24) & 0xFF; + $r = ($rgba >> 16) & 0xFF; + $g = ($rgba >> 8) & 0xFF; + $b = $rgba & 0xFF; + + $r = max(min(round($r*$scale),255),0); + $g = max(min(round($g*$scale),255),0); + $b = max(min(round($b*$scale),255),0); + + $color = imagecolorallocatealpha($img, $r, $g, $b, $a); + imagesetpixel($img, $x, $y, $color); + } + } + imagealphablending($img, true); +} + diff --git a/lib/tpl/dokuwiki/images/pagetools-build.sh b/lib/tpl/dokuwiki/images/pagetools-build.sh deleted file mode 100755 index 202e222e9..000000000 --- a/lib/tpl/dokuwiki/images/pagetools-build.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# This script generates a sprite from the unprocessed toolbar icons by combining them -# and overlaying a color layer for the active state -# -# The final sprite is optimized with optipng -# -# The script currently expects a Linux system with current versions of the imagemagick -# and optipng binaries in the path -# -# @author Andreas Gohr - -OUT=`dirname $0` -IN="$OUT/pagetools" - -if [ ! -d "$IN" ]; then - echo "Input folder $IN not found" - exit 1 -fi - -if [ -z "$TEMP" ]; then - TEMP="/tmp" -fi - -if [ ! -d "$TEMP" ]; then - echo "No temp directory available" - exit 1 -fi - -# add up all images twice -montage `for X in $IN/*.png; do echo -n "$X $X "; done` -background transparent -tile 1x -geometry 30x45 -gravity north $TEMP/icons.png - -# darken the image -convert $TEMP/icons.png \( +clone -fill '#cccccc' -colorize 100% \) -compose multiply -composite $TEMP/darkicons.png - -# create the mask to highlight an active icon -convert -size 30x30 xc:'#2b73b7' -gamma 0.7 $TEMP/active.png - -# create the full mask -montage `for X in $IN/*.png; do echo -n "$TEMP/active.png "; done` -background transparent -tile 1x -geometry 30x60+0+15 -gravity south $TEMP/activemask.png - -# apply mask -convert $TEMP/darkicons.png $TEMP/activemask.png \ -\( -clone 0 -alpha extract \) \ -\( -clone 0 -clone 1 -compose overlay -composite \) \ --delete 0,1 +swap -alpha off -compose copy_opacity -composite $OUT/pagetools-sprite.png - -# optimize final sprite -optipng -o5 $OUT/pagetools-sprite.png - -# remove temporary images -rm -f $TEMP/icons.png -rm -f $TEMP/darkicons.png -rm -f $TEMP/active.png -rm -f $TEMP/activemask.png - diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png index 0e8b4a9bf..bbd7fd361 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools.xcf b/lib/tpl/dokuwiki/images/pagetools.xcf deleted file mode 100644 index 034b39a42..000000000 Binary files a/lib/tpl/dokuwiki/images/pagetools.xcf and /dev/null differ -- cgit v1.2.3 From 42ff673048d169bcbec5e4bb17619d66e6f6f61d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 25 Mar 2012 14:41:39 +0100 Subject: fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447) * removed all occurrences of '-moz-linear-gradient' * added SVG as fallback for Firefox, IE9 and other browsers to page background and buttons --- lib/tpl/dokuwiki/images/page-background.svg | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/tpl/dokuwiki/images/page-background.svg (limited to 'lib/tpl/dokuwiki/images') diff --git a/lib/tpl/dokuwiki/images/page-background.svg b/lib/tpl/dokuwiki/images/page-background.svg new file mode 100644 index 000000000..086341ddf --- /dev/null +++ b/lib/tpl/dokuwiki/images/page-background.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file -- cgit v1.2.3