[Xfce4-commits] <wiki:master> Reworked the template

Mike Massonnet noreply at xfce.org
Tue Nov 2 17:48:01 CET 2010 

Updating branch refs/heads/master
         to 8cdba51ac065eb904eb74443fa3b5c944f5597c4 (commit)
       from 69352dac175bcfa1737948658fb6067a1fc80ed8 (commit)

commit 8cdba51ac065eb904eb74443fa3b5c944f5597c4
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Tue Nov 2 17:47:00 2010 +0100

    Reworked the template
    
    The template has been reworked on top of the latest default dokuwiki.

 lib/tpl/xfce/_admin.css                            |   48 ++
 lib/tpl/xfce/_linkwiz.css                          |   68 +++
 lib/tpl/xfce/_mediaoptions.css                     |   92 ++++
 lib/tpl/xfce/_subscription.css                     |   21 +
 lib/tpl/xfce/design.css                            |  520 ++++++++------------
 lib/tpl/xfce/detail.php                            |   32 +-
 lib/tpl/xfce/footer.html                           |   65 ---
 lib/tpl/xfce/images/UWEB.png                       |  Bin 0 -> 1138 bytes
 lib/tpl/xfce/images/UWEBshadow.png                 |  Bin 0 -> 1123 bytes
 lib/tpl/xfce/images/{menu.png => bar.png}          |  Bin 112 -> 112 bytes
 .../{bg-xfce.png => bottom-right-corner.png}       |  Bin 3498 -> 3498 bytes
 lib/tpl/xfce/images/button-donate.gif              |  Bin 200 -> 187 bytes
 lib/tpl/xfce/images/button-dw.png                  |  Bin 425 -> 427 bytes
 lib/tpl/xfce/images/button-php.gif                 |  Bin 269 -> 207 bytes
 lib/tpl/xfce/images/button-rss.png                 |  Bin 191 -> 280 bytes
 .../xfce/images/{logo.png => header-top-left.png}  |  Bin 22764 -> 22764 bytes
 .../images/{corner.png => header-top-right.png}    |  Bin 234 -> 234 bytes
 lib/tpl/xfce/images/link_icon.gif                  |  Bin 0 -> 942 bytes
 lib/tpl/xfce/images/link_icon.png                  |  Bin 864 -> 0 bytes
 lib/tpl/xfce/images/mail_icon.gif                  |  Bin 0 -> 918 bytes
 lib/tpl/xfce/images/mail_icon.png                  |  Bin 454 -> 0 bytes
 lib/tpl/xfce/images/windows.gif                    |  Bin 0 -> 223 bytes
 lib/tpl/xfce/images/windows.png                    |  Bin 579 -> 0 bytes
 lib/tpl/xfce/layout.css                            |  133 ++++--
 lib/tpl/xfce/main.php                              |  140 ++++--
 lib/tpl/xfce/media.css                             |   31 +-
 lib/tpl/xfce/mediamanager.php                      |   21 +-
 lib/tpl/xfce/print.css                             |  155 ++++---
 lib/tpl/xfce/rtl.css                               |   56 ++-
 lib/tpl/xfce/style.ini                             |   36 +-
 lib/tpl/xfce/translations.html                     |    5 -
 31 files changed, 812 insertions(+), 611 deletions(-)

diff --git a/lib/tpl/xfce/_admin.css b/lib/tpl/xfce/_admin.css
new file mode 100644
index 0000000..6c8066b
--- /dev/null
+++ b/lib/tpl/xfce/_admin.css
@@ -0,0 +1,48 @@
+#admin__version {
+    clear:left;
+    float: right;
+    color: __text_neu__;
+}
+
+.dokuwiki ul.admin_tasks {
+    font-size: 115%;
+    float: left;
+    width: 40%;
+    list-style-type: none;
+}
+
+.dokuwiki ul.admin_tasks li {
+    line-height: 22px;
+    padding-left: 35px;
+    margin: 1em 0;
+    background: transparent none no-repeat scroll 0 0;
+    text-align: left;
+}
+
+.dokuwiki ul.admin_tasks li div.li {
+    font-weight: bold;
+}
+
+.dokuwiki ul.admin_tasks li.admin_acl {
+    background-image: url(../../images/admin/acl.png);
+}
+
+.dokuwiki ul.admin_tasks li.admin_usermanager {
+    background-image: url(../../images/admin/usermanager.png);
+}
+
+.dokuwiki ul.admin_tasks li.admin_plugin {
+    background-image: url(../../images/admin/plugin.png);
+}
+
+.dokuwiki ul.admin_tasks li.admin_config {
+    background-image: url(../../images/admin/config.png);
+}
+
+.dokuwiki ul.admin_tasks li.admin_revert {
+    background-image: url(../../images/admin/revert.png);
+}
+
+.dokuwiki ul.admin_tasks li.admin_popularity {
+    background-image: url(../../images/admin/popularity.png);
+}
diff --git a/lib/tpl/xfce/_linkwiz.css b/lib/tpl/xfce/_linkwiz.css
new file mode 100644
index 0000000..0607073
--- /dev/null
+++ b/lib/tpl/xfce/_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;
+}
diff --git a/lib/tpl/xfce/_mediaoptions.css b/lib/tpl/xfce/_mediaoptions.css
new file mode 100644
index 0000000..7ac4899
--- /dev/null
+++ b/lib/tpl/xfce/_mediaoptions.css
@@ -0,0 +1,92 @@
+/* --- popup --- */
+
+#media__popup {
+    background-color:__background__;
+    display:none;
+    border: 1px solid __border__;
+    position: absolute;
+    width:270px;
+}
+
+#media__popup h1 {
+    text-align:center;
+    font-weight:normal;
+    background-color: __background_alt__;
+    height: 16px;
+    margin-bottom: 5px;
+    font-size:12px;
+    border-bottom: 0;
+}
+
+#media__popup p {
+    display:block;
+    line-height:14pt;
+    margin:0.5em;
+}
+
+#media_nolink {
+    padding:4px 0;
+}
+
+#media__popup label {
+    float:left;
+    width:9em;
+}
+
+#media__popup .button {
+    margin-left:auto;
+    margin-right:auto;
+}
+
+#media__popup .btnlbl {
+    text-align:center;
+}
+
+#media__popup .btnlbl input {
+    margin:0 1em;
+}
+
+#media__closeimg {
+    float:right;
+}
+
+/* --- display options --- */
+
+#media__linkopts label,
+#media__nolnk {
+	width: 80px;
+	float: left;
+	margin-left: 10px;
+}
+
+#media__linkopts label{
+	line-height: 20px;
+}
+
+#media__nolnk,
+#media__linkopts label.long{
+	margin-bottom: 8px;
+	line-height: 12px;
+}
+
+#media__linkopts label.long{
+	width: 150px;
+	float: none;
+}
+
+#media__linkopts br {
+	clear: both;
+}
+
+#media__linkopts select {
+	width: 60px;
+	margin-left: 10px;
+}
+
+#media__linkopts input.edit {
+    width:50px;
+    margin-left:10px;
+}
+#media__linkopts #media__title {
+    width:150px;
+}
diff --git a/lib/tpl/xfce/_subscription.css b/lib/tpl/xfce/_subscription.css
new file mode 100644
index 0000000..0792c8c
--- /dev/null
+++ b/lib/tpl/xfce/_subscription.css
@@ -0,0 +1,21 @@
+/**
+ * Styles for the subscription page
+ */
+
+form#subscribe__form {
+    display: block;
+    width: 300px;
+    text-align: center;
+}
+
+form#subscribe__form fieldset {
+    text-align: left;
+    margin: 0.5em 0;
+}
+
+form#subscribe__form label {
+    display:block;
+    margin: 0 0.5em 0.5em;
+}
+
+
diff --git a/lib/tpl/xfce/design.css b/lib/tpl/xfce/design.css
index 9cfb432..8c62457 100644
--- a/lib/tpl/xfce/design.css
+++ b/lib/tpl/xfce/design.css
@@ -1,8 +1,9 @@
 /**
  * Design elements for default Template
  *
+ * @author Mike Massonnet <mmassonnet at xfce.org>
  * @author Andreas Gohr <andi at splitbrain.org>
- * @author Anika Henke <henke at cosmocode.de>
+ * @author Anika Henke <anika at selfthinker.org>
  */
 
 /* -------------- general elements --------------- */
