diff options
Diffstat (limited to 'lib')
163 files changed, 263 insertions, 60 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php index cab7384b2..ab5c03f0e 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -56,7 +56,7 @@ function css_out(){ } // cache influencers - $tplinc = tpl_basedir($tpl); + $tplinc = tpl_incdir($tpl); $cache_files = getConfigFiles('main'); $cache_files[] = $tplinc.'style.ini'; $cache_files[] = $tplinc.'style.local.ini'; // @deprecated diff --git a/lib/images/fileicons/32x32/7z.png b/lib/images/fileicons/32x32/7z.png Binary files differnew file mode 100644 index 000000000..9ba7da94a --- /dev/null +++ b/lib/images/fileicons/32x32/7z.png diff --git a/lib/images/fileicons/32x32/asm.png b/lib/images/fileicons/32x32/asm.png Binary files differnew file mode 100644 index 000000000..f1a1f322b --- /dev/null +++ b/lib/images/fileicons/32x32/asm.png diff --git a/lib/images/fileicons/32x32/bash.png b/lib/images/fileicons/32x32/bash.png Binary files differnew file mode 100644 index 000000000..c28404ed1 --- /dev/null +++ b/lib/images/fileicons/32x32/bash.png diff --git a/lib/images/fileicons/32x32/bz2.png b/lib/images/fileicons/32x32/bz2.png Binary files differnew file mode 100644 index 000000000..7be9b7c06 --- /dev/null +++ b/lib/images/fileicons/32x32/bz2.png diff --git a/lib/images/fileicons/32x32/c.png b/lib/images/fileicons/32x32/c.png Binary files differnew file mode 100644 index 000000000..0a01f8f3a --- /dev/null +++ b/lib/images/fileicons/32x32/c.png diff --git a/lib/images/fileicons/32x32/cc.png b/lib/images/fileicons/32x32/cc.png Binary files differnew file mode 100644 index 000000000..b09b3357f --- /dev/null +++ b/lib/images/fileicons/32x32/cc.png diff --git a/lib/images/fileicons/32x32/conf.png b/lib/images/fileicons/32x32/conf.png Binary files differnew file mode 100644 index 000000000..91a8a10de --- /dev/null +++ b/lib/images/fileicons/32x32/conf.png diff --git a/lib/images/fileicons/32x32/cpp.png b/lib/images/fileicons/32x32/cpp.png Binary files differnew file mode 100644 index 000000000..1ce35422c --- /dev/null +++ b/lib/images/fileicons/32x32/cpp.png diff --git a/lib/images/fileicons/32x32/cs.png b/lib/images/fileicons/32x32/cs.png Binary files differnew file mode 100644 index 000000000..d300f7551 --- /dev/null +++ b/lib/images/fileicons/32x32/cs.png diff --git a/lib/images/fileicons/32x32/csh.png b/lib/images/fileicons/32x32/csh.png Binary files differnew file mode 100644 index 000000000..72ecbcc52 --- /dev/null +++ b/lib/images/fileicons/32x32/csh.png diff --git a/lib/images/fileicons/32x32/css.png b/lib/images/fileicons/32x32/css.png Binary files differnew file mode 100644 index 000000000..638957637 --- /dev/null +++ b/lib/images/fileicons/32x32/css.png diff --git a/lib/images/fileicons/32x32/csv.png b/lib/images/fileicons/32x32/csv.png Binary files differnew file mode 100644 index 000000000..3ee42f047 --- /dev/null +++ b/lib/images/fileicons/32x32/csv.png diff --git a/lib/images/fileicons/32x32/deb.png b/lib/images/fileicons/32x32/deb.png Binary files differnew file mode 100644 index 000000000..8d625ccf2 --- /dev/null +++ b/lib/images/fileicons/32x32/deb.png diff --git a/lib/images/fileicons/32x32/diff.png b/lib/images/fileicons/32x32/diff.png Binary files differnew file mode 100644 index 000000000..4dd98e7cc --- /dev/null +++ b/lib/images/fileicons/32x32/diff.png diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png Binary files differnew file mode 100644 index 000000000..8369c1f73 --- /dev/null +++ b/lib/images/fileicons/32x32/doc.png diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png Binary files differnew file mode 100644 index 000000000..ce5dfb3d3 --- /dev/null +++ b/lib/images/fileicons/32x32/docx.png diff --git a/lib/images/fileicons/32x32/file.png b/lib/images/fileicons/32x32/file.png Binary files differnew file mode 100644 index 000000000..52318f6e2 --- /dev/null +++ b/lib/images/fileicons/32x32/file.png diff --git a/lib/images/fileicons/32x32/gif.png b/lib/images/fileicons/32x32/gif.png Binary files differnew file mode 100644 index 000000000..e39af08cc --- /dev/null +++ b/lib/images/fileicons/32x32/gif.png diff --git a/lib/images/fileicons/32x32/gz.png b/lib/images/fileicons/32x32/gz.png Binary files differnew file mode 100644 index 000000000..573ce7afd --- /dev/null +++ b/lib/images/fileicons/32x32/gz.png diff --git a/lib/images/fileicons/32x32/h.png b/lib/images/fileicons/32x32/h.png Binary files differnew file mode 100644 index 000000000..27c8ceaf3 --- /dev/null +++ b/lib/images/fileicons/32x32/h.png diff --git a/lib/images/fileicons/32x32/hpp.png b/lib/images/fileicons/32x32/hpp.png Binary files differnew file mode 100644 index 000000000..04876a5d5 --- /dev/null +++ b/lib/images/fileicons/32x32/hpp.png diff --git a/lib/images/fileicons/32x32/htm.png b/lib/images/fileicons/32x32/htm.png Binary files differnew file mode 100644 index 000000000..ec4f15ac6 --- /dev/null +++ b/lib/images/fileicons/32x32/htm.png diff --git a/lib/images/fileicons/32x32/html.png b/lib/images/fileicons/32x32/html.png Binary files differnew file mode 100644 index 000000000..ec4f15ac6 --- /dev/null +++ b/lib/images/fileicons/32x32/html.png diff --git a/lib/images/fileicons/32x32/ico.png b/lib/images/fileicons/32x32/ico.png Binary files differnew file mode 100644 index 000000000..0a219e6f2 --- /dev/null +++ b/lib/images/fileicons/32x32/ico.png diff --git a/lib/images/fileicons/32x32/java.png b/lib/images/fileicons/32x32/java.png Binary files differnew file mode 100644 index 000000000..ee9cc4ccb --- /dev/null +++ b/lib/images/fileicons/32x32/java.png diff --git a/lib/images/fileicons/32x32/jpeg.png b/lib/images/fileicons/32x32/jpeg.png Binary files differnew file mode 100644 index 000000000..5fb71dd73 --- /dev/null +++ b/lib/images/fileicons/32x32/jpeg.png diff --git a/lib/images/fileicons/32x32/jpg.png b/lib/images/fileicons/32x32/jpg.png Binary files differnew file mode 100644 index 000000000..5fb71dd73 --- /dev/null +++ b/lib/images/fileicons/32x32/jpg.png diff --git a/lib/images/fileicons/32x32/js.png b/lib/images/fileicons/32x32/js.png Binary files differnew file mode 100644 index 000000000..9bbbfb709 --- /dev/null +++ b/lib/images/fileicons/32x32/js.png diff --git a/lib/images/fileicons/32x32/json.png b/lib/images/fileicons/32x32/json.png Binary files differnew file mode 100644 index 000000000..583ece683 --- /dev/null +++ b/lib/images/fileicons/32x32/json.png diff --git a/lib/images/fileicons/32x32/lua.png b/lib/images/fileicons/32x32/lua.png Binary files differnew file mode 100644 index 000000000..9e8fc9517 --- /dev/null +++ b/lib/images/fileicons/32x32/lua.png diff --git a/lib/images/fileicons/32x32/mp3.png b/lib/images/fileicons/32x32/mp3.png Binary files differnew file mode 100644 index 000000000..1acd83276 --- /dev/null +++ b/lib/images/fileicons/32x32/mp3.png diff --git a/lib/images/fileicons/32x32/mp4.png b/lib/images/fileicons/32x32/mp4.png Binary files differnew file mode 100644 index 000000000..03db6f450 --- /dev/null +++ b/lib/images/fileicons/32x32/mp4.png diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png Binary files differnew file mode 100644 index 000000000..9a34f2129 --- /dev/null +++ b/lib/images/fileicons/32x32/odc.png diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png Binary files differnew file mode 100644 index 000000000..e3b4333ad --- /dev/null +++ b/lib/images/fileicons/32x32/odf.png diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png Binary files differnew file mode 100644 index 000000000..c3b192b2d --- /dev/null +++ b/lib/images/fileicons/32x32/odg.png diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png Binary files differnew file mode 100644 index 000000000..6baa69407 --- /dev/null +++ b/lib/images/fileicons/32x32/odi.png diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png Binary files differnew file mode 100644 index 000000000..8e09dd6e4 --- /dev/null +++ b/lib/images/fileicons/32x32/odp.png diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png Binary files differnew file mode 100644 index 000000000..90892f3d4 --- /dev/null +++ b/lib/images/fileicons/32x32/ods.png diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png Binary files differnew file mode 100644 index 000000000..22ec1fffb --- /dev/null +++ b/lib/images/fileicons/32x32/odt.png diff --git a/lib/images/fileicons/32x32/ogg.png b/lib/images/fileicons/32x32/ogg.png Binary files differnew file mode 100644 index 000000000..f988fabc3 --- /dev/null +++ b/lib/images/fileicons/32x32/ogg.png diff --git a/lib/images/fileicons/32x32/ogv.png b/lib/images/fileicons/32x32/ogv.png Binary files differnew file mode 100644 index 000000000..1083455fb --- /dev/null +++ b/lib/images/fileicons/32x32/ogv.png diff --git a/lib/images/fileicons/32x32/pas.png b/lib/images/fileicons/32x32/pas.png Binary files differnew file mode 100644 index 000000000..c2c05d2d1 --- /dev/null +++ b/lib/images/fileicons/32x32/pas.png diff --git a/lib/images/fileicons/32x32/pdf.png b/lib/images/fileicons/32x32/pdf.png Binary files differnew file mode 100644 index 000000000..0efa0dc31 --- /dev/null +++ b/lib/images/fileicons/32x32/pdf.png diff --git a/lib/images/fileicons/32x32/php.png b/lib/images/fileicons/32x32/php.png Binary files differnew file mode 100644 index 000000000..8f3c84e32 --- /dev/null +++ b/lib/images/fileicons/32x32/php.png diff --git a/lib/images/fileicons/32x32/pl.png b/lib/images/fileicons/32x32/pl.png Binary files differnew file mode 100644 index 000000000..88aa2723f --- /dev/null +++ b/lib/images/fileicons/32x32/pl.png diff --git a/lib/images/fileicons/32x32/png.png b/lib/images/fileicons/32x32/png.png Binary files differnew file mode 100644 index 000000000..0ecd29691 --- /dev/null +++ b/lib/images/fileicons/32x32/png.png diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png Binary files differnew file mode 100644 index 000000000..84b523a23 --- /dev/null +++ b/lib/images/fileicons/32x32/ppt.png diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png Binary files differnew file mode 100644 index 000000000..1446cf4de --- /dev/null +++ b/lib/images/fileicons/32x32/pptx.png diff --git a/lib/images/fileicons/32x32/ps.png b/lib/images/fileicons/32x32/ps.png Binary files differnew file mode 100644 index 000000000..e1a74988d --- /dev/null +++ b/lib/images/fileicons/32x32/ps.png diff --git a/lib/images/fileicons/32x32/py.png b/lib/images/fileicons/32x32/py.png Binary files differnew file mode 100644 index 000000000..cf6e412f0 --- /dev/null +++ b/lib/images/fileicons/32x32/py.png diff --git a/lib/images/fileicons/32x32/rar.png b/lib/images/fileicons/32x32/rar.png Binary files differnew file mode 100644 index 000000000..4af2a4d46 --- /dev/null +++ b/lib/images/fileicons/32x32/rar.png diff --git a/lib/images/fileicons/32x32/rb.png b/lib/images/fileicons/32x32/rb.png Binary files differnew file mode 100644 index 000000000..b0dfd8980 --- /dev/null +++ b/lib/images/fileicons/32x32/rb.png diff --git a/lib/images/fileicons/32x32/rpm.png b/lib/images/fileicons/32x32/rpm.png Binary files differnew file mode 100644 index 000000000..2ec5f4e1b --- /dev/null +++ b/lib/images/fileicons/32x32/rpm.png diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png Binary files differnew file mode 100644 index 000000000..82add4fd7 --- /dev/null +++ b/lib/images/fileicons/32x32/rtf.png diff --git a/lib/images/fileicons/32x32/sh.png b/lib/images/fileicons/32x32/sh.png Binary files differnew file mode 100644 index 000000000..93c093ea4 --- /dev/null +++ b/lib/images/fileicons/32x32/sh.png diff --git a/lib/images/fileicons/32x32/sql.png b/lib/images/fileicons/32x32/sql.png Binary files differnew file mode 100644 index 000000000..f6436e725 --- /dev/null +++ b/lib/images/fileicons/32x32/sql.png diff --git a/lib/images/fileicons/32x32/swf.png b/lib/images/fileicons/32x32/swf.png Binary files differnew file mode 100644 index 000000000..b43642905 --- /dev/null +++ b/lib/images/fileicons/32x32/swf.png diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png Binary files differnew file mode 100644 index 000000000..50676be6a --- /dev/null +++ b/lib/images/fileicons/32x32/sxc.png diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png Binary files differnew file mode 100644 index 000000000..f715a8ff0 --- /dev/null +++ b/lib/images/fileicons/32x32/sxd.png diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png Binary files differnew file mode 100644 index 000000000..3d9f31d3b --- /dev/null +++ b/lib/images/fileicons/32x32/sxi.png diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png Binary files differnew file mode 100644 index 000000000..bd8ab1436 --- /dev/null +++ b/lib/images/fileicons/32x32/sxw.png diff --git a/lib/images/fileicons/32x32/tar.png b/lib/images/fileicons/32x32/tar.png Binary files differnew file mode 100644 index 000000000..4a420a22a --- /dev/null +++ b/lib/images/fileicons/32x32/tar.png diff --git a/lib/images/fileicons/32x32/tgz.png b/lib/images/fileicons/32x32/tgz.png Binary files differnew file mode 100644 index 000000000..8cf6af41a --- /dev/null +++ b/lib/images/fileicons/32x32/tgz.png diff --git a/lib/images/fileicons/32x32/txt.png b/lib/images/fileicons/32x32/txt.png Binary files differnew file mode 100644 index 000000000..d9ff7d595 --- /dev/null +++ b/lib/images/fileicons/32x32/txt.png diff --git a/lib/images/fileicons/32x32/wav.png b/lib/images/fileicons/32x32/wav.png Binary files differnew file mode 100644 index 000000000..c39a8445f --- /dev/null +++ b/lib/images/fileicons/32x32/wav.png diff --git a/lib/images/fileicons/32x32/webm.png b/lib/images/fileicons/32x32/webm.png Binary files differnew file mode 100644 index 000000000..99b9c87b2 --- /dev/null +++ b/lib/images/fileicons/32x32/webm.png diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png Binary files differnew file mode 100644 index 000000000..7447d9cdf --- /dev/null +++ b/lib/images/fileicons/32x32/xls.png diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png Binary files differnew file mode 100644 index 000000000..920217267 --- /dev/null +++ b/lib/images/fileicons/32x32/xlsx.png diff --git a/lib/images/fileicons/32x32/xml.png b/lib/images/fileicons/32x32/xml.png Binary files differnew file mode 100644 index 000000000..4ea3b1f6c --- /dev/null +++ b/lib/images/fileicons/32x32/xml.png diff --git a/lib/images/fileicons/32x32/zip.png b/lib/images/fileicons/32x32/zip.png Binary files differnew file mode 100644 index 000000000..f07d18e2c --- /dev/null +++ b/lib/images/fileicons/32x32/zip.png diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png Binary files differindex 52f7d5d72..037cd73a0 100644 --- a/lib/images/fileicons/7z.png +++ b/lib/images/fileicons/7z.png diff --git a/lib/images/fileicons/README b/lib/images/fileicons/README new file mode 100644 index 000000000..05385861e --- /dev/null +++ b/lib/images/fileicons/README @@ -0,0 +1,2 @@ +For the generator of these files see +https://github.com/splitbrain/file-icon-generator/blob/master/example-dokuwiki.php diff --git a/lib/images/fileicons/asm.png b/lib/images/fileicons/asm.png Binary files differnew file mode 100644 index 000000000..1281e12b8 --- /dev/null +++ b/lib/images/fileicons/asm.png diff --git a/lib/images/fileicons/audio.png b/lib/images/fileicons/audio.png Binary files differdeleted file mode 100644 index 98883256d..000000000 --- a/lib/images/fileicons/audio.png +++ /dev/null diff --git a/lib/images/fileicons/bash.png b/lib/images/fileicons/bash.png Binary files differnew file mode 100644 index 000000000..257584649 --- /dev/null +++ b/lib/images/fileicons/bash.png diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png Binary files differindex 6ec2f98ef..a4bcc70a1 100644 --- a/lib/images/fileicons/bz2.png +++ b/lib/images/fileicons/bz2.png diff --git a/lib/images/fileicons/c.png b/lib/images/fileicons/c.png Binary files differindex 6f57337c7..f0d4e9aa1 100644 --- a/lib/images/fileicons/c.png +++ b/lib/images/fileicons/c.png diff --git a/lib/images/fileicons/cc.png b/lib/images/fileicons/cc.png Binary files differnew file mode 100644 index 000000000..e6f4c6457 --- /dev/null +++ b/lib/images/fileicons/cc.png diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png Binary files differindex 20c20fa3d..94ace02cf 100644 --- a/lib/images/fileicons/conf.png +++ b/lib/images/fileicons/conf.png diff --git a/lib/images/fileicons/cpp.png b/lib/images/fileicons/cpp.png Binary files differindex 6f2797da5..4027e4beb 100644 --- a/lib/images/fileicons/cpp.png +++ b/lib/images/fileicons/cpp.png diff --git a/lib/images/fileicons/cs.png b/lib/images/fileicons/cs.png Binary files differindex d3afa112c..31b7f7661 100644 --- a/lib/images/fileicons/cs.png +++ b/lib/images/fileicons/cs.png diff --git a/lib/images/fileicons/csh.png b/lib/images/fileicons/csh.png Binary files differnew file mode 100644 index 000000000..cc21e7995 --- /dev/null +++ b/lib/images/fileicons/csh.png diff --git a/lib/images/fileicons/css.png b/lib/images/fileicons/css.png Binary files differindex 89c1537fd..abd16fa8e 100644 --- a/lib/images/fileicons/css.png +++ b/lib/images/fileicons/css.png diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png Binary files differindex b604453c4..af37ba577 100644 --- a/lib/images/fileicons/csv.png +++ b/lib/images/fileicons/csv.png diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png Binary files differindex 8fe57327a..9eb29019b 100644 --- a/lib/images/fileicons/deb.png +++ b/lib/images/fileicons/deb.png diff --git a/lib/images/fileicons/diff.png b/lib/images/fileicons/diff.png Binary files differnew file mode 100644 index 000000000..1775da014 --- /dev/null +++ b/lib/images/fileicons/diff.png diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png Binary files differindex 79d8ff1cd..925494576 100644 --- a/lib/images/fileicons/doc.png +++ b/lib/images/fileicons/doc.png diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png Binary files differindex 79d8ff1cd..5bae13f9e 100644 --- a/lib/images/fileicons/docx.png +++ b/lib/images/fileicons/docx.png diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png Binary files differindex 8158a8a21..8f31d38ac 100644 --- a/lib/images/fileicons/file.png +++ b/lib/images/fileicons/file.png diff --git a/lib/images/fileicons/gif.png b/lib/images/fileicons/gif.png Binary files differindex 1d9dd562a..bcbb8366b 100644 --- a/lib/images/fileicons/gif.png +++ b/lib/images/fileicons/gif.png diff --git a/lib/images/fileicons/gz.png b/lib/images/fileicons/gz.png Binary files differindex 48f19596c..0a0a4b94f 100644 --- a/lib/images/fileicons/gz.png +++ b/lib/images/fileicons/gz.png diff --git a/lib/images/fileicons/h.png b/lib/images/fileicons/h.png Binary files differnew file mode 100644 index 000000000..4afe8f84f --- /dev/null +++ b/lib/images/fileicons/h.png diff --git a/lib/images/fileicons/hpp.png b/lib/images/fileicons/hpp.png Binary files differnew file mode 100644 index 000000000..3ee7583d2 --- /dev/null +++ b/lib/images/fileicons/hpp.png diff --git a/lib/images/fileicons/htm.png b/lib/images/fileicons/htm.png Binary files differindex d45e4c19a..02e81932b 100644 --- a/lib/images/fileicons/htm.png +++ b/lib/images/fileicons/htm.png diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png Binary files differindex d45e4c19a..02e81932b 100644 --- a/lib/images/fileicons/html.png +++ b/lib/images/fileicons/html.png diff --git a/lib/images/fileicons/ico.png b/lib/images/fileicons/ico.png Binary files differindex 1d9dd562a..93343717c 100644 --- a/lib/images/fileicons/ico.png +++ b/lib/images/fileicons/ico.png diff --git a/lib/images/fileicons/index.php b/lib/images/fileicons/index.php index f90e7e6f0..09b6c9df8 100644 --- a/lib/images/fileicons/index.php +++ b/lib/images/fileicons/index.php @@ -44,5 +44,24 @@ foreach (glob('*.png') as $img) { ?> </div> +<br style="clear: left" /> + +<div class="white box"> + <?php + foreach (glob('32x32/*.png') as $img) { + echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> '; + } + ?> +</div> + +<div class="black box"> + <?php + foreach (glob('32x32/*.png') as $img) { + echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> '; + } + ?> +</div> + + </body> </html> diff --git a/lib/images/fileicons/java.png b/lib/images/fileicons/java.png Binary files differindex c5f2fd09f..cf6f5b4f5 100644 --- a/lib/images/fileicons/java.png +++ b/lib/images/fileicons/java.png diff --git a/lib/images/fileicons/jpeg.png b/lib/images/fileicons/jpeg.png Binary files differindex 1d9dd562a..29dea5761 100644 --- a/lib/images/fileicons/jpeg.png +++ b/lib/images/fileicons/jpeg.png diff --git a/lib/images/fileicons/jpg.png b/lib/images/fileicons/jpg.png Binary files differindex 1d9dd562a..29dea5761 100644 --- a/lib/images/fileicons/jpg.png +++ b/lib/images/fileicons/jpg.png diff --git a/lib/images/fileicons/js.png b/lib/images/fileicons/js.png Binary files differindex 0c314eb56..16e3f9538 100644 --- a/lib/images/fileicons/js.png +++ b/lib/images/fileicons/js.png diff --git a/lib/images/fileicons/json.png b/lib/images/fileicons/json.png Binary files differnew file mode 100644 index 000000000..96611cb53 --- /dev/null +++ b/lib/images/fileicons/json.png diff --git a/lib/images/fileicons/lua.png b/lib/images/fileicons/lua.png Binary files differindex 994c6e8f0..81fdeea40 100644 --- a/lib/images/fileicons/lua.png +++ b/lib/images/fileicons/lua.png diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png Binary files differindex 411dad080..7c6d37184 100644 --- a/lib/images/fileicons/mp3.png +++ b/lib/images/fileicons/mp3.png diff --git a/lib/images/fileicons/mp4.png b/lib/images/fileicons/mp4.png Binary files differindex b89fc5299..ee5b91150 100644 --- a/lib/images/fileicons/mp4.png +++ b/lib/images/fileicons/mp4.png diff --git a/lib/images/fileicons/odc.png b/lib/images/fileicons/odc.png Binary files differindex 4d6676c3a..331140552 100644 --- a/lib/images/fileicons/odc.png +++ b/lib/images/fileicons/odc.png diff --git a/lib/images/fileicons/odf.png b/lib/images/fileicons/odf.png Binary files differindex cb88d68e6..eccae9e20 100644 --- a/lib/images/fileicons/odf.png +++ b/lib/images/fileicons/odf.png diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png Binary files differindex a07216f4a..5224425e6 100644 --- a/lib/images/fileicons/odg.png +++ b/lib/images/fileicons/odg.png diff --git a/lib/images/fileicons/odi.png b/lib/images/fileicons/odi.png Binary files differindex a07216f4a..b57fd974d 100644 --- a/lib/images/fileicons/odi.png +++ b/lib/images/fileicons/odi.png diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png Binary files differindex 2f2574af6..81d1023c0 100644 --- a/lib/images/fileicons/odp.png +++ b/lib/images/fileicons/odp.png diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png Binary files differindex 4d6676c3a..77e6d5366 100644 --- a/lib/images/fileicons/ods.png +++ b/lib/images/fileicons/ods.png diff --git a/lib/images/fileicons/odt.png b/lib/images/fileicons/odt.png Binary files differindex f9c126efd..8490eec74 100644 --- a/lib/images/fileicons/odt.png +++ b/lib/images/fileicons/odt.png diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png Binary files differindex 0a21eae65..38f615c99 100644 --- a/lib/images/fileicons/ogg.png +++ b/lib/images/fileicons/ogg.png diff --git a/lib/images/fileicons/ogv.png b/lib/images/fileicons/ogv.png Binary files differindex b89fc5299..a937dfc4c 100644 --- a/lib/images/fileicons/ogv.png +++ b/lib/images/fileicons/ogv.png diff --git a/lib/images/fileicons/pas.png b/lib/images/fileicons/pas.png Binary files differnew file mode 100644 index 000000000..0c14372d0 --- /dev/null +++ b/lib/images/fileicons/pas.png diff --git a/lib/images/fileicons/pdf.png b/lib/images/fileicons/pdf.png Binary files differindex 029dcffec..1bc154641 100644 --- a/lib/images/fileicons/pdf.png +++ b/lib/images/fileicons/pdf.png diff --git a/lib/images/fileicons/php.png b/lib/images/fileicons/php.png Binary files differindex f81e405de..2deb5d3b1 100644 --- a/lib/images/fileicons/php.png +++ b/lib/images/fileicons/php.png diff --git a/lib/images/fileicons/pl.png b/lib/images/fileicons/pl.png Binary files differindex 92f3f9754..a4fa92203 100644 --- a/lib/images/fileicons/pl.png +++ b/lib/images/fileicons/pl.png diff --git a/lib/images/fileicons/png.png b/lib/images/fileicons/png.png Binary files differindex 1d9dd562a..007270532 100644 --- a/lib/images/fileicons/png.png +++ b/lib/images/fileicons/png.png diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png Binary files differindex b7afb2266..3355c2712 100644 --- a/lib/images/fileicons/ppt.png +++ b/lib/images/fileicons/ppt.png diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png Binary files differindex b7afb2266..269cdb8fc 100644 --- a/lib/images/fileicons/pptx.png +++ b/lib/images/fileicons/pptx.png diff --git a/lib/images/fileicons/ps.png b/lib/images/fileicons/ps.png Binary files differindex 40a80baad..e61d1aa7e 100644 --- a/lib/images/fileicons/ps.png +++ b/lib/images/fileicons/ps.png diff --git a/lib/images/fileicons/py.png b/lib/images/fileicons/py.png Binary files differindex 15a727c54..f0ed0258c 100644 --- a/lib/images/fileicons/py.png +++ b/lib/images/fileicons/py.png diff --git a/lib/images/fileicons/rar.png b/lib/images/fileicons/rar.png Binary files differindex c761a4f7f..f15d4ce5b 100644 --- a/lib/images/fileicons/rar.png +++ b/lib/images/fileicons/rar.png diff --git a/lib/images/fileicons/rb.png b/lib/images/fileicons/rb.png Binary files differindex 408f708a1..0e59207fc 100644 --- a/lib/images/fileicons/rb.png +++ b/lib/images/fileicons/rb.png diff --git a/lib/images/fileicons/rpm.png b/lib/images/fileicons/rpm.png Binary files differindex 5cf727de0..831424ff5 100644 --- a/lib/images/fileicons/rpm.png +++ b/lib/images/fileicons/rpm.png diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png Binary files differindex 99fe3d8fd..bbc425ca3 100644 --- a/lib/images/fileicons/rtf.png +++ b/lib/images/fileicons/rtf.png diff --git a/lib/images/fileicons/sh.png b/lib/images/fileicons/sh.png Binary files differnew file mode 100644 index 000000000..256067106 --- /dev/null +++ b/lib/images/fileicons/sh.png diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png Binary files differindex a7b0684c7..6697943e2 100644 --- a/lib/images/fileicons/sql.png +++ b/lib/images/fileicons/sql.png diff --git a/lib/images/fileicons/swf.png b/lib/images/fileicons/swf.png Binary files differindex ecc7309ad..b45a72cc9 100644 --- a/lib/images/fileicons/swf.png +++ b/lib/images/fileicons/swf.png diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png Binary files differindex 4d6676c3a..c96cf303f 100644 --- a/lib/images/fileicons/sxc.png +++ b/lib/images/fileicons/sxc.png diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png Binary files differindex a07216f4a..124b928e1 100644 --- a/lib/images/fileicons/sxd.png +++ b/lib/images/fileicons/sxd.png diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png Binary files differindex 2f2574af6..8a5e23033 100644 --- a/lib/images/fileicons/sxi.png +++ b/lib/images/fileicons/sxi.png diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png Binary files differindex f9c126efd..9a903791c 100644 --- a/lib/images/fileicons/sxw.png +++ b/lib/images/fileicons/sxw.png diff --git a/lib/images/fileicons/tar.png b/lib/images/fileicons/tar.png Binary files differindex a28c86f2d..e57029adc 100644 --- a/lib/images/fileicons/tar.png +++ b/lib/images/fileicons/tar.png diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png Binary files differindex 48f19596c..25ef9e15a 100644 --- a/lib/images/fileicons/tgz.png +++ b/lib/images/fileicons/tgz.png diff --git a/lib/images/fileicons/txt.png b/lib/images/fileicons/txt.png Binary files differindex bb94949f6..4fd921655 100644 --- a/lib/images/fileicons/txt.png +++ b/lib/images/fileicons/txt.png diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png Binary files differindex c167f4fdb..c8880c62e 100644 --- a/lib/images/fileicons/wav.png +++ b/lib/images/fileicons/wav.png diff --git a/lib/images/fileicons/webm.png b/lib/images/fileicons/webm.png Binary files differindex b89fc5299..55db61914 100644 --- a/lib/images/fileicons/webm.png +++ b/lib/images/fileicons/webm.png diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png Binary files differindex 24911b802..5ac56f20d 100644 --- a/lib/images/fileicons/xls.png +++ b/lib/images/fileicons/xls.png diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png Binary files differindex 24911b802..89c84c522 100644 --- a/lib/images/fileicons/xlsx.png +++ b/lib/images/fileicons/xlsx.png diff --git a/lib/images/fileicons/xml.png b/lib/images/fileicons/xml.png Binary files differindex ae9831b34..4480a6385 100644 --- a/lib/images/fileicons/xml.png +++ b/lib/images/fileicons/xml.png diff --git a/lib/images/fileicons/zip.png b/lib/images/fileicons/zip.png Binary files differindex fb8850c9a..4a36a35ff 100644 --- a/lib/images/fileicons/zip.png +++ b/lib/images/fileicons/zip.png diff --git a/lib/plugins/acl/lang/et/help.txt b/lib/plugins/acl/lang/et/help.txt new file mode 100644 index 000000000..a2c8e9e95 --- /dev/null +++ b/lib/plugins/acl/lang/et/help.txt @@ -0,0 +1,9 @@ +=== Kiir-spikker: === + +Käesoleval leheküljel saad oma wiki nimeruumidele ja lehekülgedele lisada ning eemaldada õigusi. + * Vasemas paanis on näidatud kõik saada olevad nimeruumid ja leheküljed. + * Ülal olev vorm laseb sul vaadelda ja muuta valitud rühma või kasutaja õigusi. + * Allolevas tabelis näidatakse kõiki hetkel sättestatud reegleid ligipääsudele. +Saad seda kasutada reeglite hulgi muutmiseks või kustutamiseks + +Mõistmaks paremini DokuWiki ligipääsu halduse toimimist, võiks abiks olla [[doku>acl|ACL-i ametliku dokumentatsiooniga]] tutvumine.
\ No newline at end of file diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php index 84e21d1f8..b591456e8 100644 --- a/lib/plugins/acl/lang/et/lang.php +++ b/lib/plugins/acl/lang/et/lang.php @@ -11,14 +11,20 @@ * @author Janar Leas <janar.leas@eesti.ee> */ $lang['admin_acl'] = 'Ligipääsukontrolli nimekirja haldamine'; -$lang['acl_group'] = 'Grupp'; +$lang['acl_group'] = 'Rühm'; $lang['acl_user'] = 'Kasutaja'; $lang['acl_perms'] = 'Lubatud'; $lang['page'] = 'leht'; -$lang['namespace'] = 'alajaotus'; +$lang['namespace'] = 'Nimeruum'; $lang['btn_select'] = 'Vali'; +$lang['p_user_ns'] = 'Kasutaja <b class="aclgroup">%s</b> omab nimeruumis <b class="aclns">%s</b>: <i>%s</i> järgmisi õigusi.'; +$lang['p_group_ns'] = 'Rühma <b class="aclgroup">%s</b> liikmed omavad nimeruumis <b class="aclns">%s</b>: <i>%s</i> järgmisi õigusi.'; $lang['p_choose_id'] = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks leheküljele <b class="aclpage">%s</b> sätestatud volitusi.'; $lang['p_choose_ns'] = 'Sisesta ülal-olevasse vormi <b>kasutaja või rühm</b> nägemaks nimeruumile <b class="aclpage">%s</b> sätestatud volitusi.'; +$lang['p_inherited'] = 'Teadmiseks: Neid õigusi pole eralti määratletud, vaid on päritud teistest rühmadest või ülemast nimeruumist.'; +$lang['p_isadmin'] = 'Teadmiseks: Valitud rühm või kasutaja omab alati kõiki õigusi, kuna nii on sätestanud ülemkasutaja.'; +$lang['p_include'] = 'Kõrgemad õigused hõlmavad alamaid. Õigus loomine, üleslaadida ja kustutada rakenduvad nimeruumidele, mitte lehekülgedele.'; +$lang['where'] = 'Lehekülg/nimeruum'; $lang['who'] = 'Kasutaja/Grupp'; $lang['perm'] = 'Õigused'; $lang['acl_perm0'] = 'Pole'; diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt index ecb2fe3d0..e1b76c2c7 100644 --- a/lib/plugins/acl/lang/ru/help.txt +++ b/lib/plugins/acl/lang/ru/help.txt @@ -5,4 +5,4 @@ * Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы. * Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил. -Прочтение [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики». +Прочтение [[doku>acl|официальной документации по правам доступа]] может помочь вам в полном понимании работы управления правами доступа в «Докувики». diff --git a/lib/plugins/authad/lang/ru/lang.php b/lib/plugins/authad/lang/ru/lang.php new file mode 100644 index 000000000..6f3c03e39 --- /dev/null +++ b/lib/plugins/authad/lang/ru/lang.php @@ -0,0 +1,8 @@ +<?php + +/** + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Aleksandr Selivanov <alexgearbox@yandex.ru> + */ +$lang['domain'] = 'Домен'; diff --git a/lib/plugins/authldap/lang/et/settings.php b/lib/plugins/authldap/lang/et/settings.php new file mode 100644 index 000000000..9bba85dda --- /dev/null +++ b/lib/plugins/authldap/lang/et/settings.php @@ -0,0 +1,9 @@ +<?php + +/** + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Janar Leas <janar.leas@eesti.ee> + */ +$lang['grouptree'] = 'Kus kohast kasutaja rühmi otsida. Nt. <code>ou=Rühm, dc=server, dc=tld</code'; +$lang['groupscope'] = 'Piiritle otsingu ulatus rühma otsinguga'; diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php index 0a6df12be..4a36cb85d 100644 --- a/lib/plugins/extension/lang/ru/lang.php +++ b/lib/plugins/extension/lang/ru/lang.php @@ -29,3 +29,13 @@ $lang['bugs_features'] = 'Ошибки'; $lang['tags'] = 'Метки:'; $lang['repository'] = 'Репозиторий:'; $lang['unknown'] = '<em>неизвестно</em>'; +$lang['repo_retry'] = 'Повторить'; +$lang['status_enabled'] = 'включен'; +$lang['status_disabled'] = 'отключено'; +$lang['status_unmodifiable'] = 'неизменяемо'; +$lang['status_plugin'] = 'плагин'; +$lang['status_template'] = 'шаблон'; +$lang['status_bundled'] = 'в комплекте'; +$lang['msg_enabled'] = 'Плагин %s включен'; +$lang['msg_disabled'] = 'Плагин %s отключен'; +$lang['msg_delete_success'] = 'Дополнение удалено'; diff --git a/lib/plugins/popularity/lang/ru/intro.txt b/lib/plugins/popularity/lang/ru/intro.txt index 52f5a0ae2..dbf0cc688 100644 --- a/lib/plugins/popularity/lang/ru/intro.txt +++ b/lib/plugins/popularity/lang/ru/intro.txt @@ -1,10 +1,10 @@ ====== Сбор информации о популярности ====== -Этот [[doku>popularity|инструмент]] собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «ДокуВики». Эти данные помогут им понять, как именно используется «ДокуВики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям. +Этот [[doku>popularity|инструмент]] собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «Докувики». Эти данные помогут им понять, как именно используется «Докувики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям. Отправляйте данные время от времени для того, чтобы сообщать разработчикам о том, что ваша вики «подросла». Отправленные вами данные будут идентифицированы по анонимному ID. -Собранные данные содержат такую информацию, как: версия «ДокуВики», количество и размер ваших страниц и файлов, установленные плагины, информацию об установленном PHP. +Собранные данные содержат такую информацию, как: версия «Докувики», количество и размер ваших страниц и файлов, установленные плагины, информацию об установленном PHP. Данные, которые будут отосланы, представлены ниже. Пожалуйста, используйте кнопку «Отправить данные», чтобы передать информацию. diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php index 423d67449..88d8cd93d 100644 --- a/lib/plugins/revert/admin.php +++ b/lib/plugins/revert/admin.php @@ -83,7 +83,8 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { // find the last non-spammy revision $data = ''; - $old = getRevisions($id, 0, $this->max_revs); + $pagelog = new PageChangeLog($id); + $old = $pagelog->getRevisions(0, $this->max_revs); if(count($old)){ foreach($old as $REV){ $data = rawWiki($id,$REV); diff --git a/lib/plugins/revert/lang/et/lang.php b/lib/plugins/revert/lang/et/lang.php new file mode 100644 index 000000000..be8fb26c1 --- /dev/null +++ b/lib/plugins/revert/lang/et/lang.php @@ -0,0 +1,9 @@ +<?php + +/** + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Janar Leas <janar.leas@eesti.ee> + */ +$lang['note1'] = 'Teadmiseks: See otsing arvestab suurtähti'; +$lang['note2'] = 'Teadmiseks: Lehekülg ennistatakse viimasele järgule, milles ei sisaldu antud rämpsu sõne <i>%s</i>.'; diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php index 93b28a6b8..deb1e0be1 100644 --- a/lib/plugins/usermanager/lang/et/lang.php +++ b/lib/plugins/usermanager/lang/et/lang.php @@ -5,13 +5,14 @@ * * @author kristian.kankainen@kuu.la * @author Rivo Zängov <eraser@eraser.ee> + * @author Janar Leas <janar.leas@eesti.ee> */ $lang['menu'] = 'Kasutajate haldamine'; $lang['user_id'] = 'Kasutaja'; $lang['user_pass'] = 'Parool'; $lang['user_name'] = 'Tegelik nimi'; $lang['user_mail'] = 'E-post'; -$lang['user_groups'] = 'Grupid'; +$lang['user_groups'] = 'Rühmad'; $lang['field'] = 'Väli'; $lang['value'] = 'Väärtus'; $lang['add'] = 'Lisa'; @@ -29,3 +30,4 @@ $lang['prev'] = 'eelmine'; $lang['next'] = 'järgmine'; $lang['last'] = 'viimased'; $lang['user_notify'] = 'Teavita kasutajat'; +$lang['note_group'] = 'Kui rühma pole määratletud, siis lisatakse uued kasutajad vaikimisi rühma (%s).'; diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt index 3a25f34ce..dd2b797bc 100644 --- a/lib/plugins/usermanager/lang/ru/import.txt +++ b/lib/plugins/usermanager/lang/ru/import.txt @@ -1,9 +1,9 @@ ===== Импорт нескольких пользователей ===== Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. -Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. -Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание. -В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». +Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. +Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание. +В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». Повторяющиеся идентификаторы user-id будут игнорироваться. -Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file +Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 3102ac32a..83158df31 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -19,6 +19,7 @@ * @author Johnny Utah <pcpa@cyberpunk.su> * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua) * @author Pavel <ivanovtsk@mail.ru> + * @author Aleksandr Selivanov <alexgearbox@yandex.ru> */ $lang['menu'] = 'Управление пользователями'; $lang['noauth'] = '(авторизация пользователей недоступна)'; @@ -72,7 +73,7 @@ $lang['import_error_fields'] = 'Не все поля заполнены. На $lang['import_error_baduserid'] = 'Отсутствует идентификатор пользователя'; $lang['import_error_badname'] = 'Имя не годится'; $lang['import_error_badmail'] = 'Адрес электронной почты не годится'; -$lang['import_error_upload'] = 'Импорт не удался. CSV файл не загружен или пуст.'; +$lang['import_error_upload'] = 'Импорт не удался. CSV-файл не загружен или пуст.'; $lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.'; $lang['import_error_create'] = 'Невозможно создать пользователя'; $lang['import_notify_fail'] = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.'; diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index b7c82d829..bc56a37c4 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -73,3 +73,65 @@ background-color: inherit; font-weight: bold; } + +/* diff options */ + +.dokuwiki .diffoptions form { + float: left; +} +.dokuwiki .diffoptions p { + float: right; +} + +/* diff nav */ + +.dokuwiki table.diff_sidebyside td.diffnav { + padding-bottom: .7em; +} +.dokuwiki .diffnav a { + display: inline-block; + vertical-align: middle; +} +.dokuwiki .diffnav a span { + display: none; +} + +.dokuwiki .diffnav a:hover, +.dokuwiki .diffnav a:active, +.dokuwiki .diffnav a:focus { + background-color: @ini_background_alt; + text-decoration: none; +} + +.dokuwiki .diffnav a:before { + display: inline-block; + line-height: 1; + padding: .2em .4em; + border: 1px solid @ini_border; + border-radius: 2px; + color: @ini_text; +} + +.dokuwiki .diffnav a.diffprevrev:before { + content: '\25C0'; /* left triangle */ +} +.dokuwiki .diffnav a.diffnextrev:before, +.dokuwiki .diffnav a.difflastrev:before { + content: '\25B6'; /* right triangle */ +} +.dokuwiki .diffnav a.diffbothprevrev:before { + content: '\25C0\25C0'; +} +.dokuwiki .diffnav a.diffbothnextrev:before { + content: '\25B6\25B6'; +} + +.dokuwiki .diffnav select { + width: 60%; + min-width: 9em; + height: 1.5em; /* height is necessary for longer options in Webkit */ +} + +.dokuwiki .diffnav select option[selected] { + font-weight: bold; +} diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less index c296185e9..ac9f6803a 100644 --- a/lib/tpl/dokuwiki/css/basic.less +++ b/lib/tpl/dokuwiki/css/basic.less @@ -455,6 +455,7 @@ input[disabled], button[disabled], select[disabled], textarea[disabled], +option[disabled], input[readonly], button[readonly], select[readonly], diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index 75ae5dbe4..c3e517795 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -275,11 +275,13 @@ body { #config__manager td .input, .dokuwiki fieldset, .dokuwiki input.edit, -.dokuwiki textarea, -.dokuwiki select { +.dokuwiki textarea { width: auto !important; max-width: 100% !important; } +.dokuwiki select { + max-width: 100% !important; +} #config__manager fieldset { margin-left: 0; margin-right: 0; diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less index ecb3038c3..77d2670a6 100644 --- a/lib/tpl/dokuwiki/css/pagetools.less +++ b/lib/tpl/dokuwiki/css/pagetools.less @@ -231,3 +231,4 @@ .pagetools-item(subscribe, 9, subscribe); .pagetools-item(mediaManager, 11); .pagetools-item(back, 12); +.pagetools-item(img_backto, 12); diff --git a/lib/tpl/dokuwiki/css/sites/abcwiki.css b/lib/tpl/dokuwiki/css/sites/abcwiki.css new file mode 100644 index 000000000..9f436516b --- /dev/null +++ b/lib/tpl/dokuwiki/css/sites/abcwiki.css @@ -0,0 +1,39 @@ + +html, +body { + background-color: #369; +} + +#dokuwiki__header, +#dokuwiki__aside, +.docInfo, +#dokuwiki__footer { + color: #fff; +} + +#dokuwiki__header a, +#dokuwiki__aside a, +.docInfo a, +#dokuwiki__footer a { + color: #ff9 !important; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + color: #036; +} + +.dokuwiki div.breadcrumbs { + border-top-color: #999; + border-bottom-color: #666; +} +.dokuwiki div.breadcrumbs div:first-child { + border-bottom-color: #999; +} +.dokuwiki div.breadcrumbs div:last-child { + border-top-color: #666; +} diff --git a/lib/tpl/dokuwiki/css/sites/paralis.css b/lib/tpl/dokuwiki/css/sites/paralis.css new file mode 100644 index 000000000..201bca936 --- /dev/null +++ b/lib/tpl/dokuwiki/css/sites/paralis.css @@ -0,0 +1,58 @@ + +@media screen { + +body { + font: normal 100%/1.4 Frutiger, Calibri, "Myriad Pro", Myriad, "Nimbus Sans L", Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif; + color: @ini_text_neu; +} + +q { + font-style: italic; +} + +#dokuwiki__header h1 a { + color: @ini_link; + font-weight: bold; +} + +div.dokuwiki p.plugin__pagenav { + margin: 0 0 1.4em; +} + + +} /* /@media */ + + +#dokuwiki__header h1 { + position: relative; +} +#dokuwiki__header h1 img { + position: absolute; + top: -27px; + left: -33px; + max-width: none; +} +#dokuwiki__header h1 { + padding-left: 110px; +} +#dokuwiki__header p.claim { + padding-left: 110px; +} + + +@media print { + +.dokuwiki p.plugin__pagenav { + display: none; +} + +} /* /@media */ diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index ec846f6fd..8fe2c88a2 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -55,37 +55,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?> <div class="img_detail"> - <dl> - <?php - // @todo: logic should be transferred to backend - $config_files = getConfigFiles('mediameta'); - foreach ($config_files as $config_file) { - if(@file_exists($config_file)) { - include($config_file); - } - } - - foreach($fields as $key => $tag){ - $t = array(); - if (!empty($tag[0])) { - $t = array($tag[0]); - } - if(is_array($tag[3])) { - $t = array_merge($t,$tag[3]); - } - $value = tpl_img_getTag($t); - if ($value) { - echo '<dt>'.$lang[$tag[1]].':</dt><dd>'; - if ($tag[2] == 'date') { - echo dformat($value); - } else { - echo hsc($value); - } - echo '</dd>'; - } - } - ?> - </dl> + <?php tpl_img_meta(); ?> </div> <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?> <?php endif; ?> @@ -109,23 +79,17 @@ header('X-UA-Compatible: IE=edge,chrome=1'); <div class="tools"> <ul> <?php - $data = array(); - $data['view'] = 'detail'; - - // View in media manager; @todo: transfer logic to backend - $imgNS = getNS($IMG); - $authNS = auth_quickaclcheck("$imgNS:*"); - if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) { - $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); - $data['items']['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>'; - } - - // Back to [ID]; @todo: transfer logic to backend - $data['items']['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>'; + $data = array( + 'view' => 'detail', + 'items' => array( + 'mediaManager' => tpl_action('mediaManager', 1, 'li', 1, '<span>', '</span>'), + 'img_backto' => tpl_action('img_backto', 1, 'li', 1, '<span>', '</span>'), + ) + ); // the page tools can be amended through a custom plugin hook $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data); - if($evt->advise_before()){ + if($evt->advise_before()) { foreach($evt->data['items'] as $k => $html) echo $html; } $evt->advise_after(); |