changed breadcrumbs design, small fixes: pageid, pagetools and sidebar

2 files changed, 22 insertions, 39 deletions

diff --git a/css/design.css b/css/design.css
index 8111091fd..bde14b613 100755
--- a/css/design.css
+++ b/css/design.css
@@ -106,7 +106,7 @@
 
 #dokuwiki__pagetools {
     position: absolute;
-    right: -32px;
+    right: -34px;
     top: 1em;
     font-size: 90%;
 }
@@ -120,8 +120,7 @@
     right: 0;
     width: 32px;
     overflow: hidden;
-    border: solid __border__;
-    border-width: 1px 1px 1px 0;
+    border: 1px solid __border__;
     border-radius: 2px;
     text-align: right;
     margin: 0;
@@ -134,7 +133,6 @@
 #dokuwiki__pagetools:active ul,
 #dokuwiki__pagetools:focus ul {
     width: auto;
-    border-width: 1px;
 }
 
 #dokuwiki__pagetools ul li {
@@ -232,30 +230,17 @@
 /*____________ breadcrumbs ____________*/
 
 .dokuwiki div.breadcrumbs {
-    border: 1px solid __border__;
-    padding: .1em .35em;
-    -moz-box-shadow: inset 0 0 1px __background_alt__;
-    -webkit-box-shadow: inset 0 0 1px __background_alt__;
-    box-shadow: inset 0 0 1px __background_alt__;
-    border-radius: 2px;
-    /* @todo: style.ini */
-    background-color: #fdfdfd;
-    margin-bottom: .5em;
-    font-size: 0.875em;
-}
-/* alternative:
-.dokuwiki div.breadcrumbs {
     border-top: 1px solid __border__;
     border-bottom: 1px solid __background__;
     margin-bottom: .5em;
     font-size: 0.875em;
+    clear: both;
 }
-.dokuwiki div.breadcrumbs div {
+.dokuwiki div.breadcrumbs div.pad {
     border-top: 1px solid __background__;
     border-bottom: 1px solid __border__;
     padding: .1em .35em;
 }
-*/
 .dokuwiki div.breadcrumbs a {
     color: __link__;
     background-color: inherit;
@@ -270,6 +255,7 @@
 
 #dokuwiki__aside {
     line-height: 1.2;
+    font-size: 0.875em;
 }
 
 /* make sidebar more condensed */
diff --git a/main.php b/main.php
index 4c6661664..6dee80d78 100755
--- a/main.php
+++ b/main.php
@@ -35,9 +35,9 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
         <?php _tpl_include('header.html') ?>
 
         <!-- ********** HEADER ********** -->
-        <div id="dokuwiki__header"><div class="pad">
+        <div id="dokuwiki__header"><div class="pad group">
 
-            <div class="headings">
+            <div class="headings group">
                 <h1><?php tpl_link(
                     wl(),
                     '<img src="'.tpl_getFavicon(false, 'logo.png').'" alt="" /> <span>'.$conf['title'].'</span>',
@@ -50,10 +50,9 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
                 <ul class="a11y">
                     <li><a href="#dokuwiki__content"><?php echo tpl_getLang('skip_to_content') ?></a></li>
                 </ul>
-                <div class="clearer"></div>
             </div>
 
-            <div class="tools">
+            <div class="tools group">
                 <!-- USER TOOLS -->
                 <?php if ($conf['useacl'] && $showTools): ?>
                     <div id="dokuwiki__usertools">
@@ -90,47 +89,45 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
 
             </div>
 
-            <div class="clearer"></div>
-
             <!-- BREADCRUMBS -->
-            <?php if($conf['breadcrumbs']){ ?>
-                <div class="tracking breadcrumbs"><div><?php tpl_breadcrumbs() ?></div></div>
-            <?php } ?>
-            <?php if($conf['youarehere']){ ?>
-                <div class="hierarchical breadcrumbs"><div><?php tpl_youarehere() ?></div></div>
-            <?php } ?>
+            <?php if($conf['breadcrumbs'] || $conf['youarehere']): ?>
+                <div class="breadcrumbs"><div class="pad">
+                    <?php if($conf['breadcrumbs']): ?>
+                        <div class="trace"><?php tpl_breadcrumbs() ?></div>
+                    <?php endif ?>
+                    <?php if($conf['youarehere']): ?>
+                        <div class="youarehere"><?php tpl_youarehere() ?></div>
+                    <?php endif ?>
+                </div></div>
+            <?php endif ?>
 
             <hr class="a11y" />
         </div></div><!-- /header -->
 
-
         <div class="wrapper">
 
             <!-- ********** ASIDE ********** -->
-            <div id="dokuwiki__aside"><div class="pad include">
+            <div id="dokuwiki__aside"><div class="pad include group">
                 <?php tpl_include_page(tpl_getConf('sidebarID')) /* includes the given wiki page */ ?>
-                <div class="clearer"></div>
             </div></div><!-- /aside -->
 
             <!-- ********** CONTENT ********** -->
-            <div id="dokuwiki__content"><div class="pad">
+            <div id="dokuwiki__content"><div class="pad group">
                 <?php tpl_flush() /* flush the output buffer */ ?>
                 <?php _tpl_include('pageheader.html') ?>
 
-                <div class="pageId"><span>[[<?php echo tpl_pagetitle($ID,true) ?>]]</span></div>
+                <div class="pageId"><span><?php echo hsc($ID) ?></span></div>
 
-                <div class="page">
+                <div class="page group">
                     <!-- wikipage start -->
                     <?php tpl_content() /* the main content */ ?>
                     <!-- wikipage stop -->
-                    <div class="clearer"></div>
                 </div>
 
                 <?php tpl_flush() ?>
                 <?php _tpl_include('pagefooter.html') ?>
             </div></div><!-- /content -->
 
-            <div class="clearer"></div>
             <hr class="a11y" />
 
             <!-- PAGE ACTIONS -->