discussion list updated for long usernames, and clearing issues fixed for pc

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

2 files changed, 12 insertions, 11 deletions

diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index dd81bc8ec..08ffba5b5 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -262,21 +262,23 @@ a.add_topic_button:hover {
 
 
 /* latest discussion listing */
-p.latest_discussion_info {
+.latest_discussion_info {
 	float:right;
-	width:280px;
+	width:300px;
 	text-align: right;
+	margin-left: 10px;
 }
 .groups .search_listing br {
 	height:0;
 	line-height:0;
 }
-
 span.timestamp {
 	color:#666666;
 	font-size: 90%;
 }
-
+.latest_discussion_info .timestamp {
+	font-size: 0.85em;
+}
 /* new groups page */
 .groups .search_listing {
 	border:2px solid #cccccc;
@@ -369,16 +371,15 @@ span.timestamp {
 	height:14px;
 	margin:0;
 	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0;
-	text-indent: 9000em;
 }
 .delete_discussion a:hover {
 	background-position: 0 -16px;
 	text-decoration: none;
 }
 /* IE6 */
-* html .delete_discussion a { text-indent: none; font-size: 1px; }
+* html .delete_discussion a { font-size: 1px; }
 /* IE7 */
-*:first-child+html .delete_discussion a { text-indent: none; font-size: 1px; }
+*:first-child+html .delete_discussion a { font-size: 1px; }
 
 /* delete group button */
 #delete_group_option input[type="submit"] {
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 534602f2d..021d139ca 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -48,7 +48,7 @@
 		

 	}else{

 		

-		$info = "<p class=\"latest_discussion_info\"><span class=\"timestamp\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "</span>";

+		$info = "<span class=\"latest_discussion_info\"><span class=\"timestamp\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "</span>";

 		if ($last_time) $info.= "<br /><span class='timestamp'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></span>";

 

 		    if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {

@@ -56,18 +56,18 @@
 	                	// display the delete link to those allowed to delete

 	                	$info .= "<br /><span class=\"delete_discussion\">" . elgg_view("output/confirmlink", array(

 	                																'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,

-	                																'text' => elgg_echo('delete'),

+	                																'text' => " ",

 	                																'confirm' => elgg_echo('deleteconfirm'),

 	                															)) . "</span>";

 	                				

 	           }		

 		

-		$info .= "</p>";

+		$info .= "</span>";

 		

 	    //get the user avatar

 		$icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'small'));

 	    $info .= "<p>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";

-

+		$info .= "<div class='clearfloat'></div>";

 		

 	}