group profile layout tweaked

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

3 files changed, 54 insertions, 70 deletions

diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 7f77d8fe1..60bce36be 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -4,7 +4,7 @@
 	 * 
 	 * @package ElggGroups
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.com/
 	 */
@@ -16,76 +16,63 @@
 	}
 	
 ?>
-	
-<table>
-	<tr>	
-		<td>
-			<div id="groups_info_column_left">
-			
-					<?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>
-		</td>
-		<td>
-		
-			<div id="groups_info_column_right">
-				<div id="groups_icon_wrapper">
+
+<div id="groups_info_column_right" style="float:right;width:200px;border-left:1px solid #efefef;padding:5px;"><!-- start of groups_info_column_right -->
+    <div id="groups_icon_wrapper"><!-- start of groups_icon_wrapper -->
 				
-					<?php
-					echo elgg_view(
-						"groups/icon", array(
+        <?php
+		    echo elgg_view(
+					"groups/icon", array(
 												'entity' => $vars['entity'],
 												//'align' => "left",
 												'size' => $iconsize,
 											  )
 					);
-    				?>
+        ?>
 				
-				</div>
-			</div>
-			
-			<div id="group_admins">
-							<?php
+    </div><!-- end of groups_icon_wrapper -->
+	<div id="group_stats" style="background:#efefef;margin:10px 0 10px 0;border:1px solid #ccc;"><!-- start of group_stats -->
+	    <?php
 							
-								echo "<p><b>" . elgg_echo("groups:owner") . "</b></p>";
-								echo "<p><a href=\"" . get_user($vars['entity']->owner_guid)->getURL() . "\">" . get_user($vars['entity']->owner_guid)->name . "</a></p>";
+		    echo "<p><b>" . elgg_echo("groups:owner") . "</b></p>";
+		    echo "<p><a href=\"" . get_user($vars['entity']->owner_guid)->getURL() . "\">" . get_user($vars['entity']->owner_guid)->name . "</a></p>";
 								
-							?>
-			</div>
-			
-		</td>
-	</tr>
-</table>
-	
+	    ?>
+	    <p>Members: 210<br />
+	    Latest Activity: 2 hours ago<br />
+	    Number of files: 50</p>
+    </div><!-- end of group_stats -->
+</div><!-- end of groups_info_column_right -->
+
+<div id="groups_info_column_left" style="width:460px;"><!-- start of groups_info_column_left --> 
+    <?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><!-- end of groups_info_column_left -->
+
 <div id="groups_info_wide">
 
 	<p class="groups_info_edit_buttons">
diff --git a/mod/groups/views/default/groups/members.php b/mod/groups/views/default/groups/members.php
index 3f3453f85..794dccfc3 100644
--- a/mod/groups/views/default/groups/members.php
+++ b/mod/groups/views/default/groups/members.php
@@ -13,6 +13,7 @@
 	 //var_export($vars['entity']);

 ?>

 

+<div id="group_members">

 <h2><?php echo elgg_echo("groups:members"); ?></h2>

 

 <?php

@@ -24,4 +25,5 @@
            

     }

     

-?>
\ No newline at end of file
+?>

+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/profileitems.php b/mod/groups/views/default/groups/profileitems.php
index 91bc6567a..a2b29cde7 100644
--- a/mod/groups/views/default/groups/profileitems.php
+++ b/mod/groups/views/default/groups/profileitems.php
@@ -10,18 +10,13 @@
 	 * @link http://elgg.com/

 	 */

 	 

-	//members

-	 echo "<div class=\"group_narrow_column\" style=\"float:right;width:200px;\">";

-	 echo elgg_view("groups/members",array('entity' => $vars['entity']));

-	 echo "</div>";

-	 

 	 //narrow column

-	 echo "<div class=\"group_narrow_column\" style=\"float:right;width:200px;\">";

+	 echo "<div class=\"group_narrow_column\" style=\"float:right;width:330px;border:1px solid #efefef;\">";

 	 echo elgg_view("groups/narrow_column",array('entity' => $vars['entity']));

 	 echo "</div>";

 	 

 	 //wider column

-	 echo "<div id=\"group_wide_column\" style=\"width:450px;\">";

+	 echo "<div id=\"group_wide_column\" style=\"width:330px;border:1px solid #efefef;\">";

 	 echo elgg_view("groups/wide_column",array('entity' => $vars['entity']));

 	 echo "</div>";