@@ -10,189 +11,25 @@
 * { padding: 0; margin: 0; }
 
 body {
-  min-width: 650px;
-  margin: 0;
-  padding: 0;
-  background-color: #fff;
-  background-position: bottom right;
-  background-attachment: fixed;
-  background-repeat: no-repeat;
-  background-image: url(images/bg-xfce.png);
-  color: #000;
-  font-family: arial, helvetica, sans-serif;
-}
-
-body div.dokuwiki {
-  margin: 0 auto;
-  padding: 10px;
-}
-
-.clear {
-  clear: both;
-  margin: 0;
-  padding: 0;
-}
-
-.hidden {
-  display:none;
-}
-
-/**
- * Header
- **/
-
-#xfce-header {
-}
-
-/**
- * Footer
- **/
-
-#xfce-footer {
-  margin: 40px 220px 2em 0;
-  padding: 10px 0;
-  font-size: 0.7em;
-  border-top: 1px solid #d4d4d4;
-  color: #999;
-  text-align: center;
-  line-height: 2em;
-}
-#xfce-footer .copy {
-  white-space: nowrap;
-  margin: 1em 2em;
-}
-#xfce-footer .button {
-  border: 0;
-  padding: 0;
-  margin: 0;
-  background: transparent !important;
-}
-#xfce-footer a,
-#xfce-footer .button{
-  color: #666;
-  font-weight: bold;
-  text-decoration: none;
-}
-
-/**
- * Menu
- */
-
-#xfce-menu-top {
-  font-size: 0.7em;
-  /* Header */
-  height: 142px;
-  background-image:url(images/header.png);
-  background-repeat: repeat-x;
-}
-
-#xfce-menu-top-left {
-  width: 350px;
-  height: 125px;
-  float: left;
-  background-image: url(images/logo.png);
-  background-repeat: no-repeat;
-}
-
-#xfce-menu-top-right {
-  width: 200px;
-  height: 125px;
-  float: right;
-  background-image: url(images/corner.png);
-  background-position: top right;
-  background-repeat: no-repeat;
-}
-
-#xfce-menu-links {
-  clear: both;
-  border: 1px solid #C6C6C6;
-  background: #e9e9e9 url(images/menu.png) repeat-x;
-  padding: 0;
-}
-#xfce-menu-links ul {
-  list-style: none;
-  display: inline;
-  padding: 0 0 0 1em;
-  margin: 0;
-}
-#xfce-menu-links ul li {
-  padding: 0 1em 0 1.2em;
-  display: inline;
-  border-left: 1px solid #b4b4b4;
-}
-#xfce-menu-links ul li:first-child {
-  border-left: 0;
-  padding-left: 0;
-}
-#xfce-menu-links ul li .button {
-  border: 0;
-  padding: 0;
-  margin: 0;
-  background: transparent !important;
-}
-#xfce-menu-links ul li a,
-#xfce-menu-links ul li .button{
-  color: #666;
-  font-weight: bold;
-  text-decoration: none;
-}
-#xfce-menu-search ul li .edit {
-  border: 1px solid #c6c6c6;
-  padding: 0.2em;
-  margin: 0;
-  background: #fff;
-  color: #000;
-  width: 150px;
-  max-height: 50px;
-}
-
-#xfce-menu-breadcrumbs {
-  color: #999;
-  margin-right: 25%;
-}
-#xfce-menu-breadcrumbs a {
-  color: #999;
-}
-#xfce-menu-breadcrumbs a:hover {
-  color: #333;
-}
-#xfce-menu-breadcrumbs #xfce-breadcrumbs-yourarehere {
-  margin-right: 2em;
-}
-#xfce-menu-translation div.plugin_translation span {
-  display: none;
-}
-#xfce-menu-translation div.plugin_translation span.curid {
-  display: inline;
+  font: 80% Helvetica, Arial, sans-serif;
+  background-color: __background__;
+  color: __text__;
 }
 
-/**
- * Content
- */
-
-#xfce-content-wrap {
-  margin-right: 220px;
-  padding: 20px 10px 10px 10px;
-  line-height: 1.6em;
-  font-size: 80%;
-  /* Nice banner with previews of the good taste */
-  /*padding-top: 92px;
-  background-image:url();*/
+/* the document */
+div.bottom-right-corner {
+  position: fixed;
+  z-index: -1;
+  right: 0;
+  bottom: 0;
+  width: 205px;
+  height: 152px;
+  background: no-repeat url(images/bottom-right-corner.png);
 }
 
