From d66eecafc4ddd78e452b0799a161dd8bfd682183 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Thu, 6 Mar 2014 23:26:31 +0100 Subject: [PATCH] moved 16x16 icons to their original locations for backwards compatibility --- lib/exe/css.php | 6 +++--- lib/images/fileicons/{16x16 => }/7z.png | Bin lib/images/fileicons/{16x16 => }/asm.png | Bin lib/images/fileicons/{16x16 => }/bash.png | Bin lib/images/fileicons/{16x16 => }/bz2.png | Bin lib/images/fileicons/{16x16 => }/c.png | Bin lib/images/fileicons/{16x16 => }/cc.png | Bin lib/images/fileicons/{16x16 => }/conf.png | Bin lib/images/fileicons/{16x16 => }/cpp.png | Bin lib/images/fileicons/{16x16 => }/csh.png | Bin lib/images/fileicons/{16x16 => }/css.png | Bin lib/images/fileicons/{16x16 => }/csv.png | Bin lib/images/fileicons/{16x16 => }/deb.png | Bin lib/images/fileicons/{16x16 => }/diff.png | Bin lib/images/fileicons/{16x16 => }/doc.png | Bin lib/images/fileicons/{16x16 => }/docx.png | Bin lib/images/fileicons/{16x16 => }/file.png | Bin lib/images/fileicons/{16x16 => }/gif.png | Bin lib/images/fileicons/{16x16 => }/gz.png | Bin lib/images/fileicons/{16x16 => }/h.png | Bin lib/images/fileicons/{16x16 => }/hpp.png | Bin lib/images/fileicons/{16x16 => }/htm.png | Bin lib/images/fileicons/{16x16 => }/html.png | Bin lib/images/fileicons/{16x16 => }/ico.png | Bin lib/images/fileicons/{16x16 => }/java.png | Bin lib/images/fileicons/{16x16 => }/jpeg.png | Bin lib/images/fileicons/{16x16 => }/jpg.png | Bin lib/images/fileicons/{16x16 => }/js.png | Bin lib/images/fileicons/{16x16 => }/json.png | Bin lib/images/fileicons/{16x16 => }/mp3.png | Bin lib/images/fileicons/{16x16 => }/mp4.png | Bin lib/images/fileicons/{16x16 => }/odc.png | Bin lib/images/fileicons/{16x16 => }/odf.png | Bin lib/images/fileicons/{16x16 => }/odg.png | Bin lib/images/fileicons/{16x16 => }/odi.png | Bin lib/images/fileicons/{16x16 => }/odp.png | Bin lib/images/fileicons/{16x16 => }/ods.png | Bin lib/images/fileicons/{16x16 => }/odt.png | Bin lib/images/fileicons/{16x16 => }/ogg.png | Bin lib/images/fileicons/{16x16 => }/ogv.png | Bin lib/images/fileicons/{16x16 => }/pas.png | Bin lib/images/fileicons/{16x16 => }/pdf.png | Bin lib/images/fileicons/{16x16 => }/pl.png | Bin lib/images/fileicons/{16x16 => }/png.png | Bin lib/images/fileicons/{16x16 => }/ppt.png | Bin lib/images/fileicons/{16x16 => }/pptx.png | Bin lib/images/fileicons/{16x16 => }/ps.png | Bin lib/images/fileicons/{16x16 => }/py.png | Bin lib/images/fileicons/{16x16 => }/rar.png | Bin lib/images/fileicons/{16x16 => }/rpm.png | Bin lib/images/fileicons/{16x16 => }/rtf.png | Bin lib/images/fileicons/{16x16 => }/sh.png | Bin lib/images/fileicons/{16x16 => }/swf.png | Bin lib/images/fileicons/{16x16 => }/sxc.png | Bin lib/images/fileicons/{16x16 => }/sxd.png | Bin lib/images/fileicons/{16x16 => }/sxi.png | Bin lib/images/fileicons/{16x16 => }/sxw.png | Bin lib/images/fileicons/{16x16 => }/tar.png | Bin lib/images/fileicons/{16x16 => }/tgz.png | Bin lib/images/fileicons/{16x16 => }/txt.png | Bin lib/images/fileicons/{16x16 => }/wav.png | Bin lib/images/fileicons/{16x16 => }/webm.png | Bin lib/images/fileicons/{16x16 => }/xls.png | Bin lib/images/fileicons/{16x16 => }/xlsx.png | Bin lib/images/fileicons/{16x16 => }/xml.png | Bin lib/images/fileicons/{16x16 => }/zip.png | Bin 66 files changed, 3 insertions(+), 3 deletions(-) rename lib/images/fileicons/{16x16 => }/7z.png (100%) rename lib/images/fileicons/{16x16 => }/asm.png (100%) rename lib/images/fileicons/{16x16 => }/bash.png (100%) rename lib/images/fileicons/{16x16 => }/bz2.png (100%) rename lib/images/fileicons/{16x16 => }/c.png (100%) rename lib/images/fileicons/{16x16 => }/cc.png (100%) rename lib/images/fileicons/{16x16 => }/conf.png (100%) rename lib/images/fileicons/{16x16 => }/cpp.png (100%) rename lib/images/fileicons/{16x16 => }/csh.png (100%) rename lib/images/fileicons/{16x16 => }/css.png (100%) rename lib/images/fileicons/{16x16 => }/csv.png (100%) rename lib/images/fileicons/{16x16 => }/deb.png (100%) rename lib/images/fileicons/{16x16 => }/diff.png (100%) rename lib/images/fileicons/{16x16 => }/doc.png (100%) rename lib/images/fileicons/{16x16 => }/docx.png (100%) rename lib/images/fileicons/{16x16 => }/file.png (100%) rename lib/images/fileicons/{16x16 => }/gif.png (100%) rename lib/images/fileicons/{16x16 => }/gz.png (100%) rename lib/images/fileicons/{16x16 => }/h.png (100%) rename lib/images/fileicons/{16x16 => }/hpp.png (100%) rename lib/images/fileicons/{16x16 => }/htm.png (100%) rename lib/images/fileicons/{16x16 => }/html.png (100%) rename lib/images/fileicons/{16x16 => }/ico.png (100%) rename lib/images/fileicons/{16x16 => }/java.png (100%) rename lib/images/fileicons/{16x16 => }/jpeg.png (100%) rename lib/images/fileicons/{16x16 => }/jpg.png (100%) rename lib/images/fileicons/{16x16 => }/js.png (100%) rename lib/images/fileicons/{16x16 => }/json.png (100%) rename lib/images/fileicons/{16x16 => }/mp3.png (100%) rename lib/images/fileicons/{16x16 => }/mp4.png (100%) rename lib/images/fileicons/{16x16 => }/odc.png (100%) rename lib/images/fileicons/{16x16 => }/odf.png (100%) rename lib/images/fileicons/{16x16 => }/odg.png (100%) rename lib/images/fileicons/{16x16 => }/odi.png (100%) rename lib/images/fileicons/{16x16 => }/odp.png (100%) rename lib/images/fileicons/{16x16 => }/ods.png (100%) rename lib/images/fileicons/{16x16 => }/odt.png (100%) rename lib/images/fileicons/{16x16 => }/ogg.png (100%) rename lib/images/fileicons/{16x16 => }/ogv.png (100%) rename lib/images/fileicons/{16x16 => }/pas.png (100%) rename lib/images/fileicons/{16x16 => }/pdf.png (100%) rename lib/images/fileicons/{16x16 => }/pl.png (100%) rename lib/images/fileicons/{16x16 => }/png.png (100%) rename lib/images/fileicons/{16x16 => }/ppt.png (100%) rename lib/images/fileicons/{16x16 => }/pptx.png (100%) rename lib/images/fileicons/{16x16 => }/ps.png (100%) rename lib/images/fileicons/{16x16 => }/py.png (100%) rename lib/images/fileicons/{16x16 => }/rar.png (100%) rename lib/images/fileicons/{16x16 => }/rpm.png (100%) rename lib/images/fileicons/{16x16 => }/rtf.png (100%) rename lib/images/fileicons/{16x16 => }/sh.png (100%) rename lib/images/fileicons/{16x16 => }/swf.png (100%) rename lib/images/fileicons/{16x16 => }/sxc.png (100%) rename lib/images/fileicons/{16x16 => }/sxd.png (100%) rename lib/images/fileicons/{16x16 => }/sxi.png (100%) rename lib/images/fileicons/{16x16 => }/sxw.png (100%) rename lib/images/fileicons/{16x16 => }/tar.png (100%) rename lib/images/fileicons/{16x16 => }/tgz.png (100%) rename lib/images/fileicons/{16x16 => }/txt.png (100%) rename lib/images/fileicons/{16x16 => }/wav.png (100%) rename lib/images/fileicons/{16x16 => }/webm.png (100%) rename lib/images/fileicons/{16x16 => }/xls.png (100%) rename lib/images/fileicons/{16x16 => }/xlsx.png (100%) rename lib/images/fileicons/{16x16 => }/xml.png (100%) rename lib/images/fileicons/{16x16 => }/zip.png (100%) diff --git a/lib/exe/css.php b/lib/exe/css.php index 128fd5389..cab7384b2 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -369,7 +369,7 @@ function css_filetypes(){ // default style echo '.mediafile {'; - echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/16x16/file.png) 0px 1px no-repeat;'; + echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/file.png) 0px 1px no-repeat;'; echo ' padding-left: 18px;'; echo ' padding-bottom: 1px;'; echo '}'; @@ -377,7 +377,7 @@ function css_filetypes(){ // additional styles when icon available // scan directory for all icons $exts = array(); - if($dh = opendir(DOKU_INC.'lib/images/fileicons/16x16')){ + if($dh = opendir(DOKU_INC.'lib/images/fileicons')){ while(false !== ($file = readdir($dh))){ if(preg_match('/([_\-a-z0-9]+(?:\.[_\-a-z0-9]+)*?)\.(png|gif)/i',$file,$match)){ $ext = strtolower($match[1]); @@ -392,7 +392,7 @@ function css_filetypes(){ foreach($exts as $ext=>$type){ $class = preg_replace('/[^_\-a-z0-9]+/','_',$ext); echo ".mf_$class {"; - echo ' background-image: url('.DOKU_BASE.'lib/images/fileicons/16x16/'.$ext.$type.')'; + echo ' background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.$type.')'; echo '}'; } } diff --git a/lib/images/fileicons/16x16/7z.png b/lib/images/fileicons/7z.png similarity index 100% rename from lib/images/fileicons/16x16/7z.png rename to lib/images/fileicons/7z.png diff --git a/lib/images/fileicons/16x16/asm.png b/lib/images/fileicons/asm.png similarity index 100% rename from lib/images/fileicons/16x16/asm.png rename to lib/images/fileicons/asm.png diff --git a/lib/images/fileicons/16x16/bash.png b/lib/images/fileicons/bash.png similarity index 100% rename from lib/images/fileicons/16x16/bash.png rename to lib/images/fileicons/bash.png diff --git a/lib/images/fileicons/16x16/bz2.png b/lib/images/fileicons/bz2.png similarity index 100% rename from lib/images/fileicons/16x16/bz2.png rename to lib/images/fileicons/bz2.png diff --git a/lib/images/fileicons/16x16/c.png b/lib/images/fileicons/c.png similarity index 100% rename from lib/images/fileicons/16x16/c.png rename to lib/images/fileicons/c.png diff --git a/lib/images/fileicons/16x16/cc.png b/lib/images/fileicons/cc.png similarity index 100% rename from lib/images/fileicons/16x16/cc.png rename to lib/images/fileicons/cc.png diff --git a/lib/images/fileicons/16x16/conf.png b/lib/images/fileicons/conf.png similarity index 100% rename from lib/images/fileicons/16x16/conf.png rename to lib/images/fileicons/conf.png diff --git a/lib/images/fileicons/16x16/cpp.png b/lib/images/fileicons/cpp.png similarity index 100% rename from lib/images/fileicons/16x16/cpp.png rename to lib/images/fileicons/cpp.png diff --git a/lib/images/fileicons/16x16/csh.png b/lib/images/fileicons/csh.png similarity index 100% rename from lib/images/fileicons/16x16/csh.png rename to lib/images/fileicons/csh.png diff --git a/lib/images/fileicons/16x16/css.png b/lib/images/fileicons/css.png similarity index 100% rename from lib/images/fileicons/16x16/css.png rename to lib/images/fileicons/css.png diff --git a/lib/images/fileicons/16x16/csv.png b/lib/images/fileicons/csv.png similarity index 100% rename from lib/images/fileicons/16x16/csv.png rename to lib/images/fileicons/csv.png diff --git a/lib/images/fileicons/16x16/deb.png b/lib/images/fileicons/deb.png similarity index 100% rename from lib/images/fileicons/16x16/deb.png rename to lib/images/fileicons/deb.png diff --git a/lib/images/fileicons/16x16/diff.png b/lib/images/fileicons/diff.png similarity index 100% rename from lib/images/fileicons/16x16/diff.png rename to lib/images/fileicons/diff.png diff --git a/lib/images/fileicons/16x16/doc.png b/lib/images/fileicons/doc.png similarity index 100% rename from lib/images/fileicons/16x16/doc.png rename to lib/images/fileicons/doc.png diff --git a/lib/images/fileicons/16x16/docx.png b/lib/images/fileicons/docx.png similarity index 100% rename from lib/images/fileicons/16x16/docx.png rename to lib/images/fileicons/docx.png diff --git a/lib/images/fileicons/16x16/file.png b/lib/images/fileicons/file.png similarity index 100% rename from lib/images/fileicons/16x16/file.png rename to lib/images/fileicons/file.png diff --git a/lib/images/fileicons/16x16/gif.png b/lib/images/fileicons/gif.png similarity index 100% rename from lib/images/fileicons/16x16/gif.png rename to lib/images/fileicons/gif.png diff --git a/lib/images/fileicons/16x16/gz.png b/lib/images/fileicons/gz.png similarity index 100% rename from lib/images/fileicons/16x16/gz.png rename to lib/images/fileicons/gz.png diff --git a/lib/images/fileicons/16x16/h.png b/lib/images/fileicons/h.png similarity index 100% rename from lib/images/fileicons/16x16/h.png rename to lib/images/fileicons/h.png diff --git a/lib/images/fileicons/16x16/hpp.png b/lib/images/fileicons/hpp.png similarity index 100% rename from lib/images/fileicons/16x16/hpp.png rename to lib/images/fileicons/hpp.png diff --git a/lib/images/fileicons/16x16/htm.png b/lib/images/fileicons/htm.png similarity index 100% rename from lib/images/fileicons/16x16/htm.png rename to lib/images/fileicons/htm.png diff --git a/lib/images/fileicons/16x16/html.png b/lib/images/fileicons/html.png similarity index 100% rename from lib/images/fileicons/16x16/html.png rename to lib/images/fileicons/html.png diff --git a/lib/images/fileicons/16x16/ico.png b/lib/images/fileicons/ico.png similarity index 100% rename from lib/images/fileicons/16x16/ico.png rename to lib/images/fileicons/ico.png diff --git a/lib/images/fileicons/16x16/java.png b/lib/images/fileicons/java.png similarity index 100% rename from lib/images/fileicons/16x16/java.png rename to lib/images/fileicons/java.png diff --git a/lib/images/fileicons/16x16/jpeg.png b/lib/images/fileicons/jpeg.png similarity index 100% rename from lib/images/fileicons/16x16/jpeg.png rename to lib/images/fileicons/jpeg.png diff --git a/lib/images/fileicons/16x16/jpg.png b/lib/images/fileicons/jpg.png similarity index 100% rename from lib/images/fileicons/16x16/jpg.png rename to lib/images/fileicons/jpg.png diff --git a/lib/images/fileicons/16x16/js.png b/lib/images/fileicons/js.png similarity index 100% rename from lib/images/fileicons/16x16/js.png rename to lib/images/fileicons/js.png diff --git a/lib/images/fileicons/16x16/json.png b/lib/images/fileicons/json.png similarity index 100% rename from lib/images/fileicons/16x16/json.png rename to lib/images/fileicons/json.png diff --git a/lib/images/fileicons/16x16/mp3.png b/lib/images/fileicons/mp3.png similarity index 100% rename from lib/images/fileicons/16x16/mp3.png rename to lib/images/fileicons/mp3.png diff --git a/lib/images/fileicons/16x16/mp4.png b/lib/images/fileicons/mp4.png similarity index 100% rename from lib/images/fileicons/16x16/mp4.png rename to lib/images/fileicons/mp4.png diff --git a/lib/images/fileicons/16x16/odc.png b/lib/images/fileicons/odc.png similarity index 100% rename from lib/images/fileicons/16x16/odc.png rename to lib/images/fileicons/odc.png diff --git a/lib/images/fileicons/16x16/odf.png b/lib/images/fileicons/odf.png similarity index 100% rename from lib/images/fileicons/16x16/odf.png rename to lib/images/fileicons/odf.png diff --git a/lib/images/fileicons/16x16/odg.png b/lib/images/fileicons/odg.png similarity index 100% rename from lib/images/fileicons/16x16/odg.png rename to lib/images/fileicons/odg.png diff --git a/lib/images/fileicons/16x16/odi.png b/lib/images/fileicons/odi.png similarity index 100% rename from lib/images/fileicons/16x16/odi.png rename to lib/images/fileicons/odi.png diff --git a/lib/images/fileicons/16x16/odp.png b/lib/images/fileicons/odp.png similarity index 100% rename from lib/images/fileicons/16x16/odp.png rename to lib/images/fileicons/odp.png diff --git a/lib/images/fileicons/16x16/ods.png b/lib/images/fileicons/ods.png similarity index 100% rename from lib/images/fileicons/16x16/ods.png rename to lib/images/fileicons/ods.png diff --git a/lib/images/fileicons/16x16/odt.png b/lib/images/fileicons/odt.png similarity index 100% rename from lib/images/fileicons/16x16/odt.png rename to lib/images/fileicons/odt.png diff --git a/lib/images/fileicons/16x16/ogg.png b/lib/images/fileicons/ogg.png similarity index 100% rename from lib/images/fileicons/16x16/ogg.png rename to lib/images/fileicons/ogg.png diff --git a/lib/images/fileicons/16x16/ogv.png b/lib/images/fileicons/ogv.png similarity index 100% rename from lib/images/fileicons/16x16/ogv.png rename to lib/images/fileicons/ogv.png diff --git a/lib/images/fileicons/16x16/pas.png b/lib/images/fileicons/pas.png similarity index 100% rename from lib/images/fileicons/16x16/pas.png rename to lib/images/fileicons/pas.png diff --git a/lib/images/fileicons/16x16/pdf.png b/lib/images/fileicons/pdf.png similarity index 100% rename from lib/images/fileicons/16x16/pdf.png rename to lib/images/fileicons/pdf.png diff --git a/lib/images/fileicons/16x16/pl.png b/lib/images/fileicons/pl.png similarity index 100% rename from lib/images/fileicons/16x16/pl.png rename to lib/images/fileicons/pl.png diff --git a/lib/images/fileicons/16x16/png.png b/lib/images/fileicons/png.png similarity index 100% rename from lib/images/fileicons/16x16/png.png rename to lib/images/fileicons/png.png diff --git a/lib/images/fileicons/16x16/ppt.png b/lib/images/fileicons/ppt.png similarity index 100% rename from lib/images/fileicons/16x16/ppt.png rename to lib/images/fileicons/ppt.png diff --git a/lib/images/fileicons/16x16/pptx.png b/lib/images/fileicons/pptx.png similarity index 100% rename from lib/images/fileicons/16x16/pptx.png rename to lib/images/fileicons/pptx.png diff --git a/lib/images/fileicons/16x16/ps.png b/lib/images/fileicons/ps.png similarity index 100% rename from lib/images/fileicons/16x16/ps.png rename to lib/images/fileicons/ps.png diff --git a/lib/images/fileicons/16x16/py.png b/lib/images/fileicons/py.png similarity index 100% rename from lib/images/fileicons/16x16/py.png rename to lib/images/fileicons/py.png diff --git a/lib/images/fileicons/16x16/rar.png b/lib/images/fileicons/rar.png similarity index 100% rename from lib/images/fileicons/16x16/rar.png rename to lib/images/fileicons/rar.png diff --git a/lib/images/fileicons/16x16/rpm.png b/lib/images/fileicons/rpm.png similarity index 100% rename from lib/images/fileicons/16x16/rpm.png rename to lib/images/fileicons/rpm.png diff --git a/lib/images/fileicons/16x16/rtf.png b/lib/images/fileicons/rtf.png similarity index 100% rename from lib/images/fileicons/16x16/rtf.png rename to lib/images/fileicons/rtf.png diff --git a/lib/images/fileicons/16x16/sh.png b/lib/images/fileicons/sh.png similarity index 100% rename from lib/images/fileicons/16x16/sh.png rename to lib/images/fileicons/sh.png diff --git a/lib/images/fileicons/16x16/swf.png b/lib/images/fileicons/swf.png similarity index 100% rename from lib/images/fileicons/16x16/swf.png rename to lib/images/fileicons/swf.png diff --git a/lib/images/fileicons/16x16/sxc.png b/lib/images/fileicons/sxc.png similarity index 100% rename from lib/images/fileicons/16x16/sxc.png rename to lib/images/fileicons/sxc.png diff --git a/lib/images/fileicons/16x16/sxd.png b/lib/images/fileicons/sxd.png similarity index 100% rename from lib/images/fileicons/16x16/sxd.png rename to lib/images/fileicons/sxd.png diff --git a/lib/images/fileicons/16x16/sxi.png b/lib/images/fileicons/sxi.png similarity index 100% rename from lib/images/fileicons/16x16/sxi.png rename to lib/images/fileicons/sxi.png diff --git a/lib/images/fileicons/16x16/sxw.png b/lib/images/fileicons/sxw.png similarity index 100% rename from lib/images/fileicons/16x16/sxw.png rename to lib/images/fileicons/sxw.png diff --git a/lib/images/fileicons/16x16/tar.png b/lib/images/fileicons/tar.png similarity index 100% rename from lib/images/fileicons/16x16/tar.png rename to lib/images/fileicons/tar.png diff --git a/lib/images/fileicons/16x16/tgz.png b/lib/images/fileicons/tgz.png similarity index 100% rename from lib/images/fileicons/16x16/tgz.png rename to lib/images/fileicons/tgz.png diff --git a/lib/images/fileicons/16x16/txt.png b/lib/images/fileicons/txt.png similarity index 100% rename from lib/images/fileicons/16x16/txt.png rename to lib/images/fileicons/txt.png diff --git a/lib/images/fileicons/16x16/wav.png b/lib/images/fileicons/wav.png similarity index 100% rename from lib/images/fileicons/16x16/wav.png rename to lib/images/fileicons/wav.png diff --git a/lib/images/fileicons/16x16/webm.png b/lib/images/fileicons/webm.png similarity index 100% rename from lib/images/fileicons/16x16/webm.png rename to lib/images/fileicons/webm.png diff --git a/lib/images/fileicons/16x16/xls.png b/lib/images/fileicons/xls.png similarity index 100% rename from lib/images/fileicons/16x16/xls.png rename to lib/images/fileicons/xls.png diff --git a/lib/images/fileicons/16x16/xlsx.png b/lib/images/fileicons/xlsx.png similarity index 100% rename from lib/images/fileicons/16x16/xlsx.png rename to lib/images/fileicons/xlsx.png diff --git a/lib/images/fileicons/16x16/xml.png b/lib/images/fileicons/xml.png similarity index 100% rename from lib/images/fileicons/16x16/xml.png rename to lib/images/fileicons/xml.png diff --git a/lib/images/fileicons/16x16/zip.png b/lib/images/fileicons/zip.png similarity index 100% rename from lib/images/fileicons/16x16/zip.png rename to lib/images/fileicons/zip.png -- GitLab