Wiki sidebar on group profile

diff --git a/start.php b/start.php
index 916109680e46e18f052e5e0133a09cecd2765254..f44206b3d04b5f2501656385b678db76462b1bca 100644 (file)
--- a/start.php
+++ b/start.php
@@ -29,7 +29,7 @@ function dokuwiki_init(){
        add_group_tool_option('dokuwiki_frontpage',elgg_echo('groups:enabledokuwiki_frontpage'),false);
        
        elgg_extend_view('groups/profile/summary','dokuwiki/grouppage');
-       elgg_extend_view('groups/left_column','dokuwiki/sidebar');
+       elgg_extend_view('groups/tool_latest','dokuwiki/sidebar');
        
        // Extending CSS
        elgg_extend_view('css/elgg', 'dokuwiki/css');

diff --git a/views/default/dokuwiki/grouppage.php b/views/default/dokuwiki/grouppage.php
index 77cc9d10426325a5650183ab16cf6f657ef1a1a9..83cb8782398c68c31f87a51e75d02837d517d42d 100644 (file)
--- 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 c47a1bf6df4d071c177b6124987e834f262769cd..73de024030d9368171246208cd9f9902ad08e67f 100644 (file)
--- 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));
  }
 
 ?>