-/* the document */
 div.dokuwiki div.page {
-  margin: 4px 2em 0 1em;
   text-align: justify;
-}
-
-div.dokuwiki div.license {
-  clear: both;
-  text-align: left;
-}
-
-div.dokuwiki div.license a {
-  font-weight: normal !important;
+  line-height: 1.7em;
 }
 
 div.dokuwiki table {
@@ -227,9 +64,16 @@ div.dokuwiki div.nothing {
   margin: 2em;
 }
 
+div.dokuwiki div.stylefoot {
+  margin-top: 1.5em;
+  border-top: 1px __border__ solid;
+  color: __text_alt__;
+}
+
 /* ---------------- forms ------------------------ */
 
 div.dokuwiki form {
+  border: none;
   display: inline;
 }
 
@@ -264,7 +108,10 @@ div.dokuwiki textarea.edit {
   background-color: __background__;
   border: 1px solid __border__;
   padding: 0.3em 0 0 0.3em;
-  width: 100%;
+  /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */
+  width: 700px;
+  min-width: 100%;
+  max-width: 100%;
 }
 
 /* nice alphatransparency background except for IE <7 */
@@ -310,6 +157,7 @@ div.dokuwiki textarea.edit[disabled],
 div.dokuwiki textarea.edit[readonly],
 div.dokuwiki input.edit[disabled],
 div.dokuwiki input.edit[readonly],
+div.dokuwiki input.button[disabled],
 div.dokuwiki select.edit[disabled] {
   background-color: __background_neu__!important;
   color: __text_neu__!important;
@@ -344,17 +192,33 @@ div.dokuwiki div#draft__status {
   color: __text_alt__;
 }
 
-/* --------- buttons ------------------- */
+div.dokuwiki div.license {
+  padding: 0.5em 0;
+  font-size: 90%;
+  text-align: left;
+}
 
+div.dokuwiki div.credit {
+  margin: 1.4em 0;
+  text-align: center;
+}
+
+div.dokuwiki form#dw__editform div.license {
+  clear: left;
+  font-size: 90%;
+}
+
+/* --------- buttons ------------------- */
 
 div.dokuwiki input.button,
 div.dokuwiki button.button {
   border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
+  color: __text_alt__;
+  background-color: __background_alt__;
   vertical-align: middle;
   text-decoration: none;
   font-size: 100%;
+  font-weight: bold;
   cursor: pointer;
   margin: 1px;
   padding: 0.125em 0.4em;
@@ -363,23 +227,25 @@ div.dokuwiki button.button {
 /* nice alphatransparency background except for IE <7 */
 html>body div.dokuwiki input.button,
 html>body div.dokuwiki button.button {
-  background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
+  background:  __background_alt__ url(images/buttonshadow.png) repeat-x bottom;
 }
 
 * html div.dokuwiki input.button,
 * html div.dokuwiki button.button {
   height: 1.8em;
+  font-weight: bold;
 }
 
 div.dokuwiki div.secedit input.button {
   border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
+  color: __text_alt__;
+  background-color: __background_alt__;
   vertical-align: middle;
   text-decoration: none;
   margin: 0;
   padding: 0;
   font-size: 10px;
+  font-weight: bold;
   cursor: pointer;
   float: right;
   display: inline;
@@ -405,12 +271,14 @@ div.dokuwiki div.pagenav-next {
 
 /* --------------- Links ------------------ */
 
-:link, :visited, :link:active, :link:active {
-  color: #154374;
+div.dokuwiki a:link,
+div.dokuwiki a:visited {
+  color: __extern__;
   text-decoration: underline;
 }
-:link:hover, :visited:hover {
-  color: #f00;
+div.dokuwiki a:hover,
+div.dokuwiki a:active {
+  color: __hover__;
   text-decoration: underline;
 }
 
@@ -420,18 +288,19 @@ div.dokuwiki h3 a,
 div.dokuwiki h4 a,
 div.dokuwiki h5 a,
 div.dokuwiki a.nolink {
+  color: __text__ !important;
   text-decoration: none !important;
 }
 
 /* external link */
 div.dokuwiki a.urlextern {
-  background: transparent url(images/link_icon.png) 0px 0px no-repeat;
+  background: transparent url(images/link_icon.gif) 0px 1px no-repeat;
   padding: 1px 0px 1px 16px;
 }
 
 /* windows share */
 div.dokuwiki a.windows {
-  background: transparent url(images/windows.png) 0px 0px no-repeat;
+  background: transparent url(images/windows.gif) 0px 1px no-repeat;
   padding: 1px 0px 1px 16px;
 }
 
@@ -446,39 +315,39 @@ div.dokuwiki a.media {
 div.dokuwiki a.urlextern:link,
 div.dokuwiki a.windows:link,
 div.dokuwiki a.interwiki:link {
-  color: #154374;
+  color: __extern__;
 }
 
 div.dokuwiki a.urlextern:visited,
 div.dokuwiki a.windows:visited,
 div.dokuwiki a.interwiki:visited {
-  color: #555;
+  color: purple;
 }
 div.dokuwiki a.urlextern:hover,
 div.dokuwiki a.urlextern:active,
 div.dokuwiki a.windows:hover,
 div.dokuwiki a.windows:active,
-div.dokuwiki a.interwiki:hover,
-div.dokuwiki a.interwiki:active,
 div.dokuwiki a.wikilink1:hover,
-div.dokuwiki a.wikilink1:active {
-  color: #f00;
+div.dokuwiki a.wikilink1:active,
+div.dokuwiki a.interwiki:hover,
+div.dokuwiki a.interwiki:active {
+  color: __hover__;
 }
 
 /* email link */
 div.dokuwiki a.mail {
-  background: transparent url(images/mail_icon.png) 0px 0px no-repeat;
+  background: transparent url(images/mail_icon.gif) 0px 1px no-repeat;
   padding: 1px 0px 1px 16px;
 }
 
 /* existing wikipage */
 div.dokuwiki a.wikilink1 {
-  color: #154374;
+  color: __existing__;
 }
 
 /* not existing wikipage */
 div.dokuwiki a.wikilink2 {
-  color: #154374 !important;
+  color: __existing__ !important;
   text-decoration: none !important;
   border-bottom: dashed 1px __missing__ !important;
 }
@@ -495,10 +364,26 @@ div.dokuwiki div.preview {
 div.dokuwiki div.breadcrumbs {
   background-color: __background_neu__;
   color: __text_neu__;
-  font-size: 80%;
+  font-size: 84%;
   padding: 0 0 0 4px;
 }
 
+div.dokuwiki div.translation {
+  float: right;
+  font-size: 84%;
+}
+
+div.dokuwiki div.translation div.notify,
+div.dokuwiki div.plugin_translation {
+  padding-right: 0;
+  margin-right: 3px;
+  float: left;
+}
+
+div.dokuwiki div.plugin_translation span {
+  display: none;
+}
+
 div.dokuwiki span.user {
   color: __text_other__;
   font-size: 90%;
@@ -548,33 +433,44 @@ div.dokuwiki h2,
 div.dokuwiki h3,
 div.dokuwiki h4,
 div.dokuwiki h5 {
-  color: #154374;
-  background: none;
-  font-weight: bold;
-  border-bottom: 1px solid #d4d4d4;
-  margin-bottom: 1em;
+    font-size: 100%;
+    font-weight: bold;
+    color: __extern__ !important;
+    margin: 0 0 1em 0;
+    padding: 0.5em 0 0 0;
+    border-bottom: 1px solid __border__;
+    clear: left;
+}
+
+div.dokuwiki h1 a,
+div.dokuwiki h2 a,
+div.dokuwiki h3 a,
+div.dokuwiki h4 a,
+div.dokuwiki h5 a {
+    color: __extern__ !important;
+    background-color: inherit;
 }
 
 /* special headlines */
-div.dokuwiki h1 {font-size: 160%; margin-top: 1.4em; margin-left: 0px;}
-div.dokuwiki h2 {font-size: 140%; margin-top: 1.2em; margin-left: 20px;}
-div.dokuwiki h3 {font-size: 120%; margin-top: 1em; margin-left: 40px;}
-div.dokuwiki h4 {font-size: 100%; margin-left: 60px;}
-div.dokuwiki h5 {margin-left: 80px;}
+div.dokuwiki h1 {font-size: 160%; margin-left: 0px; font-weight: bold;}
+div.dokuwiki h2 {font-size: 150%; margin-left: 20px;}
+div.dokuwiki h3 {font-size: 140%; margin-left: 40px; border-bottom: none; font-weight: bold;}
+div.dokuwiki h4 {font-size: 120%; margin-left: 60px; border-bottom: none; font-weight: bold;}
+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 {
   line-height: 1.5em;
   list-style-type: square;
   list-style-image: none;
-  margin: 0 0 0.5em 1.5em;
+  margin: 0 0 1em 3.5em;
   color: __text_alt__;
 }
 
@@ -582,21 +478,27 @@ div.dokuwiki ul {
 div.dokuwiki ol {
   line-height: 1.5em;
   list-style-image: none;
-  margin: 0 0 0.5em 1.5em;
+  margin: 0 0 1em 3.5em;
   color: __text_alt__;
   font-weight: bold;
 }
 
+/* no bottom gap in between and smaller left margin for nested lists */
+div.dokuwiki li ul,
+div.dokuwiki li ol {
+  margin: 0 0 0 1.5em;
+}
+
 /* the list items overriding the ul/ol definition */
 div.dokuwiki .li {
   color: __text__;
   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);
@@ -614,24 +516,22 @@ div.dokuwiki blockquote {
 }
 
 div.dokuwiki pre {
+  font-family: monospace;
   font-size: 120%;
   padding: 0.5em;
+  border: 1px dashed __border__;
   color: __text__;
+  overflow: auto;
 }
 
 /* code blocks by indention */
 div.dokuwiki pre.pre {
-  background-color: #eee;
+  background-color: __background_other__;
 }
 
 /* code blocks by code tag */
 div.dokuwiki pre.code {
-  background-color: #eee;
-}
-
-/* inline code words */
-div.dokuwiki code {
-  font-size: 120%;
+  background-color: __background_other__;
 }
 
 /* code blocks by file tag */
@@ -639,6 +539,42 @@ 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__;
@@ -647,44 +583,35 @@ div.dokuwiki table.inline {
 }
 
 div.dokuwiki table.inline th {
-  padding: 4px;
-  border: 0;
-  background-color: __background__;
-  color: #154374;
-  font-weight: bold;
-  font-size: 1.2em;
+  padding: 3px;
+  border: 1px solid __border__;
+  background-color: __background_alt__;
 }
 
 div.dokuwiki table.inline td {
-  border: 2px solid __background__;
-  background-color: #eee;
-  padding: 1px 3px;
+  padding: 3px;
+  border: 1px solid __border__;
 }
 
 /* ---------- table of contents ------------------- */
 
 div.dokuwiki div.toc {
-  margin: 1.2em 0 0 2em;
-  position: absolute;
   float: right;
-  right: 20px;
-  width: 200px;
   font-size: 90%;
-  line-height: 2em;
   clear: both;
+  opacity: 0.8;
 }
 
 div.dokuwiki div.tocheader {
-  border: 1px solid #d4d4d4;
-  background-color: #eee;
-  text-align: left;
-  font-weight: bold;
-  padding: 3px;
+  visibility: hidden;
+  height: 0;
+  margin: 0;
+  padding: 0;
 }
 
 div.dokuwiki span.toc_open,
 div.dokuwiki span.toc_close {
-    border: 0.4em solid #eee;
+    border: 0.4em solid __background_alt__;
     float: right;
     display: block;
     margin: 0.4em 3px 0 0;
@@ -706,24 +633,27 @@ div.dokuwiki span.toc_close {
 }
 
 div.dokuwiki #toc__inside {
-  border: 1px solid #d4d4d4;
-  border-top: 0;
-  background-color: #eee;
+  border: 1px solid __border__;
+  background-color: __background_alt__;
   text-align: left;
-  padding: 0.5em 0 0.7em 0;
+  padding: 0.6em 0;
 }
 
 div.dokuwiki ul.toc {
   list-style-type: none;
   list-style-image: none;
   line-height: 1.6em;
-  padding-left: 1em;
+  padding: 0 0.8em;
   margin: 0;
 }
 
-div.dokuwiki ul.toc li {
-  background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat;
-  padding-left: 0.6em;
+div.dokuwiki ul.toc li.level1 {
+  background: transparent url(images/bullit.gif) 0 0.6em no-repeat;
+  padding-left: 10px;
+}
+
+div.dokuwiki ul.toc li.level1 > div.li {
+  padding: 2px 0;
 }
 
 div.dokuwiki ul.toc li.clear {
@@ -733,11 +663,12 @@ div.dokuwiki ul.toc li.clear {
 
 div.dokuwiki a.toc:link,
 div.dokuwiki a.toc:visited {
-  display: block;
+  color: __extern__;
 }
 
 div.dokuwiki a.toc:hover,
 div.dokuwiki a.toc:active {
+  color: __text__;
 }
 
 /* ---------------------------- Diff rendering --------------------------*/
@@ -750,11 +681,25 @@ div.dokuwiki td.diff-blockheader {
 }
 div.dokuwiki table.diff th {
   border-bottom: 1px solid __border__;
-  font-size: 120%;
+  font-size: 110%;
   width: 50%;
   font-weight: normal;
   text-align: left;
 }
+div.dokuwiki table.diff th a {
+    font-weight: bold;
+}
+div.dokuwiki table.diff th span.user {
+    color: __text__;
+    font-size: 80%;
+}
+div.dokuwiki table.diff th span.sum {
+    font-size: 80%;
+    font-weight: bold;
+}
+div.dokuwiki table.diff th.minor {
+  font-style: italic;
+}
 div.dokuwiki table.diff td {
   font-family: monospace;
   font-size: 100%;
@@ -786,14 +731,7 @@ div.dokuwiki div.fn {
   font-size: 90%;
 }
 
-div.dokuwiki a.fn_top {
-  vertical-align: super;
-  font-size: 80%;
-}
-
 div.dokuwiki a.fn_bot {
-  vertical-align: super;
-  font-size: 80%;
   font-weight: bold;
 }
 
@@ -806,6 +744,7 @@ div.insitu-footnote {
   text-align: left;
   padding: 4px;
   max-width: 40%;    /* IE's width is handled in javascript */
+  min-width: 5em;
 }
 
 /* overcome IE issue with one line code or file boxes which require h. scrolling */
@@ -855,10 +794,14 @@ div.dokuwiki ul.search_quickhits {
 
 div.dokuwiki ul.search_quickhits li {
   margin: 0 1.0em 0 1.0em;
-  float:left;
+  float: left;
   width: 30%;
 }
 
+div.dokuwiki .section_highlight {
+  background-color: __background_neu__ !important;
+}
+
 /* ------------------ Additional ---------------------- */
 
 div.footerinc {
@@ -909,6 +852,10 @@ div.picker {
   background-color: __background_alt__;
 }
 
+div.pk_hl {
+  width: 125px;
+}
+
 button.pickerbutton {
   padding: 0px;
   margin: 0 1px 1px 0;
@@ -918,51 +865,19 @@ button.pickerbutton {
   cursor: pointer;
 }
 
-/* ---------- Spellchecking ------------- */
-
-div.dokuwiki a.spell_error {
-  color: #f00;
-  text-decoration: underline;
-}
-
-div.dokuwiki div#spell__suggest {
-  background-color: __background__;
-  padding: 2px;
-  border: 1px solid __text__;
-  font-size: 80%;
-  display: none;
-}
-
-div.dokuwiki div#spell__result {
-  border: 1px solid __border__;
-  color: __text__;
-  font-size: 14px;
-  padding: 3px;
-  background-color: __background_other__;
-  display: none;
-}
-
-div.dokuwiki span.spell_noerr {
-  color: #093;
-}
-
-div.dokuwiki span.spell_wait {
-  color: #06c;
-}
-
 /* ---------------  Image Details  ----------------- */
 
 div.dokuwiki div.img_big {
   float: left;
+  padding: 1.5em;
   margin-right: 0.5em;
+  background-color: __background__;
 }
 
 div.dokuwiki dl.img_tags dt {
   font-weight: bold;
-  background-color: __background_alt__;
 }
 div.dokuwiki dl.img_tags dd {
-  background-color: __background_neu__;
 }
 
 div.dokuwiki div.imagemeta {
@@ -972,6 +887,7 @@ div.dokuwiki div.imagemeta {
 }
 
 div.dokuwiki div.imagemeta img.thumb {
-  float:left;
+  float: left;
   margin-right: 0.1em;
 }
+
diff --git a/lib/tpl/xfce/detail.php b/lib/tpl/xfce/detail.php
index 5e89e39..18f83b4 100644
--- a/lib/tpl/xfce/detail.php
+++ b/lib/tpl/xfce/detail.php
@@ -1,15 +1,11 @@
 <?php
 /**
- * DokuWiki Image Detail Template
+ * Xfce Wiki Template
  *
- * This is the template for displaying image details
+ * This template is based on top of the default DokuWiki template.
  *
- * 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
- * @author Andreas Gohr <andi at splitbrain.org>
- **/
+ * @author Mike Massonnet <andi at splitbrain.org>
+ */
 
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
@@ -20,19 +16,18 @@ if (!defined('DOKU_INC')) die();
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-     <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
-    [<?php echo strip_tags($conf['title'])?>]
-  </title>
+  <title><?php echo strip_tags($conf['title'])?> - <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></title>
 
   <?php tpl_metaheaders()?>
 
-  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" />
+  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.png" />
 </head>
 
 <body>
+
+<div class="msgarea"><?php html_msgarea()?></div>
+
 <div class="dokuwiki">
-  <?php html_msgarea()?>
 
   <div class="page">
     <?php if($ERROR){ print $ERROR; }else{ ?>
@@ -45,10 +40,7 @@ if (!defined('DOKU_INC')) die();
 
     <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>← <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
@@ -56,7 +48,7 @@ if (!defined('DOKU_INC')) die();
       <dl class="img_tags">
         <?php
           $t = tpl_img_getTag('Date.EarliestTime');
-          if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.date($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 +68,7 @@ if (!defined('DOKU_INC')) die();
           $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>';
 
         ?>
diff --git a/lib/tpl/xfce/footer.html b/lib/tpl/xfce/footer.html
deleted file mode 100644
index b73448a..0000000
--- a/lib/tpl/xfce/footer.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Example footer include
- *
- * This file shows you how to use the include hooks. However I recommend to
- * create your own complete new template instead.
- */
-
-$tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : '';
-?>
-
-<div class="footerinc">
-  <a <?php echo $tgt?> href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" /></a>
-
-  <a <?php echo $tgt?> href="http://creativecommons.org/licenses/by-nc-sa/2.0/" rel="license" title="Creative Commons License"><img src="<?php echo DOKU_TPL; ?>images/button-cc.gif" width="80" height="15" alt="Creative Commons License" /></a>
-
-  <a <?php echo $tgt?> href="https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a>
-
-  <a <?php echo $tgt?> href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
-
-  <a <?php echo $tgt?> href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo DOKU_TPL; ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
-
-  <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>
-
-  <a <?php echo $tgt?> href="http://wiki.splitbrain.org/wiki:dokuwiki" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
-
-
-<?php
-/*
- * The following stuff in HTML comments declares a Creative Commons
- * License - remove this if you don't want this license for your Wiki
- */
-?>
-
-<!--
-
-<rdf:RDF xmlns="http://web.resource.org/cc/"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
-   <dc:type rdf:resource="http://purl.org/dc/dcmitype/Text" />
-   <license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.0/">
-   <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
-   <permits rdf:resource="http://web.resource.org/cc/Distribution" />
-   <requires rdf:resource="http://web.resource.org/cc/Notice" />
-   <requires rdf:resource="http://web.resource.org/cc/Attribution" />
-   <prohibits rdf:resource="http://web.resource.org/cc/CommercialUse" />
-   <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-   <requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
-</License>
-
-</rdf:RDF>
-
--->
-
-<?php
-if ($conf['allowdebug']) {
-    echo '<!-- page made in '.round(delta_time(DOKU_START_TIME), 3).' seconds -->';
-}
-?>
-
-</div>
diff --git a/lib/tpl/xfce/images/UWEB.png b/lib/tpl/xfce/images/UWEB.png
new file mode 100644
index 0000000..ea03aec
Binary files /dev/null and b/lib/tpl/xfce/images/UWEB.png differ
diff --git a/lib/tpl/xfce/images/UWEBshadow.png b/lib/tpl/xfce/images/UWEBshadow.png
new file mode 100644
index 0000000..212444f
Binary files /dev/null and b/lib/tpl/xfce/images/UWEBshadow.png differ
diff --git a/lib/tpl/xfce/images/menu.png b/lib/tpl/xfce/images/bar.png
similarity index 100%
rename from lib/tpl/xfce/images/menu.png
rename to lib/tpl/xfce/images/bar.png
diff --git a/lib/tpl/xfce/images/bg-xfce.png b/lib/tpl/xfce/images/bottom-right-corner.png
similarity index 100%
rename from lib/tpl/xfce/images/bg-xfce.png
rename to lib/tpl/xfce/images/bottom-right-corner.png
diff --git a/lib/tpl/xfce/images/button-donate.gif b/lib/tpl/xfce/images/button-donate.gif
index ec682c6..bba284e 100644
Binary files a/lib/tpl/xfce/images/button-donate.gif and b/lib/tpl/xfce/images/button-donate.gif differ
diff --git a/lib/tpl/xfce/images/button-dw.png b/lib/tpl/xfce/images/button-dw.png
index 7d4c109..39d5f56 100644
Binary files a/lib/tpl/xfce/images/button-dw.png and b/lib/tpl/xfce/images/button-dw.png differ
diff --git a/lib/tpl/xfce/images/button-php.gif b/lib/tpl/xfce/images/button-php.gif
index 28f329a..19aefb0 100644
Binary files a/lib/tpl/xfce/images/button-php.gif and b/lib/tpl/xfce/images/button-php.gif differ
diff --git a/lib/tpl/xfce/images/button-rss.png b/lib/tpl/xfce/images/button-rss.png
index f243804..b036f71 100644
Binary files a/lib/tpl/xfce/images/button-rss.png and b/lib/tpl/xfce/images/button-rss.png differ
diff --git a/lib/tpl/xfce/images/logo.png b/lib/tpl/xfce/images/header-top-left.png
similarity index 100%
rename from lib/tpl/xfce/images/logo.png
rename to lib/tpl/xfce/images/header-top-left.png
diff --git a/lib/tpl/xfce/images/corner.png b/lib/tpl/xfce/images/header-top-right.png
similarity index 100%
rename from lib/tpl/xfce/images/corner.png
rename to lib/tpl/xfce/images/header-top-right.png
diff --git a/lib/tpl/xfce/images/link_icon.gif b/lib/tpl/xfce/images/link_icon.gif
new file mode 100644
index 0000000..815ccb1
Binary files /dev/null and b/lib/tpl/xfce/images/link_icon.gif differ
diff --git a/lib/tpl/xfce/images/link_icon.png b/lib/tpl/xfce/images/link_icon.png
deleted file mode 100644
index a588968..0000000
Binary files a/lib/tpl/xfce/images/link_icon.png and /dev/null differ
diff --git a/lib/tpl/xfce/images/mail_icon.gif b/lib/tpl/xfce/images/mail_icon.gif
new file mode 100644
index 0000000..50a87a9
Binary files /dev/null and b/lib/tpl/xfce/images/mail_icon.gif differ
diff --git a/lib/tpl/xfce/images/mail_icon.png b/lib/tpl/xfce/images/mail_icon.png
deleted file mode 100644
index 3ab3b2d..0000000
Binary files a/lib/tpl/xfce/images/mail_icon.png and /dev/null differ
diff --git a/lib/tpl/xfce/images/windows.gif b/lib/tpl/xfce/images/windows.gif
new file mode 100644
index 0000000..4f12acc
Binary files /dev/null and b/lib/tpl/xfce/images/windows.gif differ
diff --git a/lib/tpl/xfce/images/windows.png b/lib/tpl/xfce/images/windows.png
deleted file mode 100644
index b057174..0000000
Binary files a/lib/tpl/xfce/images/windows.png and /dev/null differ
diff --git a/lib/tpl/xfce/layout.css b/lib/tpl/xfce/layout.css
index f246d10..f7033de 100644
--- a/lib/tpl/xfce/layout.css
+++ b/lib/tpl/xfce/layout.css
@@ -1,51 +1,123 @@
 /**
  * Tableless Layout for default template
  *
+ * @author Mike Massonnet <mmassonnet at xfce.org>
  * @author Andreas Gohr <andi at splitbrain.org>
  * @author moraes <moraes at tipos.com.br>
  */
 
+div.dokuwiki {
+  margin: 0 auto;
+  padding: 10px 42px;
+  max-width: 1280px;
+  min-width: 650px;
+}
+
+body > div.export {
+  margin-right: 180px;
+}
+
+div.dokuwiki div.page {
+  margin: 4px 180px 4px 0;
+  min-height: 300px;
+}
+
+div.dokuwiki div.toc {
+  margin: 1.2em -180px 0 0;
+  width: 170px;
+}
+
+div.dokuwiki div.stylefoot {
+  margin-right: 170px;
+}
+
 /* -------------- top row --------------- */
 div.dokuwiki .header {
-  padding: 3px 0 0 2px;
 }
 
-div.dokuwiki .pagename {
+div.dokuwiki .header #banner {
+  height: 125px;
+  background: url(images/header.png) repeat-x;
+}
+
+div.dokuwiki .header #banner > #banner-top-left {
+  width: 350px;
+  height: 125px;
   float: left;
-  font-size: 200%;
-  font-weight: bolder;
-  color: __background_alt__;
-  text-align: left;
-  vertical-align: middle;
+  background: url(images/header-top-left.png) no-repeat;
 }
 
-div.dokuwiki .pagename a {
-  color: __extern__ !important;
+div.dokuwiki .header #banner > #banner-top-right {
+  width: 15px;
+  height: 15px;
+  float: right;
+  background: url(images/header-top-right.png) no-repeat;
+}
+
+/* ---------------  top and bottom bar ---------------- */
+div.dokuwiki #bar__top {
+  border: 1px solid __border__;
+  background: __background_bar__ url(images/bar.png) repeat-x;
+  font-size: 90%;
+  padding: 1px 3px;
+  clear: both;
+}
+
+div.dokuwiki #bar__top input[type="text"] {
+  width: 160px;
+}
+
+div.dokuwiki #bar__top input[type="submit"] {
+  background: transparent;
+  border: 0;
+  padding: 0 0.3em 0 0;
+  margin: 0 0 0 3px;
+  font-weight: bold;
+  font-size: 110%;
+  color: __text_bar__;
+}
+
+div.dokuwiki .bar a,
+div.dokuwiki div.breadcrumbs a {
+  font-weight: bold;
+  color: __text_bar__ !important;
   text-decoration: none !important;
 }
 
-div.dokuwiki .logo {
-  float: right;
-  font-size: 220%;
-  font-weight: bolder;
-  text-align: right;
+div.dokuwiki .bar a:hover,
+div.dokuwiki div.breadcrumbs a:hover {
+  text-decoration: none;
+}
+
+div.dokuwiki #bar__top ul {
+  list-style: none;
+  display: inline;
+  padding: 0;
+  margin: 0;
+  line-height: 1.8em;
+}
+
+div.dokuwiki #bar__top ul li:first-child {
+  border-left: 0;
+}
+
+div.dokuwiki #bar__top ul > li {
+  padding: 0 0.6em 0 0.8em;
+  display: inline;
   vertical-align: middle;
+  border-left: 1px solid __border__;
 }
 
-div.dokuwiki .logo a {
-  color: __background_alt__ !important;
-  text-decoration: none !important;
-  font-variant: small-caps;
-  letter-spacing: 2pt;
+div.dokuwiki #bar__bottom div a:first-child {
+  margin-left: 0;
+  padding-left: 0;
+  border-left: 0;
 }
 
-/* ---------------  top and bottom bar ---------------- */
-div.dokuwiki .bar {
-  border-top: 1px solid __border__;
-  border-bottom: 1px solid __border__;
-  background: __background_alt__;
-  padding: 0.1em 0.15em;
-  clear: both;
+div.dokuwiki #bar__bottom div a {
+  margin-left: 0.8em;
+  padding-left: 0.8em;
+  border-left: 1px solid __border__;
 }
 
 div.dokuwiki .bar-left {
@@ -58,22 +130,23 @@ div.dokuwiki .bar-right {
 }
 
 div.dokuwiki #bar__bottom {
-  margin-bottom:3px;
+  margin-bottom: 3px;
 }
 
 /* ------------- File Metadata ----------------------- */
 
 div.dokuwiki div.meta {
   clear: both;
-  margin-top: 1em;
-  color: #999;
+  margin: 0 0 0.6em 0;
+  color: __text_alt__;
+  background-color: __background_alt__;
   font-size: 70%;
 }
 
 div.dokuwiki div.meta div.user {
-  float: left;
 }
 
 div.dokuwiki div.meta div.doc {
   text-align: right;
+  float: right;
 }
diff --git a/lib/tpl/xfce/main.php b/lib/tpl/xfce/main.php
index 21f8750..25403d9 100644
--- a/lib/tpl/xfce/main.php
+++ b/lib/tpl/xfce/main.php
@@ -1,15 +1,10 @@
 <?php
 /**
- * DokuWiki Xfce Template
+ * Xfce Wiki Template
  *
- * This is the template you need to change for the overall look
- * of DokuWiki.
+ * This template is based on top of the default DokuWiki template.
  *
- * 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
- * @author Andreas Gohr <andi at splitbrain.org>
+ * @author Mike Massonnet <andi at splitbrain.org>
  */
 
 // must be run from within DokuWiki
@@ -22,79 +17,116 @@ if (!defined('DOKU_INC')) die();
  lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction']?>">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-    <?php tpl_pagetitle()?>
-    [<?php echo strip_tags($conf['title'])?>]
-  </title>
+  <title><?php echo strip_tags($conf['title'])?> - <?php tpl_pagetitle()?></title>
 
   <?php tpl_metaheaders()?>
 
   <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.png" />
+
 </head>
 
 <body>
-<div><?php html_msgarea()?></div>
 
-<div class="dokuwiki">
+<div class="msgarea"><?php html_msgarea()?></div>
 
-  <div id="xfce-header" class="hidden">
-    <h1>Xfce Wiki</h1>
-  </div>
+<div class="bottom-right-corner"></div>
 
-  <div id="xfce-menu-top">
-    <div id="xfce-menu-top-left"><a href="http://wiki.xfce.org/" title="Xfce Wiki"><img title="" alt="logo" src="<?php echo DOKU_TPL?>images/logo.png" /></a></div><div id="xfce-menu-top-right"></div>
-
-    <div id="xfce-menu-links">
-      <ul>
-        <li><form class="button" method="post" action="/"><div class="no"><input type="submit" value="Wiki" class="button" accesskey="h" title="Xfce Wiki" /></div></form></li>
-        <li><?php tpl_button('edit')?></li>
-        <li><?php tpl_button('history')?></li>
-        <li><?php tpl_button('recent')?></li>
-        <li><?php tpl_button('index')?></li>
-        <li><?php tpl_searchform()?></li>
-      </ul>
+<div class="dokuwiki">
+
+  <div class="stylehead">
+
+    <div class="header">
+      <div class="hidden">
+        <?php tpl_link(wl(),$conf['title'],'name="dokuwiki__top" id="dokuwiki__top"')?>
+      </div>
+      
+      <div id="banner">
+        <div id="banner-top-left">
+        </div>
+        <div id="banner-top-right">
+        </div>
+      </div>
+      
+      <div class="clearer"></div>
     </div>
 
-    <div id="xfce-menu-translation">
-      <?php /*old includehook*/ @include(dirname(__FILE__).'/translations.html')?>
+    <div class="bar" id="bar__top">
+      <div class="bar-left" id="bar__topleft">
+        <ul>
+          <li><?php tpl_link(wl(), 'Wiki', 'class="action" accesskey="h" rel="nofollow" title="'.$conf['title'].'"')?></li>
+          <li><?php tpl_actionlink('edit')?></li>
+          <li><?php tpl_actionlink('history')?></li>
+          <li><?php tpl_actionlink('recent')?></li>
+          <li><?php tpl_actionlink('index')?></li>
+        </ul>
+      </div>
+
+      <div class="bar-right" id="bar__topright">
+        <?php tpl_searchform()?>
+      </div>
+
+      <div class="clearer"></div>
     </div>
 
-    <?php if($conf['breadcrumbs']){?>
-    <div id="xfce-menu-breadcrumbs">
-      <span id="xfce-breadcrumbs-yourarehere"><?php tpl_youarehere() ?></span>
-      <span id="xfce-breadcrumbs-trace"><?php tpl_breadcrumbs()?></span>
+    <?php $translation = &plugin_load('helper','translation'); ?>
+    <?php if ($translation != NULL) { ?>
+    <div class="translation">
+      <?php echo $translation->showTranslations(); ?>
+      <?php tpl_link(wl('wiki:translation'), '?', 'class="action" rel="nofollow" title="Wiki Translation"')?>
     </div>
-    <?php }?>
+    <?php } ?>
 
-    <?php flush()?>
+    <div class="breadcrumbs">
+      <?php $conf['youarehere'] = true; tpl_youarehere() ?>
+      <?php //tpl_youarehere() ?>
+    </div>
 
   </div>
+  <?php tpl_flush()?>
 
-  <hr class="hidden" />
-
-  <div id="xfce-content-wrap">
+  <div class="page">
     <!-- wikipage start -->
     <?php tpl_content()?>
     <!-- wikipage stop -->
   </div>
 
-  <?php flush()?>
+  <div class="clearer"> </div>
 
-  <div id="xfce-footer" class="clear">
-    <div class="bar-left" id="bar__bottomleft">
-      <?php tpl_pageinfo()?>
+  <?php tpl_flush()?>
+
+  <div class="stylefoot">
+
+    <div class="meta">
+      <div class="doc">
+        <?php tpl_pageinfo()?>
+      </div>
+      <div class="user">
+        <?php tpl_userinfo()?>
+      </div>
     </div>
-    <div class="bar-right" id="bar__bottomright">
-      <?php tpl_userinfo()?>
-      <?php tpl_button('subscription')?>
-      <?php tpl_button('admin')?>
-      <?php tpl_button('profile')?>
-      <?php tpl_button('login')?>
-      <?php tpl_button('top')?>
+
+    <div class="bar" id="bar__bottom">
+      <div class="bar-left" id="bar__bottomleft">
+        <?php tpl_actionlink('edit')?>
+        <?php tpl_actionlink('history')?>
+        <?php tpl_actionlink('revert')?>
+      </div>
+      <div class="bar-right" id="bar__bottomright">
+        <?php tpl_actionlink('subscribe')?>
+        <?php tpl_actionlink('admin')?>
+        <?php tpl_actionlink('profile')?>
+        <?php tpl_actionlink('login')?>
+        <?php tpl_actionlink('top')?>
+      </div>
+      <div class="clearer"></div>
     </div>
-    <div class="clear"></div>
-    <?php tpl_license(false)?>
-    <div class="copy">© Xfce 2006-2010</div>
+
+    <?php tpl_license(false);?>
+
+    <div class="credit">
+      © Xfce 2006-2010
+    </div>
+
   </div>
 
 </div>
diff --git a/lib/tpl/xfce/media.css b/lib/tpl/xfce/media.css
index e2a80ff..844b481 100644
--- a/lib/tpl/xfce/media.css
+++ b/lib/tpl/xfce/media.css
@@ -5,6 +5,8 @@
 #media__manager {
     height: 100%;
     overflow: hidden;
+    margin: 0;
+    padding: 0;
 }
 
 #media__left {
@@ -35,13 +37,14 @@
 /* --- Tree formatting --- */
 
 #media__tree img {
-    float:left;
+    float: left;
     padding: 0.5em 0.3em 0 0;
 }
 
 #media__tree ul {
     list-style-type: none;
     list-style-image: none;
+    margin-left: 1.5em;
 }
 
 #media__tree li {
@@ -49,6 +52,7 @@
     list-style-type: none;
     list-style-image: none;
 }
+*+html #media__tree li,
 * html #media__tree li {
     border: 1px solid __background__;
 }/* I don't understand this, but this fixes a style bug in IE;
@@ -63,8 +67,11 @@ it's dirty, so any "real" fixes are welcome */
 
 #media__opts input {
     float: left;
+    display: block;
+    margin-top: 4px;
     position: absolute;
 }
+*+html #media__opts input,
 * html #media__opts input {
     position: static;
 }
@@ -72,8 +79,10 @@ it's dirty, so any "real" fixes are welcome */
 #media__opts label {
     display: block;
     float: left;
-    margin-left: 30px;
+    margin-left: 20px;
+    margin-bottom: 4px;
 }
+*+html #media__opts label,
 * html #media__opts label {
     margin-left: 10px;
 }
@@ -134,34 +143,28 @@ it's dirty, so any "real" fixes are welcome */
     padding: 0 0.5em 0.5em 0.5em;
 }
 
-#media__content form.upload {
+#media__content form#dw__upload,
+#media__content div#dw__flashupload {
     display: block;
     border-bottom: solid 1px __border__;
     padding: 0 0.5em 1em 0.5em;
 }
-#media__content form.upload fieldset {
+#media__content form#dw__upload fieldset {
     padding: 0;
     margin: 0;
     border: none;
     width: auto;
 }
-#media__content form.upload p {
-    clear: left;
+#media__content form#dw__upload p {
     text-align: left;
     padding: 0.25em 0;
     margin: 0;
     line-height: 1.0em;
 }
