continuation of cleanup on groups

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

3 files changed, 40 insertions, 9 deletions

diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index 9fa80db79..b574aea7c 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -11,20 +11,23 @@
 	 

 ?>

 

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

- <div id="forum_topics"><!-- start of the forum_topics div -->

-    

+<div id="content_area_group_title"><h2><?php echo elgg_echo("groups:forum"); ?></h2></div>

+

 <?php

     //only show the add link if the user is a member

     if(page_owner_entity()->isMember($vars['user'])){

      

 ?>

         <!-- display the add a topic link -->

-        <p>[<a href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo get_input('group_guid'); ?>"><?php echo elgg_echo("groups:addtopic"); ?></a>]</p>

+        <a href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo get_input('group_guid'); ?>" class="add_topic_button"><?php echo elgg_echo("groups:addtopic"); ?></a>

 

 <?php

     }

-?>   

+?> 

+

+<div id="forum_topics"><!-- start of the forum_topics div -->

+    

+  

         <!-- display the forum title -->

         <h2><?php echo get_entity(get_input("forum"))->title; ?></h2>

         

@@ -62,7 +65,7 @@
                 <table width="100%" border="0" cellpadding="0" cellspacing="0">

                 <tr>

                     <td>

-                        <a href="<?php echo $vars['url']; ?>mod/groups/topicposts.php?topic=<?php echo $topic->guid; ?>&group_guid=<?php echo $topic->container_guid; ?>"><?php echo $topic->title; ?></a>

+                        <p class="topic_title"><a href="<?php echo $vars['url']; ?>mod/groups/topicposts.php?topic=<?php echo $topic->guid; ?>&group_guid=<?php echo $topic->container_guid; ?>"><?php echo $topic->title; ?></a></p>

                         <!-- display edit and delete links if the user has privileges -->

         		        <?php

         

@@ -70,7 +73,7 @@
                 			if ($topic->canEdit()) {

                 				

                 		?>

-                				<a href="<?php echo $vars['url']; ?>mod/groups/edittopic.php?topic=<?php echo $topic->guid; ?>&group=<?php echo $topic->container_guid; ?>"><?php echo elgg_echo("edit"); ?></a>

+                				<a href="<?php echo $vars['url']; ?>mod/groups/edittopic.php?topic=<?php echo $topic->guid; ?>&group=<?php echo $topic->container_guid; ?>"><?php echo elgg_echo("edit"); ?></a> &nbsp; 

                 				<?php

                 				 

                 				    // display the delete link to those allowed to delete

diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
index 20f56ec8d..a832fd070 100644
--- a/mod/groups/views/default/forum/viewposts.php
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -13,9 +13,9 @@
 ?>

 

 <div id="topic_posts"><!-- open the topic_posts div -->

-      <p><a href="<?php echo $vars['url']; ?>pg/groups/forum/<?php echo $vars['entity']->container_guid; ?>/"><?php echo elgg_echo("groups:forum"); ?></a> &raquo; <?php echo $vars['entity']->title; ?></a></p>

+<div id="pages_breadcrumbs"><b><a href="<?php echo $vars['url']; ?>pg/groups/forum/<?php echo $vars['entity']->container_guid; ?>/"><?php echo elgg_echo("groups:forum"); ?></a></b> > <?php echo $vars['entity']->title; ?></div>

     <!-- grab the topic title -->

-        <h2><?php echo $vars['entity']->title; ?></h2>

+        <div id="content_area_group_title"><h2><?php echo $vars['entity']->title; ?></h2></div>

   

 <?php

     //display follow up comments

diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 8a88ef393..f50a6ea36 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -61,6 +61,8 @@
 .topic_title {

 	font-size: 1.2em;

 	line-height: 1.1em;

+	margin:0;

+	padding:0 0 4px 0;

 }

 

 .forum_topics {

@@ -107,3 +109,29 @@
     margin:0;

 }

 

+a.add_topic_button {

+	font: 12px/100% Arial, Helvetica, sans-serif;

+	font-weight: bold;

+	color: #ffffff;

+	background:#4690d6;

+	border: 2px solid #4690d6;

+	-webkit-border-radius: 4px; 

+	-moz-border-radius: 4px;

+	/*

+	width: auto;

+	height: 25px;

+	*/

+	padding: 4px 6px 4px 6px;

+	margin:0;

+	cursor: pointer;

+	display:table;

+}

+a.add_topic_button:hover {

+	background: #0054a7;

+	border: 2px solid #0054a7;

+	text-decoration: none;

+}

+

+

+

+