Refs #109 - Basic profile layout

git-svn-id: https://code.elgg.org/elgg/trunk@1292 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 151 insertions, 9 deletions

diff --git a/mod/groups/views/default/groups/grouplinks.php b/mod/groups/views/default/groups/grouplinks.php
new file mode 100644
index 000000000..0397cec08
--- /dev/null
+++ b/mod/groups/views/default/groups/grouplinks.php
@@ -0,0 +1,29 @@
+<?php
+	/**
+	 * Group links
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 */
+
+    //check to see if the user is looking at their own profile
+    if($_SESSION['user']->guid == $vars['entity']->owner_guid){
+
+        echo "<div id=\"profile_menu_wrapper\">"; //start the wrapper div
+	    echo elgg_view("groups/menu/actions",$vars);
+	    echo elgg_view("groups/menu/ownerlinks",$vars); 
+	    echo "</div>"; //close wrapper div 
+	    
+    } else {
+        
+        echo "<div id=\"profile_menu_wrapper\">"; //start the wrapper div
+        echo elgg_view("groups/menu/actions",$vars); //grab action links such as make friend
+	    echo elgg_view("groups/menu/links",$vars); //passive links to items such as user blog etc
+	    echo "</div>"; //close wrapper div 
+	    
+    }
+
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index bf0945c63..6eb403bb5 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -15,8 +15,110 @@
 		$iconsize = "medium";
 	}
 	
+?>
 	
+<table>
+	<tr>
+		<td>
+		
+			<div id="groups_info_column_left">
+				<div id="groups_icon_wrapper">
+				
+					<?php
+					echo elgg_view(
+						"groups/icon", array(
+												'entity' => $vars['entity'],
+												//'align' => "left",
+												'size' => $iconsize,
+											  )
+					);
+
+				    // 	display relevant links			
+    				echo elgg_view("groups/grouplinks", array("entity" => $vars['entity']));
+    				?>
+				
+				</div>
+			</div>
+			
+		</td>
+		
+		<td>
+			<div id="groups_info_column_right">
+			
+					<?php  
+						echo "<h2><a href=\"" . $vars['entity']->getURL() . "\">" . $vars['entity']->title . "</a></h2> <br />"; 
+						
+					?>
+						
+					<?php
+						
+						if ($vars['full'] == true) {
+							if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0)
+							{
+								
+								foreach($vars['config']->group as $shortname => $valtype) {
+									if ($shortname != "title") {
+										$value = $vars['entity']->$shortname;
+										
+										if (!empty($value)) {
+					
+											//This function controls the alternating class
+                							$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+										}
+										
+										echo "<p class=\"{$even_odd}\">";
+										echo "<b>";
+										echo elgg_echo("groups:{$shortname}");
+										echo ": </b>";
+										
+										echo elgg_view("output/{$valtype}",array('value' => $vars['entity']->$shortname));
+										
+										echo "</p>";
+									}
+								}
+							}
+						}
+						
+						
+					?>
+					
+					<div id="groups_owner">
+							<?php
+							
+								echo "<b>" . elgg_echo("groups:owner") . "</b>";
+								
+								echo elgg_view(
+											"profile/icon", array(
+												'entity' => get_entity($vars['entity']->owner_guid),
+												//'align' => "left",
+												'size' => 'small',
+											  )
+					);
+
+							?>
+					</div>
+			</div>
+		</td>
+	</tr>
+</table>
+	
+<div id="groups_info_wide">
+
+	<p class="groups_info_edit_buttons">
+	
+<?php
+	if ($vars['entity']->canEdit()) 
+	{
+
+?>
+			
+		<a href="<?php echo $vars['url']; ?>mod/groups/edit.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a>
+			
+<?php
+	
+	}
 	
+?>
 	
-	// join / leave (if can join & leave)
-?>
\ No newline at end of file
+	</p>
+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/menu/actions.php b/mod/groups/views/default/groups/menu/actions.php
index 21101ddb8..2c686fd95 100644
--- a/mod/groups/views/default/groups/menu/actions.php
+++ b/mod/groups/views/default/groups/menu/actions.php
@@ -33,12 +33,6 @@
 			}	
 		}
 		
-		// edit
-		if ($_SESSION['user']->getGUID() == $vars['entity']->owner_guid)
-		{
-		?>
-			<p><a href="<?php echo $vars['url']; ?>mod/groups/edit.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a></p>
-		<?php 
-		}
+		
 	}
 ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/menu/ownerlinks.php b/mod/groups/views/default/groups/menu/ownerlinks.php
index 15c5adc7f..aaa575bec 100644
--- a/mod/groups/views/default/groups/menu/ownerlinks.php
+++ b/mod/groups/views/default/groups/menu/ownerlinks.php
@@ -1,3 +1,20 @@
 <?php
+	/**
+	 * Owner links
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 */
 
+
+	// edit
+	if (($_SESSION['user']->getGUID() == $vars['entity']->owner_guid) && ($vars['full']))
+	{
+	?>
+		<p><a href="<?php echo $vars['url']; ?>mod/groups/edit.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a></p>
+	<?php 
+	}
 ?>
\ No newline at end of file