1 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_admin.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_admin.css
2 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_admin.css 1970-01-01 02:00:00.000000000 +0200
3 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_admin.css 2010-10-07 11:08:14.000000000 +0300
11 +.dokuwiki ul.admin_tasks {
15 + list-style-type: none;
18 +.dokuwiki ul.admin_tasks li {
22 + background: transparent none no-repeat scroll 0 0;
26 +.dokuwiki ul.admin_tasks li div.li {
30 +.dokuwiki ul.admin_tasks li.admin_acl {
31 + background-image: url(../../images/admin/acl.png);
34 +.dokuwiki ul.admin_tasks li.admin_usermanager {
35 + background-image: url(../../images/admin/usermanager.png);
38 +.dokuwiki ul.admin_tasks li.admin_plugin {
39 + background-image: url(../../images/admin/plugin.png);
42 +.dokuwiki ul.admin_tasks li.admin_config {
43 + background-image: url(../../images/admin/config.png);
46 +.dokuwiki ul.admin_tasks li.admin_revert {
47 + background-image: url(../../images/admin/revert.png);
50 +.dokuwiki ul.admin_tasks li.admin_popularity {
51 + background-image: url(../../images/admin/popularity.png);
53 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/design.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/design.css
54 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/design.css 2009-02-14 14:13:25.000000000 +0200
55 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/design.css 2010-10-07 11:08:14.000000000 +0300
57 background-color: __background__;
58 border: 1px solid __border__;
59 padding: 0.3em 0 0 0.3em;
61 + /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */
67 /* nice alphatransparency background except for IE <7 */
69 div.dokuwiki textarea.edit[readonly],
70 div.dokuwiki input.edit[disabled],
71 div.dokuwiki input.edit[readonly],
72 +div.dokuwiki input.button[disabled],
73 div.dokuwiki select.edit[disabled] {
74 background-color: __background_neu__!important;
75 color: __text_neu__!important;
77 div.dokuwiki h5 {font-size: 100%; margin-left: 80px; border-bottom: none; font-weight: bold;}
79 /* indent different sections */
80 -div.dokuwiki div.level1 {margin-left: 3px;}
81 -div.dokuwiki div.level2 {margin-left: 23px;}
82 -div.dokuwiki div.level3 {margin-left: 43px;}
83 -div.dokuwiki div.level4 {margin-left: 63px;}
84 -div.dokuwiki div.level5 {margin-left: 83px;}
85 +div.dokuwiki div.level1 { margin-left: 3px; }
86 +div.dokuwiki div.level2 { margin-left: 23px; }
87 +div.dokuwiki div.level3 { margin-left: 43px; }
88 +div.dokuwiki div.level4 { margin-left: 63px; }
89 +div.dokuwiki div.level5 { margin-left: 83px; }
97 -/* no gap in between nested lists */
101 +/* no bottom gap in between and smaller left margin for nested lists */
105 + margin: 0 0 0 1.5em;
108 /* the list items overriding the ul/ol definition */
109 @@ -442,10 +444,10 @@
113 -div.dokuwiki ol {list-style-type: decimal}
114 -div.dokuwiki ol ol {list-style-type: upper-roman}
115 -div.dokuwiki ol ol ol {list-style-type: lower-alpha}
116 -div.dokuwiki ol ol ol ol {list-style-type: lower-greek}
117 +div.dokuwiki ol { list-style-type: decimal; }
118 +div.dokuwiki ol ol { list-style-type: upper-roman; }
119 +div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
120 +div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
122 div.dokuwiki li.open {
123 list-style-image: url(images/open.gif);
128 + font-family: monospace;
131 border: 1px dashed __border__;
132 @@ -480,16 +483,47 @@
133 background-color: __background_other__;
136 -/* inline code words */
141 /* code blocks by file tag */
142 div.dokuwiki pre.file {
143 background-color: __background_alt__;
146 +/* filenames for file and code blocks */
147 +div.dokuwiki dl.file,
148 +div.dokuwiki dl.code {
150 + margin-bottom: 2.5em;
153 +div.dokuwiki dl.file dt,
154 +div.dokuwiki dl.code dt {
155 + border: 1px dashed __border__;
157 + padding: 0.1em 1em;
161 +div.dokuwiki dl.code dt a,
162 +div.dokuwiki dl.file dt a {
166 +div.dokuwiki dl.code dt {
167 + background-color: __background_other__;
168 + border-bottom: 1px solid __background_other__;
171 +div.dokuwiki dl.file dt {
172 + background-color: __background_alt__;
173 + border-bottom: 1px solid __background_alt__;
177 +/* inline code words */
183 div.dokuwiki table.inline {
184 background-color: __background__;
188 max-width: 40%; /* IE's width is handled in javascript */
192 /* overcome IE issue with one line code or file boxes which require h. scrolling */
193 @@ -707,10 +742,14 @@
195 div.dokuwiki ul.search_quickhits li {
196 margin: 0 1.0em 0 1.0em;
202 +div.dokuwiki .section_highlight {
203 + background-color: __background_alt__ !important;
206 /* ------------------ Additional ---------------------- */
210 background-color: __background_alt__;
217 button.pickerbutton {
223 div.dokuwiki div.imagemeta img.thumb {
229 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/detail.php ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/detail.php
230 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/detail.php 2009-02-14 14:13:25.000000000 +0200
231 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/detail.php 2010-10-07 11:08:14.000000000 +0300
233 <dl class="img_tags">
235 $t = tpl_img_getTag('Date.EarliestTime');
236 - if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.strftime($conf['dformat'],$t).'</dd>';
237 + if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
239 $t = tpl_img_getTag('File.Name');
240 if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
241 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/footer.html ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/footer.html
242 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/footer.html 2009-02-14 14:13:25.000000000 +0200
243 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/footer.html 2010-10-12 19:01:18.902554928 +0300
246 <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
248 + <a <?php echo $tgt?> href="http://www.pld-linux.org/" title="PLD Linux"><img src="<?php echo DOKU_TPL; ?>images/button-pld.png" width="80" height="15" alt="PLD Linux" /></a>
250 <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
253 Files ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/images/button-php.gif and ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/images/button-php.gif differ
254 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/layout.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/layout.css
255 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/layout.css 2009-02-14 14:13:25.000000000 +0200
256 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/layout.css 2010-10-07 11:08:14.000000000 +0300
260 div.dokuwiki #bar__bottom {
262 + margin-bottom: 3px;
265 /* ------------- File Metadata ----------------------- */
266 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_linkwiz.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_linkwiz.css
267 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_linkwiz.css 1970-01-01 02:00:00.000000000 +0200
268 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_linkwiz.css 2010-10-07 11:08:14.000000000 +0300
271 + position: absolute;
279 + border: 1px solid __border__;
280 + background-color: __background_neu__;
281 + text-align: center;
285 + background-color: __background_alt__;
287 + margin-bottom: 5px;
296 + background-color: __background__;
300 + border: 1px solid __border__;
305 +#link__wiz_result div.type_u {
306 + padding: 3px 3px 3px 22px;
307 + background: transparent url(../../images/up.png) 3px 3px no-repeat;
310 +#link__wiz_result div.type_f {
311 + padding: 3px 3px 3px 22px;
312 + background: transparent url(../../images/page.png) 3px 3px no-repeat;
315 +#link__wiz_result div.type_d {
316 + padding: 3px 3px 3px 22px;
317 + background: transparent url(../../images/ns.png) 3px 3px no-repeat;
320 +#link__wiz_result div.even {
321 + background-color: __background_neu__;
324 +#link__wiz_result div.selected {
325 + background-color: __background_alt__;
328 +#link__wiz_result span {
330 + color: __text_neu__;
333 +/*FIXME maybe move to a more general style sheet*/
338 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/main.php ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/main.php
339 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/main.php 2009-02-14 14:13:25.000000000 +0200
340 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/main.php 2010-10-07 11:08:14.000000000 +0300
346 + <?php tpl_flush()?>
348 <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
352 <div class="clearer"> </div>
355 + <?php tpl_flush()?>
357 <div class="stylefoot">
359 @@ -113,10 +113,10 @@
360 <div class="bar-left" id="bar__bottomleft">
361 <?php tpl_button('edit')?>
362 <?php tpl_button('history')?>
363 + <?php tpl_button('revert')?>
365 <div class="bar-right" id="bar__bottomright">
366 <?php tpl_button('subscribe')?>
367 - <?php tpl_button('subscribens')?>
368 <?php tpl_button('admin')?>
369 <?php tpl_button('profile')?>
370 <?php tpl_button('login')?>
371 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/media.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/media.css
372 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/media.css 2009-02-14 14:13:25.000000000 +0200
373 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/media.css 2010-10-07 11:08:14.000000000 +0300
375 /* --- Tree formatting --- */
380 padding: 0.5em 0.3em 0 0;
383 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_mediaoptions.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_mediaoptions.css
384 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_mediaoptions.css 1970-01-01 02:00:00.000000000 +0200
385 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_mediaoptions.css 2010-10-07 11:08:14.000000000 +0300
390 + background-color:__background__;
392 + border: 1px solid __border__;
393 + position: absolute;
399 + font-weight:normal;
400 + background-color: __background_alt__;
402 + margin-bottom: 5px;
417 +#media__popup label {
422 +#media__popup .button {
427 +#media__popup .btnlbl {
431 +#media__popup .btnlbl input {
439 +/* --- display options --- */
441 +#media__linkopts label,
448 +#media__linkopts label{
453 +#media__linkopts label.long{
454 + margin-bottom: 8px;
458 +#media__linkopts label.long{
463 +#media__linkopts br {
467 +#media__linkopts select {
472 +#media__linkopts input.edit {
476 +#media__linkopts #media__title {
479 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/print.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/print.css
480 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/print.css 2009-02-14 14:13:25.000000000 +0200
481 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/print.css 2010-10-07 11:08:14.000000000 +0300
492 -tr,td,th {padding:0; margin:0;}
493 +tr,td,th { padding: 0; margin: 0; }
500 - text-decoration:none;
502 + text-decoration: none;
503 background: none !important;
507 + padding-left: 0px !important;
530 /* --------------------- Text formating -------------------------------- */
534 /* existing wikilink */
535 -a.wikilink1 {text-decoration:underline }
536 +a.wikilink1 { text-decoration: underline; }
543 border-bottom: 1px solid #000000;
548 /* special headlines */
549 -h1 {font-size: 160%; font-weight: bold;}
550 -h2 {font-size: 150%; }
551 -h3 {font-size: 140%; border-bottom: none; }
552 -h4 {font-size: 120%; border-bottom: none; }
553 -h5 {font-size: 100%; border-bottom: none; }
554 +h1 { font-size: 160%; font-weight: bold; }
555 +h2 { font-size: 150%; }
556 +h3 { font-size: 140%; border-bottom: none; }
557 +h4 { font-size: 120%; border-bottom: none; }
558 +h5 { font-size: 100%; border-bottom: none; }
560 /* embedded images */
562 @@ -133,16 +137,20 @@
566 -div.dokuwiki ol {list-style-type: decimal}
567 -div.dokuwiki ol ol {list-style-type: upper-roman}
568 -div.dokuwiki ol ol ol {list-style-type: lower-alpha}
569 -div.dokuwiki ol ol ol ol {list-style-type: lower-greek}
570 +div.dokuwiki ol { list-style-type: decimal; }
571 +div.dokuwiki ol ol { list-style-type: upper-roman; }
572 +div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
573 +div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
575 /* the list items overriding the ol definition */
581 + font-family: monospace;
584 /* code blocks by indention */
587 @@ -176,29 +184,29 @@
595 border-top: 1px solid #000000;
607 - vertical-align:super;
610 + vertical-align: super;
615 - vertical-align:super;
619 + vertical-align: super;
629 @@ -222,17 +230,17 @@
630 border: 1px solid #000000;
648 -.toc, .footerinc, .header, .bar, .user {display:none}
649 +.toc, .footerinc, .header, .bar, .user { display: none; }
651 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/rtl.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/rtl.css
652 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/rtl.css 2009-02-14 14:13:25.000000000 +0200
653 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/rtl.css 2010-10-07 11:08:14.000000000 +0300
667 + margin: 0.5em 3.5em 0.5em 0;
670 +div.dokuwiki li ol {
671 margin: 0.5em 1.5em 0.5em 0;
677 /* special headlines */
678 -div.dokuwiki h1 {margin-left: 0px; margin-right: 0px;}
679 -div.dokuwiki h2 {margin-left: 0px; margin-right: 20px;}
680 -div.dokuwiki h3 {margin-left: 0px; margin-right: 40px;}
681 -div.dokuwiki h4 {margin-left: 0px; margin-right: 60px;}
682 -div.dokuwiki h5 {margin-left: 0px; margin-right: 80px;}
683 +div.dokuwiki h1 { margin-left: 0px; margin-right: 0px; }
684 +div.dokuwiki h2 { margin-left: 0px; margin-right: 20px; }
685 +div.dokuwiki h3 { margin-left: 0px; margin-right: 40px; }
686 +div.dokuwiki h4 { margin-left: 0px; margin-right: 60px; }
687 +div.dokuwiki h5 { margin-left: 0px; margin-right: 80px; }
689 /* indent different sections */
690 -div.dokuwiki div.level1 {margin-left: 0px; margin-right: 3px;}
691 -div.dokuwiki div.level2 {margin-left: 0px; margin-right: 23px;}
692 -div.dokuwiki div.level3 {margin-left: 0px; margin-right: 43px;}
693 -div.dokuwiki div.level4 {margin-left: 0px; margin-right: 63px;}
694 -div.dokuwiki div.level5 {margin-left: 0px; margin-right: 83px;}
695 +div.dokuwiki div.level1 { margin-left: 0px; margin-right: 3px; }
696 +div.dokuwiki div.level2 { margin-left: 0px; margin-right: 23px; }
697 +div.dokuwiki div.level3 { margin-left: 0px; margin-right: 43px; }
698 +div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; }
699 +div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; }
702 div.dokuwiki div.toc {
703 @@ -105,15 +109,39 @@
705 div.dokuwiki ul.toc li {
706 background-position: right 0.6em;
707 - padding-right:0.4em;
708 + padding-right: 0.4em;
712 div.dokuwiki ul.toc li.clear {
713 - padding-right:0.4em;
714 + padding-right: 0.4em;
718 +div.dokuwiki .code {
722 +div.dokuwiki blockquote {
725 + border-right: 2px solid __border__;
726 + padding-right: 3px;
729 +/* Admin corrections */
735 +.dokuwiki ul.admin_tasks {
739 +.dokuwiki ul.admin_tasks li {
741 + padding-right: 35px;
742 + background: transparent none no-repeat scroll right 0;
746 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/style.ini ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/style.ini
747 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/style.ini 2009-02-14 14:13:25.000000000 +0200
748 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/style.ini 2010-10-07 11:08:14.000000000 +0300
755 +_mediaoptions.css = screen
757 +_linkwiz.css = screen
758 +_subscription.css = screen
762 diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_subscription.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_subscription.css
763 --- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_subscription.css 1970-01-01 02:00:00.000000000 +0200
764 +++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_subscription.css 2010-10-07 11:08:14.000000000 +0300
767 + * Styles for the subscription page
770 +form#subscribe__form {
773 + text-align: center;
776 +form#subscribe__form fieldset {
781 +form#subscribe__form label {
783 + margin: 0 0.5em 0.5em;