From 6c47a78cc56b2c460658675c694bd178c31a1830 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 9 Apr 2012 14:15:29 +0100
Subject: load only one stylesheet for all modes instead of three

Instead of three stylesheets for 'all', 'screen' and 'print' modes, they are all loaded into a single stylesheet by wrapping all screen styles in a "@media screen {}" and all print styles in a "@media print {}". The 'all' mode is not wrapped in anything.
Potential issues with existing CSS: If any of your screen or print CSS files already contain any "@media" syntax, the CSS will probably break. In that case please add any CSS with "@media" in it to the 'all' mode instead!

Also, the 'rtl' mode is hereby deprecated. Please just prefix any RTL styles within your normal CSS files with "[dir=rtl]". This also fixes that RTL styles cannot be added for 'all' or 'print' modes.
---
 inc/template.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index ab6aa925f..131f34020 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -354,12 +354,8 @@ function tpl_metaheaders($alt=true){
     }
 
     // load stylesheets
-    $head['link'][] = array('rel'=>'stylesheet', 'media'=>'screen', 'type'=>'text/css',
+    $head['link'][] = array('rel'=>'stylesheet', 'type'=>'text/css',
             'href'=>DOKU_BASE.'lib/exe/css.php?t='.$conf['template'].'&tseed='.$tseed);
-    $head['link'][] = array('rel'=>'stylesheet', 'media'=>'all', 'type'=>'text/css',
-            'href'=>DOKU_BASE.'lib/exe/css.php?s=all&t='.$conf['template'].'&tseed='.$tseed);
-    $head['link'][] = array('rel'=>'stylesheet', 'media'=>'print', 'type'=>'text/css',
-            'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template'].'&tseed='.$tseed);
 
     // make $INFO and other vars available to JavaScripts
     $json = new JSON();
-- 
cgit v1.2.3


From e66d3e6dfa7ba6f0cf55b58f0b00b66b52c98321 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 1 Jul 2012 11:41:22 +0200
Subject: Improved sidebar inclusion

Template authors now can use tpl_sidebar() to include the sidebar.
Sidebars can be defined in subnamespaces as well
---
 inc/template.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index a18d7151f..c9e899034 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1394,6 +1394,18 @@ function tpl_include_page($pageid,$print=true){
 
     if(!$print) return $html;
     echo $html;
+    return $html;
+}
+
+/**
+ * Include the sidebar, will check current namespaces first
+ */
+function tpl_sidebar($print=true){
+    global $conf;
+
+    $sidebar = page_findnearest($conf['sidebar']);
+    if($sidebar) return tpl_include_page($sidebar, $print);
+    return '';
 }
 
 /**
-- 
cgit v1.2.3


From e260f93b6cea05bc39bbd77b9db5bdc0c2c424bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 5 Jul 2012 22:58:24 +0100
Subject: xml compatibility fixes (mainly entities to unicode conversions)

---
 inc/template.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index c9e899034..41da64d2e 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -714,7 +714,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_breadcrumbs($sep='&bull;'){
+function tpl_breadcrumbs($sep='•'){
     global $lang;
     global $conf;
 
@@ -757,7 +757,7 @@ function tpl_breadcrumbs($sep='&bull;'){
  * @author <fredrik@averpil.com>
  * @todo   May behave strangely in RTL languages
  */
-function tpl_youarehere($sep=' &raquo; '){
+function tpl_youarehere($sep=' » '){
     global $conf;
     global $ID;
     global $lang;
@@ -843,7 +843,7 @@ function tpl_pageinfo($ret=false){
     if($INFO['exists']){
         $out = '';
         $out .= $fn;
-        $out .= ' &middot; ';
+        $out .= ' · ';
         $out .= $lang['lastmod'];
         $out .= ': ';
         $out .= $date;
@@ -854,7 +854,7 @@ function tpl_pageinfo($ret=false){
             $out .= ' ('.$lang['external_edit'].')';
         }
         if($INFO['locked']){
-            $out .= ' &middot; ';
+            $out .= ' · ';
             $out .= $lang['lockedby'];
             $out .= ': ';
             $out .= editorinfo($INFO['locked']);
-- 
cgit v1.2.3


From 076f0d729bee262dd9e71303301fe09fe0910cdb Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 5 Jul 2012 23:09:13 +0100
Subject: changed accesskey for top link to 't' ('x' was allocated twice, for
 index/sitemap as well)

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 41da64d2e..76d4d4bbe 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -592,7 +592,7 @@ function tpl_get_action($type) {
             $accesskey = 'x';
             break;
         case 'top':
-            $accesskey = 'x';
+            $accesskey = 't';
             $params = array();
             $id = '#dokuwiki__top';
             break;
-- 
cgit v1.2.3