Browse files

synced against latest DokuWiki release

  • Loading branch information...
1 parent fb33837 commit e066ce16cd15566bf869a50e7c1b0388f4bf3571 Michael Klier committed Jan 4, 2010
Showing with 252 additions and 84 deletions.
  1. +1 −1 _admin.css
  2. +68 −0 _linkwiz.css
  3. +54 −21 design.css
  4. +4 −7 detail.php
  5. +1 −1 layout.css
  6. +1 −1 media.css
  7. +1 −1 mediamanager.php
  8. +37 −37 print.css
  9. +13 −13 rtl.css
  10. +2 −1 style.ini
  11. +69 −0 style.ini.dist
  12. +1 −1 tpl_functions.php
View
2 _admin.css
@@ -14,7 +14,7 @@
text-align: left;
}
-.dokuwiki ul.admin_tasks li div.li{
+.dokuwiki ul.admin_tasks li div.li {
font-weight: bold;
}
View
68 _linkwiz.css
@@ -0,0 +1,68 @@
+#link__wiz {
+ position: absolute;
+ display: block;
+ z-index: 99;
+ width: 300px;
+ height: 250px;
+ padding: 0;
+ margin: 0;
+ overflow: hidden;
+ border: 1px solid __border__;
+ background-color: __background_neu__;
+ text-align: center;
+}
+
+#link__wiz_header {
+ background-color: __background_alt__;
+ height: 16px;
+ margin-bottom: 5px;
+}
+
+#link__wiz_close {
+ cursor: pointer;
+ margin: 0;
+}
+
+#link__wiz_result {
+ background-color: __background__;
+ width: 293px;
+ height: 193px;
+ overflow: auto;
+ border: 1px solid __border__;
+ margin: 3px auto;
+ text-align: left;
+}
+
+#link__wiz_result div.type_u {
+ padding: 3px 3px 3px 22px;
+ background: transparent url(../../images/up.png) 3px 3px no-repeat;
+}
+
+#link__wiz_result div.type_f {
+ padding: 3px 3px 3px 22px;
+ background: transparent url(../../images/page.png) 3px 3px no-repeat;
+}
+
+#link__wiz_result div.type_d {
+ padding: 3px 3px 3px 22px;
+ background: transparent url(../../images/ns.png) 3px 3px no-repeat;
+}
+
+#link__wiz_result div.even {
+ background-color: __background_neu__;
+}
+
+#link__wiz_result div.selected {
+ background-color: __background_alt__;
+}
+
+#link__wiz_result span {
+ display: block;
+ color: __text_neu__;
+}
+
+/*FIXME maybe move to a more general style sheet*/
+.ondrag {
+ cursor: move;
+ opacity: 0.8;
+}
View
75 design.css
@@ -405,11 +405,11 @@ div.dokuwiki h4 {font-size: 120%; margin-left: 60px; border-bottom: none; font-w
div.dokuwiki h5 {font-size: 100%; margin-left: 80px; border-bottom: none; font-weight: bold;}
/* indent different sections */
-div.dokuwiki div.level1 {margin-left: 3px;}
-div.dokuwiki div.level2 {margin-left: 23px;}
-div.dokuwiki div.level3 {margin-left: 43px;}
-div.dokuwiki div.level4 {margin-left: 63px;}
-div.dokuwiki div.level5 {margin-left: 83px;}
+div.dokuwiki div.level1 { margin-left: 3px; }
+div.dokuwiki div.level2 { margin-left: 23px; }
+div.dokuwiki div.level3 { margin-left: 43px; }
+div.dokuwiki div.level4 { margin-left: 63px; }
+div.dokuwiki div.level5 { margin-left: 83px; }
/* unordered lists */
div.dokuwiki ul {
@@ -429,12 +429,10 @@ div.dokuwiki ol {
font-weight: bold;
}
-/* no gap in between nested lists */
-div.dokuwiki li ul {
- margin-bottom: 0;
-}
+/* no bottom gap in between and smaller left margin for nested lists */
+div.dokuwiki li ul,
div.dokuwiki li ol {
- margin-bottom: 0;
+ margin: 0 0 0 1.5em;
}
/* the list items overriding the ul/ol definition */
@@ -443,10 +441,10 @@ div.dokuwiki .li {
font-weight: normal;
}
-div.dokuwiki ol {list-style-type: decimal}
-div.dokuwiki ol ol {list-style-type: upper-roman}
-div.dokuwiki ol ol ol {list-style-type: lower-alpha}
-div.dokuwiki ol ol ol ol {list-style-type: lower-greek}
+div.dokuwiki ol { list-style-type: decimal; }
+div.dokuwiki ol ol { list-style-type: upper-roman; }
+div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
+div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
div.dokuwiki li.open {
list-style-image: url(images/open.gif);
@@ -481,16 +479,47 @@ div.dokuwiki pre.code {
background-color: __background_other__;
}
-/* inline code words */
-div.dokuwiki code {
- font-size: 120%;
-}
-
/* code blocks by file tag */
div.dokuwiki pre.file {
background-color: __background_alt__;
}
+/* filenames for file and code blocks */
+div.dokuwiki dl.file,
+div.dokuwiki dl.code {
+ margin-top: 2em;
+ margin-bottom: 2.5em;
+}
+
+div.dokuwiki dl.file dt,
+div.dokuwiki dl.code dt {
+ border: 1px dashed __border__;
+ display: inline;
+ padding: 0.1em 1em;
+ margin-left: 2em;
+}
+
+div.dokuwiki dl.code dt a,
+div.dokuwiki dl.file dt a {
+ color: __text__;
+}
+
+div.dokuwiki dl.code dt {
+ background-color: __background_other__;
+ border-bottom: 1px solid __background_other__;
+}
+
+div.dokuwiki dl.file dt {
+ background-color: __background_alt__;
+ border-bottom: 1px solid __background_alt__;
+}
+
+
+/* inline code words */
+div.dokuwiki code {
+ font-size: 120%;
+}
+
/* inline tables */
div.dokuwiki table.inline {
background-color: __background__;
@@ -708,7 +737,7 @@ div.dokuwiki ul.search_quickhits {
div.dokuwiki ul.search_quickhits li {
margin: 0 1.0em 0 1.0em;
- float:left;
+ float: left;
width: 30%;
}
@@ -766,6 +795,10 @@ div.picker {
background-color: __background_alt__;
}
+div.pk_hl {
+ width: 125px;
+}
+
button.pickerbutton {
padding: 0px;
margin: 0 1px 1px 0;
@@ -797,6 +830,6 @@ div.dokuwiki div.imagemeta {
}
div.dokuwiki div.imagemeta img.thumb {
- float:left;
+ float: left;
margin-right: 0.1em;
}
View
11 detail.php
@@ -7,7 +7,7 @@
* You should leave the doctype at the very top - It should
* always be the very first line of a document.
*
- * @link http://wiki.splitbrain.org/wiki:tpl:templates
+ * @link http://dokuwiki.org/templates
* @author Andreas Gohr <andi@splitbrain.org>
*/
@@ -45,18 +45,15 @@
<div class="img_detail">
<p class="img_caption">
- <?php print nl2br(hsc(tpl_img_getTag(array('IPTC.Caption',
- 'EXIF.UserComment',
- 'EXIF.TIFFImageDescription',
- 'EXIF.TIFFUserComment')))); ?>
+ <?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?>
</p>
<p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
<dl class="img_tags">
<?php
$t = tpl_img_getTag('Date.EarliestTime');
- if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.strftime($conf['dformat'],$t).'</dd>';
+ if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
$t = tpl_img_getTag('File.Name');
if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
@@ -76,7 +73,7 @@
$t = tpl_img_getTag('Simple.Camera');
if($t) print '<dt>'.$lang['img_camera'].':</dt><dd>'.hsc($t).'</dd>';
- $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category'));
+ $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
if($t) print '<dt>'.$lang['img_keywords'].':</dt><dd>'.hsc($t).'</dd>';
?>
View
2 layout.css
@@ -58,7 +58,7 @@ div.dokuwiki .bar-right {
}
div.dokuwiki #bar__bottom {
- margin-bottom:3px;
+ margin-bottom: 3px;
}
/* ------------- File Metadata ----------------------- */
View
2 media.css
@@ -35,7 +35,7 @@
/* --- Tree formatting --- */
#media__tree img {
- float:left;
+ float: left;
padding: 0.5em 0.3em 0 0;
}
View
2 mediamanager.php
@@ -9,7 +9,7 @@
* You should leave the doctype at the very top - It should
* always be the very first line of a document.
*
- * @link http://wiki.splitbrain.org/wiki:tpl:templates
+ * @link http://dokuwiki.org/templates
* @author Andreas Gohr <andi@splitbrain.org>
*/
?>
View
74 print.css
@@ -7,26 +7,26 @@ body {
table {
font-size: 100%;
- padding:0;
- margin:0;
+ padding: 0;
+ margin: 0;
}
-tr,td,th {padding:0; margin:0;}
+tr,td,th { padding: 0; margin: 0; }
-img {border:0}
+img { border: 0; }
a {
- color:#000000;
- text-decoration:none;
+ color: #000000;
+ text-decoration: none;
background: none !important;
}
div.meta {
- clear:both;
+ clear: both;
margin-top: 1em;
- font-size:70%;
- text-align:right;
+ font-size: 70%;
+ text-align: right;
}
@@ -36,7 +36,7 @@ div.success,
div.error,
div.breadcrumbs,
div.secedit {
- display:none;
+ display: none;
}
/* --------------------- Text formating -------------------------------- */
@@ -60,7 +60,7 @@ a.mail:after {
}
/* existing wikilink */
-a.wikilink1 {text-decoration:underline }
+a.wikilink1 { text-decoration: underline; }
/* the document */
div.page {
@@ -83,15 +83,15 @@ h1, h2, h3, h4, h5 {
padding-top: 0.5em;
padding-bottom: 0;
border-bottom: 1px solid #000000;
- clear:left;
+ clear: left;
}
/* special headlines */
-h1 {font-size: 160%; font-weight: bold;}
-h2 {font-size: 150%; }
-h3 {font-size: 140%; border-bottom: none; }
-h4 {font-size: 120%; border-bottom: none; }
-h5 {font-size: 100%; border-bottom: none; }
+h1 { font-size: 160%; font-weight: bold; }
+h2 { font-size: 150%; }
+h3 { font-size: 140%; border-bottom: none; }
+h4 { font-size: 120%; border-bottom: none; }
+h5 { font-size: 100%; border-bottom: none; }
/* embedded images */
img.media {
@@ -133,10 +133,10 @@ div.dokuwiki li ol {
margin-bottom: 0;
}
-div.dokuwiki ol {list-style-type: decimal}
-div.dokuwiki ol ol {list-style-type: upper-roman}
-div.dokuwiki ol ol ol {list-style-type: lower-alpha}
-div.dokuwiki ol ol ol ol {list-style-type: lower-greek}
+div.dokuwiki ol { list-style-type: decimal; }
+div.dokuwiki ol ol { list-style-type: upper-roman; }
+div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
+div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
/* the list items overriding the ol definition */
span.li {
@@ -176,29 +176,29 @@ pre.file {
}
/* footnotes */
-div.footnotes{
- clear:both;
+div.footnotes {
+ clear: both;
border-top: 1px solid #000000;
padding-left: 1em;
margin-top: 1em;
}
-div.fn{
- font-size:90%;
+div.fn {
+ font-size: 90%;
}
-a.fn_top{
- vertical-align:super;
- font-size:80%;
+a.fn_top {
+ vertical-align: super;
+ font-size: 80%;
}
-a.fn_bot{
- vertical-align:super;
- font-size:80%;
- font-weight:bold;
+a.fn_bot {
+ vertical-align: super;
+ font-size: 80%;
+ font-weight: bold;
}
-acronym{
+acronym {
border: 0;
}
@@ -222,17 +222,17 @@ table.inline td {
border: 1px solid #000000;
}
-.leftalign{
+.leftalign {
text-align: left;
}
-.centeralign{
+.centeralign {
text-align: center;
}
-.rightalign{
+.rightalign {
text-align: right;
}
-.toc, .footerinc, .header, .bar, .user {display:none}
+.toc, .footerinc, .header, .bar, .user { display: none; }
View
26 rtl.css
@@ -34,7 +34,7 @@ label.simple {
}
div.meta div.user {
- float: right
+ float: right;
}
div.meta div.doc {
@@ -72,18 +72,18 @@ div.dokuwiki h1, div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki
}
/* special headlines */
-div.dokuwiki h1 {margin-left: 0px; margin-right: 0px;}
-div.dokuwiki h2 {margin-left: 0px; margin-right: 20px;}
-div.dokuwiki h3 {margin-left: 0px; margin-right: 40px;}
-div.dokuwiki h4 {margin-left: 0px; margin-right: 60px;}
-div.dokuwiki h5 {margin-left: 0px; margin-right: 80px;}
+div.dokuwiki h1 { margin-left: 0px; margin-right: 0px; }
+div.dokuwiki h2 { margin-left: 0px; margin-right: 20px; }
+div.dokuwiki h3 { margin-left: 0px; margin-right: 40px; }
+div.dokuwiki h4 { margin-left: 0px; margin-right: 60px; }
+div.dokuwiki h5 { margin-left: 0px; margin-right: 80px; }
/* indent different sections */
-div.dokuwiki div.level1 {margin-left: 0px; margin-right: 3px;}
-div.dokuwiki div.level2 {margin-left: 0px; margin-right: 23px;}
-div.dokuwiki div.level3 {margin-left: 0px; margin-right: 43px;}
-div.dokuwiki div.level4 {margin-left: 0px; margin-right: 63px;}
-div.dokuwiki div.level5 {margin-left: 0px; margin-right: 83px;}
+div.dokuwiki div.level1 { margin-left: 0px; margin-right: 3px; }
+div.dokuwiki div.level2 { margin-left: 0px; margin-right: 23px; }
+div.dokuwiki div.level3 { margin-left: 0px; margin-right: 43px; }
+div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; }
+div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; }
/* TOC control */
div.dokuwiki div.toc {
@@ -105,12 +105,12 @@ div.dokuwiki ul.toc {
div.dokuwiki ul.toc li {
background-position: right 0.6em;
- padding-right:0.4em;
+ padding-right: 0.4em;
direction: rtl;
}
div.dokuwiki ul.toc li.clear {
- padding-right:0.4em;
+ padding-right: 0.4em;
}
div.dokuwiki pre {
View
3 style.ini
@@ -11,7 +11,8 @@ design.css = screen
typo_design.css = screen
style.css = screen
media.css = screen
-_admin.css = screen
+_admin.css = screen
+_linkwiz.css = screen
rtl.css = rtl
print.css = print
View
69 style.ini.dist
@@ -0,0 +1,69 @@
+; Please see http://www.php.net/manual/en/function.parse-ini-file.php
+; for limitations of the ini format used here
+
+; Define the stylesheets your template uses here. The second value
+; defines for which output media the style should be loaded. Currently
+; print, screen and rtl are supported. rtl styles are loaded additionally
+; to screen styles if a right-to-left language is selected (eg. hebrew)
+[stylesheets]
+layout.css = screen
+design.css = screen
+typo_design.css = screen
+style.css = screen
+media.css = screen
+_admin.css = screen
+_linkwiz.css = screen
+
+rtl.css = rtl
+print.css = print
+type_print.css = print
+
+; This section is used to configure some placeholder values used in
+; the stylesheets. Changing this file is the simplest method to
+; give your wiki a new look.
+[replacements]
+
+;--------------------------------------------------------------------------
+;------ guaranteed dokuwiki color placeholders that every plugin can use
+; main text and background colors
+__text__ = "#202020"
+__background__ = "#fff"
+; alternative text and background colors
+__text_alt__ = "#666666"
+__background_alt__ = "#efeded"
+; neutral text and background colors
+__text_neu__ = "#666"
+__background_neu__ = "#dddbd6"
+; border color
+__border__ = "#dddddd"
+__border_sb__ = "#606060"
+;--------------------------------------------------------------------------
+
+; other text and background colors
+__text_other__ = "#ccc"
+__background_other__ = "#f7f9fa"
+
+; these are used for links
+__extern__ = "#3aa3d8"
+__existing__ = "#3aa3d8"
+__missing__ = "#f30"
+
+; highlighting search snippets
+__highlight__ = "#ff9"
+
+
+;--------------------------------------------------------------------------
+;------ for keeping old templates and plugins compatible to the old pattern
+; (to be deleted at the next or after next release)
+__white__ = "#fff"
+__lightgray__ = "#f5f5f5"
+__mediumgray__ = "#ccc"
+__darkgray__ = "#666"
+__black__ = "#000"
+
+; these are the shades of blue
+__lighter__ = "#f7f9fa"
+__light__ = "#eef3f8"
+__medium__ = "#dee7ec"
+__dark__ = "#8cacbb"
+__darker__ = "#638c9c"
View
2 tpl_functions.php
@@ -36,7 +36,7 @@ function tpl_navigation() {
* @author Michael Klier <chi@chimeric.de>
*/
function tpl_actions() {
- $actions = array('admin', 'edit', 'history', 'recent', 'backlink', 'subscribe', 'subscribens', 'index', 'login', 'profile');
+ $actions = array('admin', 'revert', 'edit', 'history', 'recent', 'backlink', 'subscribe', 'subscribens', 'index', 'login', 'profile');
print '<div class="sidebar_box">' . DOKU_LF;
print ' <ul>' . DOKU_LF;

0 comments on commit e066ce1

Please sign in to comment.