Changing dokuwiki template to improve performance.

diff --git a/lib/dokuwiki/lib/tpl/default/main.php b/lib/dokuwiki/lib/tpl/default/main.php
index 44a317684fb3abaee9ab5ef2f1a7f5a9fdbcf6c4..d5c117c1b10278c6d518bc67f780d52db5ed63e0 100644 (file)
--- a/lib/dokuwiki/lib/tpl/default/main.php
+++ b/lib/dokuwiki/lib/tpl/default/main.php
@@ -38,12 +38,19 @@ if (empty($sidebar_inline) && empty($page_inline)) {
        echo page_draw("dokuwiki",$body);
 }
 else {
-       echo "<h2>".elgg_echo("dokuwiki:groupwiki")."</h2>";
-       echo "<div class='forum_latest'>";
+       
        echo elgg_view("dokuwiki/metatags");
-       echo $content;
-       echo $sidebar;
-       echo "</div>";
+
+       $all_link = elgg_get_site_url().'dokuwiki/'.elgg_get_page_owner_guid();
+       $all_text = elgg_echo('link:view:all');
+       $all_link = "<a href=\"$all_link\">$all_text</a>";
+
+       echo elgg_view('groups/profile/module', array(
+               'title' => elgg_echo('dokuwiki:group'),
+               'content' => $content . $sidebar,
+               'all_link' => $all_link,
+       ));
+       
 }
 
 

diff --git a/views/default/dokuwiki/grouppage.php b/views/default/dokuwiki/grouppage.php
index 83cb8782398c68c31f87a51e75d02837d517d42d..c095dfa2a24034d45d20f46a7af96fa54d4e725c 100644 (file)
--- a/views/default/dokuwiki/grouppage.php
+++ b/views/default/dokuwiki/grouppage.php
@@ -1,19 +1,7 @@
 <?php
 
 $group = elgg_get_page_owner_entity();
-$offset = (int)get_input("offset",0);
 if ($group->dokuwiki_enable  == 'yes' && $group->dokuwiki_frontpage_enable  == 'yes') {
-       
-       $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_page", true);
        dokuwiki_page_handler(array($group->guid));
 }

diff --git a/views/default/dokuwiki/sidebar.php b/views/default/dokuwiki/sidebar.php
index 73de024030d9368171246208cd9f9902ad08e67f..e9a7c89abcf9bd7f4686aa8b67e6af7dcd9030ce 100644 (file)
--- a/views/default/dokuwiki/sidebar.php
+++ b/views/default/dokuwiki/sidebar.php
@@ -2,20 +2,9 @@
 
 $group = elgg_get_page_owner_entity();
 if ($group->dokuwiki_enable  == 'yes' && $group->dokuwiki_frontsidebar_enable  == 'yes') {
-       
-       $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));
+       dokuwiki_page_handler(array($group->guid));
  }
 
 ?>