From 76cda855755d9cb9326adb9c766e54f77e85fe8b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 31 Mar 2013 20:00:52 +0100 Subject: [PATCH] made sidebar inclusion more similar to core (hide it under more circumstances) --- css/mobile.css | 8 ++++---- css/structure.css | 14 +++++--------- main.php | 5 +++-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/css/mobile.css b/css/mobile.css index a86fffd..264bbf6 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -6,7 +6,7 @@ @media only screen and (max-width: 42em) { -.mode_show #dokuwiki__aside { +#dokuwiki__aside { width: 100%; float: none; margin-bottom: 1.4em; @@ -15,15 +15,15 @@ margin: 0; } -.mode_show #dokuwiki__content { +.hasSidebar #dokuwiki__content { float: none; margin-left: 0; margin-right: 0; } -.mode_show #dokuwiki__content > .pad { +.hasSidebar #dokuwiki__content > .pad { margin-left: 0; } -[dir=rtl] .mode_show #dokuwiki__content > .pad { +[dir=rtl] .hasSidebar #dokuwiki__content > .pad { margin-right: 0; } diff --git a/css/structure.css b/css/structure.css index 61e4679..468a9d9 100644 --- a/css/structure.css +++ b/css/structure.css @@ -50,17 +50,13 @@ body { height: 1%; } - /* show sidebar only in show mode */ #dokuwiki__aside { - display: none; - } - .mode_show #dokuwiki__aside { width: __sidebar_width__; float: left; position: relative; display: block; } - [dir=rtl] .mode_show #dokuwiki__aside { + [dir=rtl] #dokuwiki__aside { float: right; } #dokuwiki__aside > .pad { @@ -71,20 +67,20 @@ body { } /* make content wider when there's no sidebar */ - .hasSidebar.mode_show #dokuwiki__content { + .hasSidebar #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } - [dir=rtl] .hasSidebar.mode_show #dokuwiki__content { + [dir=rtl] .hasSidebar #dokuwiki__content { float: left; margin-left: 0; margin-right: -__sidebar_width__; } - .hasSidebar.mode_show #dokuwiki__content > .pad { + .hasSidebar #dokuwiki__content > .pad { margin-left: __sidebar_width__; } - [dir=rtl] .hasSidebar.mode_show #dokuwiki__content > .pad { + [dir=rtl] .hasSidebar #dokuwiki__content > .pad { margin-left: 0; margin-right: __sidebar_width__; } diff --git a/main.php b/main.php index 7171383..4e68073 100644 --- a/main.php +++ b/main.php @@ -11,6 +11,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); +$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); ?> @@ -35,7 +36,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?>
+ class="dokuwiki site mode_ "> @@ -112,7 +113,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
- +