Beginnings of the refreshed groups interface

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

7 files changed, 85 insertions, 115 deletions

diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index d002b110a..e9fbb7109 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -29,73 +29,71 @@
 	    echo elgg_view_title(elgg_echo("groups:addtopic"));
 	    
 ?>
-<div class="contentWrapper">
-	<!-- display the input form -->
-	<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" method="post">
-	<?php echo elgg_view('input/securitytoken'); ?>
+<!-- display the input form -->
+<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" method="post" class="margin_top">
+<?php echo elgg_view('input/securitytoken'); ?>
+
+	<p>
+		<label><?php echo elgg_echo("title"); ?><br />
+		<?php
+            //display the topic title input
+			echo elgg_view("input/text", array(
+								"internalname" => "topictitle",
+								"value" => $title,
+												));
+		?>
+		</label>
+	</p>
 	
-		<p>
-			<label><?php echo elgg_echo("title"); ?><br />
-			<?php
-                //display the topic title input
-				echo elgg_view("input/text", array(
-									"internalname" => "topictitle",
-									"value" => $title,
-													));
-			?>
-			</label>
-		</p>
-		
-		<!-- display the tag input -->
-		<p>
-			<label><?php echo elgg_echo("tags"); ?><br />
-			<?php
+	<!-- display the tag input -->
+	<p>
+		<label><?php echo elgg_echo("tags"); ?><br />
+		<?php
 
-				echo elgg_view("input/tags", array(
-									"internalname" => "topictags",
-									"value" => $tags,
-													));
-			
-			?>
-			</label>
-		</p>
+			echo elgg_view("input/tags", array(
+								"internalname" => "topictags",
+								"value" => $tags,
+												));
 		
-		<!-- topic message input -->
-		<p class="longtext_editarea">
-			<label><?php echo elgg_echo("groups:topicmessage"); ?><br />
-			<?php
+		?>
+		</label>
+	</p>
+	
+	<!-- topic message input -->
+	<p class="longtext_editarea">
+		<label><?php echo elgg_echo("groups:topicmessage"); ?><br />
+		<?php
 
-				echo elgg_view("input/longtext",array(
-									"internalname" => "topicmessage",
-									"value" => $message,
-													));
-			?>
-			</label>
-		</p>
-		
-		<!-- set the topic status -->
-		<p>
-		    <label><?php echo elgg_echo("groups:topicstatus"); ?><br />
-		    <select name="status">
-		        <option value="open" <?php if($status == "") echo "SELECTED";?>><?php echo elgg_echo('groups:topicopen'); ?></option>
-		        <option value="closed" <?php if($status == "closed") echo "SELECTED";?>><?php echo elgg_echo('groups:topicclosed'); ?></option>
-		    </select>
-		    </label>
-		</p>
-		
-		<!-- access -->
-		<p>
-			<label>
-				<?php echo elgg_echo('access'); ?><br />
-				<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
-			</label>
-		</p>
-		
-		<!-- required hidden info and submit button -->
-		<p>
-			<input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
-			<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
-		</p>
+			echo elgg_view("input/longtext",array(
+								"internalname" => "topicmessage",
+								"value" => $message,
+												));
+		?>
+		</label>
+	</p>
+	
+	<!-- set the topic status -->
+	<p>
+	    <label><?php echo elgg_echo("groups:topicstatus"); ?><br />
+	    <select name="status">
+	        <option value="open" <?php if($status == "") echo "SELECTED";?>><?php echo elgg_echo('groups:topicopen'); ?></option>
+	        <option value="closed" <?php if($status == "closed") echo "SELECTED";?>><?php echo elgg_echo('groups:topicclosed'); ?></option>
+	    </select>
+	    </label>
+	</p>
 	
-	</form>
-</div>
+	<!-- access -->
+	<p>
+		<label>
+			<?php echo elgg_echo('access'); ?><br />
+			<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
+		</label>
+	</p>
+	
+	<!-- required hidden info and submit button -->
+	<p>
+		<input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
+		<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+	</p>
+
+</form>
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index c4cd9becf..fdeffa564 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -11,7 +11,7 @@
 	 
 ?>
 
-<div id="content_area_group_title"><h2><?php echo elgg_echo("groups:forum"); ?></h2></div>
+<h2><?php echo elgg_echo("groups:forum"); ?></h2>
 
 <?php
     //only show the add link if the user is a member
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
index e7e194691..f2599f861 100644
--- a/mod/groups/views/default/forum/viewposts.php
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -29,8 +29,8 @@
     											));
 
 ?>
