From d637819dca760b20f6e53e5847a92d08d8d15b8c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 4 Aug 2013 10:36:50 +0100
Subject: added spacing below video and audio elements

Note: The spacing will now show as too much as long as the paragraph bug
is not fixed
---
 lib/tpl/dokuwiki/css/basic.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index ba263f4c5..ef278c939 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -93,6 +93,8 @@ pre,
 table,
 hr,
 blockquote,
+video,
+audio,
 figure,
 details,
 fieldset,
-- 
cgit v1.2.3


From 443e135d59e9d227eec818dabf9ee64d7a73d474 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 16 Oct 2013 22:04:01 +0100
Subject: replace boolean conditional checks on possibly uninitialized vars
 with \!empty/empty/isset as appropriate

---
 lib/tpl/dokuwiki/tpl_header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 19d165059..a2bfd4346 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -41,7 +41,7 @@ if (!defined('DOKU_INC')) die();
                 <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
                 <ul>
                     <?php
-                        if ($_SERVER['REMOTE_USER']) {
+                        if (!empty($_SERVER['REMOTE_USER'])) {
                             echo '<li class="user">';
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '</li>';
-- 
cgit v1.2.3


From cfe186a5905005f882e870f5af79b31d53dd04ae Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 11 Nov 2013 11:49:36 +0000
Subject: updated inline documentation about location of local style.ini

---
 lib/tpl/dokuwiki/style.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 897b6e6da..cc23c169f 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -2,7 +2,8 @@
 ; for limitations of the ini format used here
 
 ; To extend this file or make changes to it, it is recommended to create
-; a style.local.ini file to prevent losing any changes after an upgrade.
+; a local conf/tpl/<template-folder-name>/style.ini file to prevent losing
+; any changes after an upgrade.
 ; Please don't forget to copy the section your changes should be under
 ; (i.e. [stylesheets] or [replacements]) into that file as well.
 
-- 
cgit v1.2.3


From 834ad97fc976d60bd2e57b488a43aca1f39b2277 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 16 Nov 2013 21:18:23 +0000
Subject: Improved pagetools event in dokuwiki template

This moves the template name away from the hook name into the event data (as
the 'tpl' value). Therefore it moves the previous data items into the 'items' sub array.
A 'view' value has also been added to describe in which template file the
event was called ('main' or 'detail').

This way it will be much easier for plugins to consider default cases and
differentiate between main and other layouts.
---
 lib/tpl/dokuwiki/detail.php | 14 ++++++--------
 lib/tpl/dokuwiki/main.php   | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index c602830f7..2ee36a2a9 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -110,26 +110,24 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                         <ul>
                             <?php
                                 $data = array();
+                                $data['tpl']  = $conf['template'];
+                                $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['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
+                                    $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['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+                                $data['items']['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
 
                                 // the page tools can be amended through a custom plugin hook
-                                // if you're deriving from this template and your design is close enough to
-                                // the dokuwiki template you might want to trigger a DOKUWIKI event instead
-                                // of using $conf['template'] here
-                                $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
-                                $evt = new Doku_Event($hook, $data);
+                                $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
                                 if($evt->advise_before()){
-                                    foreach($evt->data as $k => $html) echo $html;
+                                    foreach($evt->data['items'] as $k => $html) echo $html;
                                 }
                                 $evt->advise_after();
                                 unset($data);
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index f6ca4ed86..0dbaa681b 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -75,22 +75,22 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <ul>
                         <?php
                             $data = array(
-                                'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
-                                'revert'    => tpl_action('revert',    1, 'li', 1, '<span>', '</span>'),
-                                'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
-                                'backlink'  => tpl_action('backlink',  1, 'li', 1, '<span>', '</span>'),
-                                'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
-                                'top'       => tpl_action('top',       1, 'li', 1, '<span>', '</span>')
+                                'tpl'   => $conf['template'],
+                                'view'  => 'main',
+                                'items' => array(
+                                    'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
+                                    'revert'    => tpl_action('revert',    1, 'li', 1, '<span>', '</span>'),
+                                    'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
+                                    'backlink'  => tpl_action('backlink',  1, 'li', 1, '<span>', '</span>'),
+                                    'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
+                                    'top'       => tpl_action('top',       1, 'li', 1, '<span>', '</span>')
+                                )
                             );
 
                             // the page tools can be amended through a custom plugin hook
-                            // if you're deriving from this template and your design is close enough to
-                            // the dokuwiki template you might want to trigger a DOKUWIKI event instead
-                            // of using $conf['template'] here
-                            $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
-                            $evt = new Doku_Event($hook, $data);
+                            $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
                             if($evt->advise_before()){
-                                foreach($evt->data as $k => $html) echo $html;
+                                foreach($evt->data['items'] as $k => $html) echo $html;
                             }
                             $evt->advise_after();
                             unset($data);
-- 
cgit v1.2.3


From f8cadb6a04d3c1c201dd77627c89bd1c0efcac51 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 17 Nov 2013 20:39:07 +0000
Subject: removed tpl from TEMPLATE_PAGETOOLS_DISPLAY event as it's always
 available in

---
 lib/tpl/dokuwiki/detail.php | 1 -
 lib/tpl/dokuwiki/main.php   | 1 -
 2 files changed, 2 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 2ee36a2a9..ec846f6fd 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -110,7 +110,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                         <ul>
                             <?php
                                 $data = array();
-                                $data['tpl']  = $conf['template'];
                                 $data['view'] = 'detail';
 
                                 // View in media manager; @todo: transfer logic to backend
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 0dbaa681b..3bc46406a 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -75,7 +75,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <ul>
                         <?php
                             $data = array(
-                                'tpl'   => $conf['template'],
                                 'view'  => 'main',
                                 'items' => array(
                                     'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
-- 
cgit v1.2.3


From b5f365b32820bb760e8c3729affce219f696d1ba Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 12 Jan 2014 22:45:08 +0100
Subject: dokuwiki template: Fix the preview width on small screens FS#2914

---
 lib/tpl/dokuwiki/css/mobile.less | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index 289f5afa3..0fbd0e8fe 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -65,6 +65,15 @@
     margin-right: 0;
 }
 
+/* preview */
+.dokuwiki.hasSidebar div.preview {
+    border-right: none;
+}
+
+[dir=rtl] .dokuwiki.hasSidebar div.preview {
+    border-left: none;
+}
+
 /* toc */
 #dw__toc {
     float: none;
-- 
cgit v1.2.3


From 3641199a253e8f92f378f03926af80724ef04146 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 2 Feb 2014 14:42:47 +0000
Subject: fixed html errors in video and audio rendering

---
 lib/tpl/dokuwiki/css/basic.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
index 636923192..c296185e9 100644
--- a/lib/tpl/dokuwiki/css/basic.less
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -93,8 +93,6 @@ pre,
 table,
 hr,
 blockquote,
-video,
-audio,
 figure,
 details,
 fieldset,
@@ -103,7 +101,9 @@ address {
     padding: 0;
 }
 
-div {
+div,
+video,
+audio {
     margin: 0;
     padding: 0;
 }
-- 
cgit v1.2.3


From 221cb66533e11a3e20e642d760af06bb19f7e14b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 15 Feb 2014 16:02:59 +0000
Subject: fixed pagetools being inaccessible on screens lacking necessary
 height, and aligned them to content when on smaller screens

---
 lib/tpl/dokuwiki/css/mobile.less | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index 0fbd0e8fe..75ae5dbe4 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -105,6 +105,15 @@
     overflow: auto;
 }
 
+/* push pagetools closer to content */
+#dokuwiki__pagetools {
+    top: 0;
+}
+.showSidebar #dokuwiki__pagetools {
+    top: 3.5em;
+}
+
+
 /* _edit */
 .dokuwiki div.section_highlight {
     margin: 0 -1em;
@@ -299,5 +308,17 @@ body {
 }
 
 
+} /* /@media */
+
+
+/* for screen heights smaller than the pagetools permit
+********************************************************************/
+@media only screen and (max-height: 400px) {
+// 400px is only roughly the required value, this may be wrong under non-standard circumstances
+
+#dokuwiki__pagetools div.tools {
+    position: static;
+}
+
 
 } /* /@media */
-- 
cgit v1.2.3


From 0b1e5003aae587074526c6b2ef19cb84670195e8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 23 Feb 2014 21:20:39 +0000
Subject: made search form styles independent from sitetools ID

---
 lib/tpl/dokuwiki/css/design.less | 64 ++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 42292de49..b18daaad7 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -186,50 +186,50 @@
     text-align: right;
 
     form.search {
-        display: block;
         font-size: 0.875em;
-        position: relative;
+    }
+}
 
-        input.edit {
-            width: 18em;
-            padding: .35em 22px .35em .1em;
-        }
+[dir=rtl] #dokuwiki__sitetools {
+    text-align: left;
+}
 
