diff options
author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-03 05:27:47 +0000 |
---|---|---|
committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-03 05:27:47 +0000 |
commit | 5170cc2b677a9d521dbc2176c6bb1f25efbbc785 (patch) | |
tree | 05233623823df1dda4ee9202fb3b11215a281ee7 /mod/messages | |
parent | 037148770b5bc8c8682d8c992f9fbf490d608a48 (diff) | |
download | elgg-5170cc2b677a9d521dbc2176c6bb1f25efbbc785.tar.gz elgg-5170cc2b677a9d521dbc2176c6bb1f25efbbc785.tar.bz2 |
Fixes #2440: Converted clearfloat to clearfix, brought back orig clearfloat
git-svn-id: http://code.elgg.org/elgg/trunk@7223 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/messages')
-rw-r--r-- | mod/messages/views/default/messages/forms/send.php | 2 | ||||
-rw-r--r-- | mod/messages/views/default/messages/messages.php | 6 | ||||
-rw-r--r-- | mod/messages/views/default/messages/view.php | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php index a2d373549..c77931454 100644 --- a/mod/messages/views/default/messages/forms/send.php +++ b/mod/messages/views/default/messages/forms/send.php @@ -31,7 +31,7 @@ unset($_SESSION['msg_contents']); //get the user object $user = get_user($send_to); - echo "<div class='entity_listing messages clearfloat'><div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>"; + echo "<div class='entity_listing messages clearfix'><div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>"; //draw it echo "<div class='entity_listing_info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>"; diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php index 9eeaa9ef4..4d593a621 100644 --- a/mod/messages/views/default/messages/messages.php +++ b/mod/messages/views/default/messages/messages.php @@ -41,7 +41,7 @@ if (isloggedin()) echo elgg_view('navigation/breadcrumbs'); ?> <!-- display the content header block --> - <div id="content_header" class="clearfloat"> + <div id="content_header" class="clearfix"> <div class="content_header_title"><h2><?php echo $vars['entity']->title; ?></h2></div> <div class="content_header_options"> <a class="action_button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a> @@ -55,7 +55,7 @@ if (isloggedin()) </div> </div> - <div class="entity_listing messages clearfloat"> + <div class="entity_listing messages clearfix"> <?php // we need a different user icon and name depending on whether the user is reading the message // from their inbox or sentbox. If it is the inbox, then the icon and name will be the person who sent @@ -77,7 +77,7 @@ if (isloggedin()) </div> </div> - <div class="messagebody margin_top clearfloat"> + <div class="messagebody margin_top clearfix"> <?php // if the message is a reply, display the message the reply was for // @todo I need to figure out how to get the description out using -> (anyone?) diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php index 13f6fec82..65091689a 100644 --- a/mod/messages/views/default/messages/view.php +++ b/mod/messages/views/default/messages/view.php @@ -28,9 +28,9 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { if($message->hiddenFrom != 1){ // check to see if the message has been read, if so, set the correct container class if($message->readYet == 1){ - echo "<div class='message read clearfloat'>"; + echo "<div class='message read clearfix'>"; }else{ - echo "<div class='message notread clearfloat'>"; + echo "<div class='message notread clearfix'>"; } // get the icon of the user who owns the message $from = get_entity($message->fromId); @@ -68,7 +68,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { //get the correct user entity $user = get_entity($message->toId); - echo "<div class='message sent clearfloat'>"; + echo "<div class='message sent clearfix'>"; //get the icon for the user the message was sent to echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>"; echo "<div class='entity_listing_info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>"; |