From 9f9668ceebe2a23c98800172bc90f8e759f614d2 Mon Sep 17 00:00:00 2001
From: sembrestels <sembrestels@riseup.net>
Date: Thu, 13 Oct 2011 05:49:08 +0200
Subject: Wiki sidebar on group profile

---
 views/default/dokuwiki/grouppage.php |  4 ++--
 views/default/dokuwiki/sidebar.php   | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/views/default/dokuwiki/grouppage.php b/views/default/dokuwiki/grouppage.php
index 77cc9d104..83cb87823 100644
--- a/views/default/dokuwiki/grouppage.php
+++ b/views/default/dokuwiki/grouppage.php
@@ -4,8 +4,6 @@ $group = elgg_get_page_owner_entity();
 $offset = (int)get_input("offset",0);
 if ($group->dokuwiki_enable  == 'yes' && $group->dokuwiki_frontpage_enable  == 'yes') {
 	
-	set_input("inline_page", true);
-	
 	$all_link = elgg_get_site_url().'dokuwiki/'.$group->guid;
 	$all_text = elgg_echo('viewall');
 	$all_link = "<a href=\"$all_link\">$all_text</a>";	
@@ -15,6 +13,8 @@ if ($group->dokuwiki_enable  == 'yes' && $group->dokuwiki_frontpage_enable  == '
 		'content' => $none,
 		'all_link' => $all_link,
 	));
+	
+	set_input("inline_page", true);
 	dokuwiki_page_handler(array($group->guid));
 }
 
diff --git a/views/default/dokuwiki/sidebar.php b/views/default/dokuwiki/sidebar.php
index c47a1bf6d..73de02403 100644
--- a/views/default/dokuwiki/sidebar.php
+++ b/views/default/dokuwiki/sidebar.php
@@ -1,12 +1,21 @@
 <?php
 
-$group = page_owner_entity();
+$group = elgg_get_page_owner_entity();
 if ($group->dokuwiki_enable  == 'yes' && $group->dokuwiki_frontsidebar_enable  == 'yes') {
-  set_input("inline_sidebar", true);
-  set_input("inline_page", false);
-  echo "<div id='group_pages_widget'>";
-  echo elggdokuwiki_page_handler(array($group->guid));
-  echo "</div>";
+	
+	$all_link = elgg_get_site_url().'dokuwiki/'.$group->guid;
+	$all_text = elgg_echo('viewall');
+	$all_link = "<a href=\"$all_link\">$all_text</a>";
+	
+	echo elgg_view('groups/profile/module', array(
+		'title' => elgg_echo('dokuwiki:group'),
+		'content' => $none,
+		//'all_link' => $all_link,
+	));
+	
+	set_input("inline_sidebar", true);
+	set_input("inline_page", false);
+	echo dokuwiki_page_handler(array($group->guid));
  }
 
 ?>
-- 
cgit v1.2.3