-        input.button {
-            background: transparent url(images/search.png) no-repeat 0 0;
-            border-width: 0;
-            width: 19px;
-            height: 14px;
-            text-indent: -99999px;
-            margin-left: -20px;
-            box-shadow: none;
-            padding: 0;
-        }
+form.search {
+    display: block;
+    position: relative;
+    margin-bottom: 0.5em;
+
+    input.edit {
+        width: 18em;
+        padding: .35em 22px .35em .1em;
     }
 
-    ul {
-        margin-top: 0.5em;
+    input.button {
+        background: transparent url(images/search.png) no-repeat 0 0;
+        border-width: 0;
+        width: 19px;
+        height: 14px;
+        text-indent: -99999px;
+        margin-left: -20px;
+        box-shadow: none;
+        padding: 0;
     }
 }
 
-[dir=rtl] #dokuwiki__sitetools {
-    text-align: left;
-
-    form.search {
-        input.edit {
-            padding: .35em .1em .35em 22px;
-        }
+[dir=rtl] form.search {
+    input.edit {
+        padding: .35em .1em .35em 22px;
+    }
 
-        input.button {
-            background-position: 5px 0;
-            margin-left: 0;
-            margin-right: -20px;
-            position: relative;
-        }
+    input.button {
+        background-position: 5px 0;
+        margin-left: 0;
+        margin-right: -20px;
+        position: relative;
     }
 }
 
-#IE7 #dokuwiki__sitetools form.search {
+#IE7 form.search {
     min-height: 1px;
     z-index: 21;
 }
-- 
cgit v1.2.3


From 1e94c175409c39f190b7da3a1941230f3758513c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 23 Feb 2014 21:38:28 +0000
Subject: made sidebar content styles re-usable outside of ID (added class:
 aside)

---
 lib/tpl/dokuwiki/css/content.less | 22 +++++++++++-----------
 lib/tpl/dokuwiki/css/design.less  | 15 ++++++---------
 lib/tpl/dokuwiki/main.php         |  2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index a5ffbf2be..a2e343a33 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -67,19 +67,19 @@
 
 /*____________ lists ____________*/
 
-#dokuwiki__content ul li,
-#dokuwiki__aside ul li {
-    color: @ini_text_alt;
-}
+.dokuwiki .page,
+.dokuwiki .aside {
+    ul li {
+        color: @ini_text_alt;
+    }
 
-#dokuwiki__content ol li,
-#dokuwiki__aside ol li {
-    color: @ini_text_neu;
-}
+    ol li {
+        color: @ini_text_neu;
+    }
 
