From 3d7fb39fd124400143b9fd776ad009233e42101b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 00:07:59 +0000 Subject: show sidebar only when it exists and in show mode (fixes #3 and #4) --- css/structure.css | 18 ++---------------- main.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/css/structure.css b/css/structure.css index 19f351620..4e3a14be8 100755 --- a/css/structure.css +++ b/css/structure.css @@ -42,29 +42,15 @@ body { margin: 0 1.5em 0 0; } - #dokuwiki__content { + .hasSidebar #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } - #dokuwiki__content .pad { + .hasSidebar #dokuwiki__content .pad { margin-left: __sidebar_width__; } - /* don't show sidebar with fullscreen media manager or in the admin */ - .mode_media #dokuwiki__aside, - .mode_admin #dokuwiki__aside { - display: none; - } - .mode_media #dokuwiki__content, - .mode_media #dokuwiki__content .pad, - .mode_admin #dokuwiki__content, - .mode_admin #dokuwiki__content .pad { - float: none; - margin-left: 0; - margin-right: 0; - } - #dokuwiki__footer { clear: both; } diff --git a/main.php b/main.php index 0a0765065..e5552215d 100755 --- a/main.php +++ b/main.php @@ -12,6 +12,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 = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) && ($ACT=='show'); ?> are added to make it possible to e.g. style a page differently if it's in edit mode, see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -

@@ -109,10 +110,12 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER

- - + + + +

-- cgit v1.2.3