From ada94c882ea1389ef810fa7a920d27fd48dc34a8 Mon Sep 17 00:00:00 2001
From: sembrestels <sembrestels@riseup.net>
Date: Thu, 13 Oct 2011 06:09:36 +0200
Subject: Changing dokuwiki template to improve performance.

---
 lib/dokuwiki/lib/tpl/default/main.php | 17 ++++++++++++-----
 views/default/dokuwiki/grouppage.php  | 12 ------------
 views/default/dokuwiki/sidebar.php    | 13 +------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/lib/dokuwiki/lib/tpl/default/main.php b/lib/dokuwiki/lib/tpl/default/main.php
index 44a317684..d5c117c1b 100644
--- 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 83cb87823..c095dfa2a 100644
--- 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 73de02403..e9a7c89ab 100644
--- 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));
  }
 
 ?>
-- 
cgit v1.2.3