-#dokuwiki__content li .li,
-#dokuwiki__aside li .li {
-    color: @ini_text;
+    li .li {
+        color: @ini_text;
+    }
 }
 
 /*____________ tables ____________*/
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index b18daaad7..46b4a045b 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -278,13 +278,10 @@ form.search {
 /* sidebar
 ********************************************************************/
 
-#dokuwiki__aside {
-
-    > .pad {
-        font-size: 0.875em;
-        overflow: hidden;
-        word-wrap: break-word;
-    }
+.dokuwiki .aside {
+    font-size: 0.875em;
+    overflow: hidden;
+    word-wrap: break-word;
 
     /* make sidebar more condensed */
 
@@ -340,8 +337,8 @@ form.search {
     }
 }
 
-[dir=rtl] #dokuwiki__aside ul,
-[dir=rtl] #dokuwiki__aside ol {
+[dir=rtl] .dokuwiki .aside ul,
+[dir=rtl] .dokuwiki .aside ol {
     padding-right: .5em;
 }
 
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 3bc46406a..44fef81eb 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -36,7 +36,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 
             <?php if($showSidebar): ?>
                 <!-- ********** ASIDE ********** -->
-                <div id="dokuwiki__aside"><div class="pad include group">
+                <div id="dokuwiki__aside"><div class="pad aside include group">
                     <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
                     <div class="content">
                         <?php tpl_flush() ?>
-- 
cgit v1.2.3