-    <!-- grab the topic title -->
-        <div id="content_area_group_title"><h2><?php echo $vars['entity']->title; ?></h2></div>
+<!-- grab the topic title -->
+<h2><?php echo $vars['entity']->title; ?></h2>
 <?php
     											
     foreach($vars['entity']->getAnnotations('group_topic_post', 50, $offset, "asc") as $post) {
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index bc8d2bfc0..77568b0be 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -1,17 +1,17 @@
 <?php
-
-	/**
-	 * Elgg Groups css
-	 * 
-	 * @package groups
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
+/**
+ * Elgg Groups css
+ * 
+ * @package groups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 
 ?>
 
+/*
 #content_area_group_title h2 {
 	color:#0054A7;
 	font-size:1.35em;
@@ -22,6 +22,7 @@
 #topic_posts #content_area_group_title h2 {
 	margin:0 0 0 0;
 }
+*/
 
 #two_column_left_sidebar_maincontent #owner_block_content {
 	margin:0 0 10px 0 !important;
@@ -69,10 +70,7 @@
 	margin:0;
 }
 #group_members {
-	margin:10px;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	background: white;
+	margin:10px 0;
 }
 
 #right_column {
@@ -87,37 +85,13 @@
 	margin:0 10px 0 10px;
 
 }
-/* IE 6 fixes */
-* html #left_column { 
-	margin:0 0 0 5px;
-}
-* html #right_column { 
-	margin:0 5px 0 0;
-}
 
-#group_members h2,
-#right_column h2,
-#left_column h2,
-#fullcolumn h2 {
-	margin:0 0 10px 0;
-	padding:5px;
-	color:#0054A7;
-	font-size:1.25em;
-	line-height:1.2em;
-}
-#fullcolumn .contentWrapper {
-	margin:0 10px 20px 10px;
-	padding:0 0 5px;
-}
 
 .member_icon {
-	margin:0 0 6px 6px;
+	margin:6px 6px 0 0;
 	float:left;
 }
 
-/* IE6 */
-* html #topic_post_tbl { width:676px !important;}
-
 /* all browsers - force tinyMCE on edit comments to be full-width */
 .edit_forum_comments .defaultSkin table.mceLayout {
 	width: 636px !important;
@@ -204,7 +178,7 @@
 	margin:0 10px 5px 10px;
 }
 .forum_latest {
-	margin:0 10px 5px 10px;
+	margin:5px 0 5px 0;
 	background: #dedede;
 	padding:5px;
    	-webkit-border-radius: 4px; 
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index 7314507e0..6c7ec3359 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -14,7 +14,7 @@
 	 $url = $vars['url'] . "pg/groups/world/";
 
 ?>
-<div id="elgg_horizontal_tabbed_nav">
+<div class="elgg_horizontal_tabbed_nav margin_top">
 <ul>
 	<li <?php if($filter == "active") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=active"><?php echo elgg_echo('groups:latestdiscussion'); ?></a></li>
 	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('groups:newest'); ?></a></li>
diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 1c989c9a8..426eaeae6 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -18,7 +18,7 @@
 ?>
 
 <div id="groups_info_column_right"><!-- start of groups_info_column_right -->
-	<div id="groups_icon_wrapper"><!-- start of groups_icon_wrapper -->
+	<div id="groups_icon_wrapper" class="margin_top"><!-- start of groups_icon_wrapper -->
 
 		<?php
 			echo elgg_view(
@@ -41,7 +41,7 @@
 	</div><!-- end of group_stats -->
 </div><!-- end of groups_info_column_right -->
 
-<div id="groups_info_column_left"><!-- start of groups_info_column_left -->
+<div id="groups_info_column_left" class="margin_top"><!-- start of groups_info_column_left -->
 	<?php
 		if ($vars['full'] == true) {
 			if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0){
diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php
index 7de921ed0..67cea1634 100644
--- a/mod/groups/views/default/groups/side_menu.php
+++ b/mod/groups/views/default/groups/side_menu.php
@@ -1,10 +1,8 @@
-<div class="sidebarBox">
-<div id="owner_block_submenu"><ul>
+<div class="submenu page_navigation"><ul>
 <?php
 	if(isloggedin()){
 		echo "<li><a href=\"{$vars['url']}pg/groups/member/{$_SESSION['user']->username}\">". elgg_echo('groups:yours') ."</a></li>";
 		echo "<li><a href=\"{$vars['url']}pg/groups/invitations/{$_SESSION['user']->username}\">". elgg_echo('groups:invitations') ."</a></li>";
-		echo "<li><a href=\"{$vars['url']}pg/groups/new/\">". elgg_echo('groups:new') ."</a></li>";
 	}
 ?>
-</ul></div></div>
\ No newline at end of file
+</ul></div>
\ No newline at end of file