Enhancements to wiki navigation.

diff --git a/languages/en.php b/languages/en.php
index a24819ddc70987218348f0b028fe9ac7841b8cbd..20b7cb656c3ea5796d4bdd0efbfb581ad7d2846b 100755 (executable)
--- a/languages/en.php
+++ b/languages/en.php
@@ -18,6 +18,7 @@
                "dokuwiki:dokuwiki"=>'Wiki',\r
                "dokuwiki:group"=>'Group wiki',\r
                "dokuwiki:userwiki"=>'My Wiki',\r
+               "dokuwiki:sidebar" => 'Wiki navigation',\r
                "groups:enabledokuwiki"=>'Enable group wiki',\r
                "groups:enabledokuwiki_frontpage"=>'Show main wiki page in the group front page (only if wiki is enabled)',\r
                "groups:enabledokuwiki_frontsidebar"=>'Show wiki sidebar in the group front page (only if wiki is enabled)',\r

diff --git a/lib/dokuwiki/lib/tpl/default/main.php b/lib/dokuwiki/lib/tpl/default/main.php
index a6626732d4d4da33fbe73c7b6191a824a547db2f..6aa78b14eca9f7cb5aabf0d304eb3bfbf99cfab9 100644 (file)
--- a/lib/dokuwiki/lib/tpl/default/main.php
+++ b/lib/dokuwiki/lib/tpl/default/main.php
@@ -35,7 +35,9 @@ $sidebar = ob_get_clean();
 
 if (empty($sidebar_inline) && empty($page_inline)) {
        $title = sprintf(elgg_echo('dokuwiki:wikifrom'), elgg_get_page_owner_entity()->name);
-       
+
+       $sidebar = elgg_view_module('aside', elgg_echo('dokuwiki:sidebar'), $sidebar);
+
        $body = elgg_view_layout('content', array(
                'filter' => '',
                'content' => $content,
@@ -51,7 +53,7 @@ else {
        $all_link = "<a href=\"$all_link\">$all_text</a>";
 
        echo elgg_view('groups/profile/module', array(
-               'title' => elgg_echo('dokuwiki:group'),
+               'title' => $content ? elgg_echo('dokuwiki:group') : elgg_echo('dokuwiki:sidebar'),
                'content' => $content . $sidebar,
                'all_link' => $all_link,
        ));

diff --git a/views/default/dokuwiki/css.php b/views/default/dokuwiki/css.php
index c8ac8201615a1a4ab6197e18aaa2347cf4735f6d..6753e79dc9f485ac6613f085b6b9451ac72b094e 100644 (file)
--- a/views/default/dokuwiki/css.php
+++ b/views/default/dokuwiki/css.php
@@ -8,4 +8,5 @@ div.dokuwiki .header {
 
 #sidebartop {
        position: relative !important;
+       display: none;
 }