From 7f4e7c8a0a9bf500f9c888fc49aece9644fee8fd Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 21 Mar 2011 01:47:20 +0000
Subject: Fixes #3113 pulled group profile fields out of top profile area

git-svn-id: http://code.elgg.org/elgg/trunk@8800 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/lib/groups.php                          |  2 +-
 mod/groups/views/default/groups/profile/fields.php | 38 +++++++++++
 .../views/default/groups/profile/profile_block.php | 77 ----------------------
 .../views/default/groups/profile/summary.php       | 50 ++++++++++++++
 4 files changed, 89 insertions(+), 78 deletions(-)
 create mode 100644 mod/groups/views/default/groups/profile/fields.php
 delete mode 100644 mod/groups/views/default/groups/profile/profile_block.php
 create mode 100644 mod/groups/views/default/groups/profile/summary.php

diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index 0855f73d6..cfab11ebb 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -195,7 +195,7 @@ function groups_handle_profile_page($guid) {
 	elgg_push_breadcrumb($group->name);
 
 	$sidebar = '';
-	$content = elgg_view('groups/profile/profile_block', array('entity' => $group));
+	$content = elgg_view('groups/profile/summary', array('entity' => $group));
 	if (group_gatekeeper(false)) {
 		$content .= elgg_view('groups/profile/widgets', array('entity' => $group));
 		$sidebar = elgg_view('groups/sidebar/members', array('entity' => $group));
diff --git a/mod/groups/views/default/groups/profile/fields.php b/mod/groups/views/default/groups/profile/fields.php
new file mode 100644
index 000000000..5cd06025f
--- /dev/null
+++ b/mod/groups/views/default/groups/profile/fields.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Group profile fields
+ */
+
+$group = $vars['entity'];
+
+$profile_fields = elgg_get_config('group');
+
+if (is_array($profile_fields) && count($profile_fields) > 0) {
+
+	$even_odd = 'odd';
+	foreach ($profile_fields as $key => $valtype) {
+		// do not show the name
+		if ($key == 'name') {
+			continue;
+		}
+
+		$value = $group->$key;
+		if (empty($value)) {
+			continue;
+		}
+
+		$options = array('value' => $group->$key);
+		if ($valtype == 'tags') {
+			$options['tag_names'] = $key;
+		}
+
+		echo "<p class=\"{$even_odd}\">";
+		echo "<b>";
+		echo elgg_echo("groups:$key");
+		echo ": </b>";
+		echo elgg_view("output/$valtype", $options);
+		echo "</p>";
+
+		$even_odd = ($even_odd == 'even') ? 'odd' : 'even';
+	}
+}
diff --git a/mod/groups/views/default/groups/profile/profile_block.php b/mod/groups/views/default/groups/profile/profile_block.php
deleted file mode 100644
index 2f384b4bf..000000000
--- a/mod/groups/views/default/groups/profile/profile_block.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Group profile
- *
- * Icon and profile fields
- *
- * @uses $vars['group']
- */
-
-if (!isset($vars['entity']) || !$vars['entity']) {
-	echo elgg_echo('groups:notfound');
-	return true;
-}
-
-$group = $vars['entity'];
-$owner = $group->getOwnerEntity();
-
-$profile_fields = elgg_get_config('group');
-
-?>
-<div class="groups-profile clearfix elgg-image-block">
-	<div class="elgg-image">
-		<div class="groups-profile-icon">
-			<?php echo elgg_view_entity_icon($group, 'large', array('href' => '')); ?>
-		</div>
-		<div class="groups-stats">
-			<p>
-				<b><?php echo elgg_echo("groups:owner"); ?>: </b>
-				<?php
-					echo elgg_view('output/url', array(
-						'text' => $owner->name,
-						'value' => $owner->getURL(),
-					));
-				?>
-			</p>
-			<p>
-			<?php
-				echo elgg_echo('groups:members') . ": " . $group->getMembers(0, 0, TRUE);
-			?>
-			</p>
-		</div>
-	</div>
-
-	<div class="groups-profile-fields elgg-body">
-<?php
-if (is_array($profile_fields) && count($profile_fields) > 0) {
-
-	$even_odd = 'odd';
-	foreach ($profile_fields as $key => $valtype) {
-		// do not show the name
-		if ($key == 'name') {
-			continue;
-		}
-
-		$value = $group->$key;
-		if (empty($value)) {
-			continue;
-		}
-
-		$options = array('value' => $group->$key);
-		if ($valtype == 'tags') {
-			$options['tag_names'] = $key;
-		}
-
-		echo "<p class=\"{$even_odd}\">";
-		echo "<b>";
-		echo elgg_echo("groups:$key");
-		echo ": </b>";
-		echo elgg_view("output/$valtype", $options);
-		echo "</p>";
-
-		$even_odd = ($even_odd == 'even') ? 'odd' : 'even';
-	}
-}
-?>
-	</div>
-</div>
diff --git a/mod/groups/views/default/groups/profile/summary.php b/mod/groups/views/default/groups/profile/summary.php
new file mode 100644
index 000000000..b7ae51070
--- /dev/null
+++ b/mod/groups/views/default/groups/profile/summary.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Group profile summary
+ *
+ * Icon and profile fields
+ *
+ * @uses $vars['group']
+ */
+
+if (!isset($vars['entity']) || !$vars['entity']) {
+	echo elgg_echo('groups:notfound');
+	return true;
+}
+
+$group = $vars['entity'];
+$owner = $group->getOwnerEntity();
+
+?>
+<div class="groups-profile clearfix elgg-image-block">
+	<div class="elgg-image">
+		<div class="groups-profile-icon">
+			<?php echo elgg_view_entity_icon($group, 'large', array('href' => '')); ?>
+		</div>
+		<div class="groups-stats">
+			<p>
+				<b><?php echo elgg_echo("groups:owner"); ?>: </b>
+				<?php
+					echo elgg_view('output/url', array(
+						'text' => $owner->name,
+						'value' => $owner->getURL(),
+					));
+				?>
+			</p>
+			<p>
+			<?php
+				echo elgg_echo('groups:members') . ": " . $group->getMembers(0, 0, TRUE);
+			?>
+			</p>
+		</div>
+	</div>
+
+	<div class="groups-profile-fields elgg-body">
+		<?php
+			echo elgg_view('groups/profile/fields', $vars);
+		?>
+	</div>
+</div>
+<?php
+?>
+
-- 
cgit v1.2.3