aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlanguages/en.php1
-rw-r--r--lib/dokuwiki/lib/tpl/default/main.php6
-rw-r--r--views/default/dokuwiki/css.php1
3 files changed, 6 insertions, 2 deletions
diff --git a/languages/en.php b/languages/en.php
index a24819ddc..20b7cb656 100755
--- a/languages/en.php
+++ b/languages/en.php
@@ -18,6 +18,7 @@
"dokuwiki:dokuwiki"=>'Wiki',
"dokuwiki:group"=>'Group wiki',
"dokuwiki:userwiki"=>'My Wiki',
+ "dokuwiki:sidebar" => 'Wiki navigation',
"groups:enabledokuwiki"=>'Enable group wiki',
"groups:enabledokuwiki_frontpage"=>'Show main wiki page in the group front page (only if wiki is enabled)',
"groups:enabledokuwiki_frontsidebar"=>'Show wiki sidebar in the group front page (only if wiki is enabled)',
diff --git a/lib/dokuwiki/lib/tpl/default/main.php b/lib/dokuwiki/lib/tpl/default/main.php
index a6626732d..6aa78b14e 100644
--- 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 c8ac82016..6753e79dc 100644
--- 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;
}