From 07834a7c661d05ab5c707e1c428421c87af565bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 25 Sep 2012 19:47:10 +0100
Subject: de-couple mobile JS from widths to actual media query equivalent
 (fixes FS#2623)

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

(limited to 'lib/tpl/dokuwiki/main.php')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 2406a206b..6b1e95d62 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
+    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
-- 
cgit v1.2.3


From 20391a36885910a616110df30f3ce30f8d23639d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 25 Sep 2012 20:25:54 +0100
Subject: removed html dependency from media query detection JS in new template

---
 lib/tpl/dokuwiki/main.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/tpl/dokuwiki/main.php')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 6b1e95d62..2406a206b 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,7 +91,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
-    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
-- 
cgit v1.2.3


From 86ca15261461b6c74f66407e7ac6992baa097d0d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 26 Sep 2012 09:22:02 +0100
Subject: Revert "removed html dependency from media query detection JS in new
 template"

... because it made the solution less transparent, more error prone and even more like a hack than it already was

This reverts commit 20391a36885910a616110df30f3ce30f8d23639d.
---
 lib/tpl/dokuwiki/main.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/tpl/dokuwiki/main.php')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 2406a206b..6b1e95d62 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
+    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
-- 
cgit v1.2.3


From 835dfcaefaa402c6f7c46b222b94da30a33571bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 6 Oct 2012 13:42:03 +0100
Subject: Removed tpl_sidebar() to avoid fatal errors in other templates

Replaced it by the old tpl_include_page() and made it more flexible by adding a boolean $propagate parameter.
(It's false by default for backwards compatibility reasons. Should it rather be true? That would probably be what most users want.)
---
 lib/tpl/dokuwiki/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki/main.php')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 6b1e95d62..820dd47df 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -42,7 +42,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <div class="content">
                         <?php tpl_flush() ?>
                         <?php tpl_includeFile('sidebarheader.html') ?>
-                        <?php tpl_sidebar() ?>
+                        <?php tpl_include_page($conf['sidebar'], 1, 1) ?>
                         <?php tpl_includeFile('sidebarfooter.html') ?>
                     </div>
                 </div></div><!-- /aside -->
-- 
cgit v1.2.3


From 85159e75b55f6a10010af360b6ebf9f952994511 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 7 Oct 2012 02:55:37 +0100
Subject: removed stray closing div (FS#2633)

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

(limited to 'lib/tpl/dokuwiki/main.php')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 820dd47df..963750a1c 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,7 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
-    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
+    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
-- 
cgit v1.2.3