-#media__content form.upload label {
-    float: left;
-    width: 30%;
-}
-#media__content form.upload label.check {
+#media__content form#dw__upload label.check {
     float: none;
     width: auto;
-}
-#media__content form.upload input.check {
-    margin-left: 30%;
+    margin-left: 11.5em;
 }
 
 /* --- meta edit form --- */
diff --git a/lib/tpl/xfce/mediamanager.php b/lib/tpl/xfce/mediamanager.php
index 1da6dfd..2dd8933 100644
--- a/lib/tpl/xfce/mediamanager.php
+++ b/lib/tpl/xfce/mediamanager.php
@@ -2,32 +2,27 @@
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?php
 /**
- * DokuWiki Default Template
+ * Xfce Wiki Template
  *
- * This is the template for the media manager popup
+ * This template is based on top of the default DokuWiki template.
  *
- * 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
- * @author Andreas Gohr <andi at splitbrain.org>
+ * @author Mike Massonnet <andi at splitbrain.org>
  */
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-    <?php echo hsc($lang['mediaselect'])?>
-    [<?php echo strip_tags($conf['title'])?>]
-  </title>
+  <title><?php echo strip_tags($conf['title'])?> - <?php echo hsc($lang['mediaselect'])?></title>
   <?php tpl_metaheaders()?>
-  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" />
+  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.png" />
 </head>
 
 <body>
+
+<div class="msgarea"><?php html_msgarea()?></div>
+
 <div id="media__manager" class="dokuwiki">
     <div id="media__left">
-        <?php html_msgarea()?>
         <h1><?php echo hsc($lang['mediaselect'])?></h1>
 
         <?php /* keep the id! additional elements are inserted via JS here */?>
diff --git a/lib/tpl/xfce/print.css b/lib/tpl/xfce/print.css
index 15b8d26..60c1725 100644
--- a/lib/tpl/xfce/print.css
+++ b/lib/tpl/xfce/print.css
@@ -1,46 +1,50 @@
 
 body {
-  min-width: 600px;
-  margin: 10px auto;
-  padding:0;
-  background-color: #fff;
-  color: #000;
-  font: 80% arial, verdana, sans-serif;
+  font: 10pt "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
+  background-color: White;
+  color: Black;
 }
 
-div.meta {
-  clear:both;
-  margin-top: 1em;
-  font-size:70%;
-  text-align:right;
+table {
+  font-size: 100%;
+  padding: 0;
+  margin: 0;
+}
+
+tr,td,th { padding: 0; margin: 0; }
+
+img { border: 0; }
+
+a {
+  color: #000000;
+  text-decoration: none;
+  background: none !important;
 }
 
-.clear {
+a.interwiki {
+  padding-left: 0px !important;
+}
+
+
+div.meta {
   clear: both;
-  margin: 0;
-  padding: 0;
+  margin-top: 1em;
+  font-size: 70%;
+  text-align: right;
 }
 
+
 div.notify,
 div.info,
 div.success,
 div.error,
 div.breadcrumbs,
 div.secedit {
-  display:none;
+  display: none;
 }
 
 /* --------------------- Text formating -------------------------------- */
 
-:link, :visited, :link:active, :link:active {
-  color: #154374;
-  text-decoration: underline;
-}
-:link:hover, :visited:hover {
-  color: #f00;
-  text-decoration: underline;
-}
-
 /* external link */
 a.urlextern:after {
    content: " [" attr(href) "]";
@@ -60,38 +64,38 @@ a.mail:after {
 }
 
 /* existing wikilink */
-a.wikilink1    {text-decoration:underline }
+a.wikilink1    { text-decoration: underline; }
 
 /* the document */
-p {
-  margin: 0.3em 0.5em;
-  padding: 0;
-}
-
-.box {
-  color: inherit;
-  background-color: #eee;
-  margin: 1em;
-  padding: 0.5em 1.5em;
+div.page {
+  text-align: justify;
 }
 
 /* general headline setup */
 h1, h2, h3, h4, h5 {
-  color: #154374;
-  background: none;
-  font-weight: bold;
-  margin: 0;
-  padding-top: .5em;
-  padding-bottom: .17em;
-  border-bottom: 1px solid #d4d4d4;
+    color: Black;
+    background-color: transparent;
+    font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
+    font-size: 100%;
+    font-weight: normal;
+    margin-left:    0;
+    margin-right:   0;
+    margin-top:     0;
+    margin-bottom:  1em;
+    padding-left:   0;
+    padding-right:  0;
+    padding-top:    0.5em;
+    padding-bottom: 0;
+    border-bottom: 1px solid #000000;
+    clear: left;
 }
 
 /* special headlines */
-h1 {font-size: 160%; padding-top: 0; }
-h2 {font-size: 140%; }
-h3 {font-size: 120%; }
-h4 {font-size: 100%; }
-h5 {font-size: 80%; }
+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 {
@@ -114,32 +118,39 @@ img.mediaright {
 ul {
     line-height: 1.5em;
     list-style-type: square;
-    margin: 0 0 0.5em 1.5em;
+    margin: 0 0 1em 3.5em;
     padding: 0;
-
 }
 
 /* ordered lists */
 ol {
     line-height: 1.5em;
-    margin: 0 0 0.5em 2.5em;
+    margin: 0 0 1em 3.5em;
     padding: 0;
     font-weight: normal;
 }
-ol ol {
-    margin: 0 0 0.5em 1.5em;
+
+div.dokuwiki li ul {
+  margin-bottom: 0;
+}
+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 {
     font-weight: normal;
 }
 
+pre {
+  font-family: monospace;
+}
+
 /* code blocks by indention */
 pre.pre {
   font-size: 8pt;
@@ -173,29 +184,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;
 }
 
@@ -219,17 +230,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; }
 
diff --git a/lib/tpl/xfce/rtl.css b/lib/tpl/xfce/rtl.css
index 4678c30..6c2d1fb 100644
--- a/lib/tpl/xfce/rtl.css
+++ b/lib/tpl/xfce/rtl.css
@@ -34,7 +34,7 @@ label.simple {
 }
 
 div.meta div.user {
-  float: right
+  float: right;
 }
 
 div.meta div.doc {
@@ -45,6 +45,10 @@ div.meta div.doc {
 
 div.dokuwiki ul,
 div.dokuwiki ol {
+  margin: 0.5em 3.5em 0.5em 0;
+}
+div.dokuwiki li ul,
+div.dokuwiki li ol {
   margin: 0.5em 1.5em 0.5em 0;
 }
 
@@ -72,18 +76,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,15 +109,39 @@ 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 {
+div.dokuwiki .code {
+  direction: ltr;
   text-align: left;
 }
+div.dokuwiki blockquote {
+  border-left: 0;
+  padding-left: 0;
+  border-right: 2px solid  __border__;
+  padding-right: 3px;
+}
+
+/* Admin corrections */
+#admin__version {
+    clear: right;
+    float: left;
+}
+
+.dokuwiki ul.admin_tasks {
+    float: right;
+}
+
+.dokuwiki ul.admin_tasks li {
+    padding-left: 0px;
+    padding-right: 35px;
+    background: transparent none no-repeat scroll right 0;
+    text-align: right;
+}
 
diff --git a/lib/tpl/xfce/style.ini b/lib/tpl/xfce/style.ini
index 14ad5c6..19c85f5 100644
--- a/lib/tpl/xfce/style.ini
+++ b/lib/tpl/xfce/style.ini
@@ -10,7 +10,11 @@ layout.css     = screen
 design.css     = screen
 style.css      = screen
 
-media.css      = screen
+media.css         = screen
+_mediaoptions.css = screen
+_admin.css        = screen
+_linkwiz.css      = screen
+_subscription.css = screen
 
 rtl.css        = rtl
 print.css      = print
@@ -26,13 +30,13 @@ print.css      = print
 __text__           = "#000"
 __background__     = "#fff"
 ; alternative text and background colors
-__text_alt__       = "#638c9c"
-__background_alt__ = "#dee7ec"
+__text_alt__       = "#666"
+__background_alt__ = "#eee"
 ; neutral text and background colors
 __text_neu__       = "#666"
 __background_neu__ = "#f5f5f5"
 ; border color
-__border__         = "#8cacbb"
+__border__         = "#b4b4b4"
 ;--------------------------------------------------------------------------
 
 ; other text and background colors
@@ -40,26 +44,14 @@ __text_other__       = "#ccc"
 __background_other__ = "#f7f9fa"
 
 ; these are used for links
-__extern__    = "#436976"
-__existing__  = "#090"
+__extern__    = "#154374"
+__existing__  = "#154374"
 __missing__   = "#f30"
+__hover__     = "#f00"
 
 ; 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"
+; colors for bar
+__text_bar__ = "#666"
+__background_bar__ = "#e9e9e9"
diff --git a/lib/tpl/xfce/translations.html b/lib/tpl/xfce/translations.html
deleted file mode 100644
index 8720d71..0000000
--- a/lib/tpl/xfce/translations.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$translation = &plugin_load('syntax','translation');
-if ($translation != NULL)
-	echo $translation->_showTranslations();
-?>

More information about the Xfce4-commits mailing list