From 5170cc2b677a9d521dbc2176c6bb1f25efbbc785 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Nov 2010 05:27:47 +0000
Subject: 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
---
 views/default/account/forms/login_walled_garden.php      |  8 ++++----
 views/default/admin/plugins/advanced.php                 |  2 +-
 views/default/admin/plugins/simple.php                   |  2 +-
 views/default/annotation/generic_comment.php             |  2 +-
 views/default/annotation/latest_comments.php             |  2 +-
 views/default/annotation/likes.php                       |  2 +-
 views/default/canvas/layouts/administration.php          |  8 ++++----
 views/default/canvas/layouts/one_column.php              |  4 ++--
 views/default/canvas/layouts/one_column_with_sidebar.php |  4 ++--
 views/default/css.php                                    | 15 ++++++---------
 views/default/css_ie.php                                 |  4 ++--
 views/default/entities/entity_listing.php                |  2 +-
 views/default/entities/gallery_listing.php               |  2 +-
 views/default/friends/picker.php                         |  2 +-
 views/default/likes/forms/edit.php                       |  2 +-
 views/default/navigation/pagination.php                  |  2 +-
 views/default/navigation/site_nav.php                    |  2 +-
 views/default/output/rss_view.php                        |  2 +-
 views/default/page_elements/content_header.php           |  2 +-
 views/default/page_elements/content_header_member.php    |  2 +-
 views/default/page_elements/elgg_footer.php              |  2 +-
 views/default/page_elements/elgg_topbar.php              |  2 +-
 views/default/page_elements/owner_block.php              |  6 +++---
 views/default/page_shells/walled_garden.php              |  8 ++++----
 24 files changed, 43 insertions(+), 46 deletions(-)

(limited to 'views')

diff --git a/views/default/account/forms/login_walled_garden.php b/views/default/account/forms/login_walled_garden.php
index 4bfc3afda..8f0faefe8 100644
--- a/views/default/account/forms/login_walled_garden.php
+++ b/views/default/account/forms/login_walled_garden.php
@@ -39,8 +39,8 @@ if ($CONFIG->allow_registration) {
 	));
 
 	echo <<<__HTML
-<div id="registration_form" class="hidden clearfloat">
-<div id="hiddenform_body" class="clearfloat">
+<div id="registration_form" class="hidden clearfix">
+<div id="hiddenform_body" class="clearfix">
 	<h2>$title</h2>
 	$body
 </div><div id="hiddenform_bottom"></div></div>
@@ -55,8 +55,8 @@ __HTML;
 	$lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='action_button disabled cancel_request' type='reset' value='Cancel'></p>";
 	
 	?>
-<div id="lostpassword_form" class="hidden clearfloat">
-	<div id="hiddenform_body" class="clearfloat">
+<div id="lostpassword_form" class="hidden clearfix">
+	<div id="hiddenform_body" class="clearfix">
 		<h2><?php echo elgg_echo('user:password:lost'); ?></h2>
 		<?php
 			echo elgg_view('input/form', array(
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 9aae4a05b..306ddfd7f 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -67,7 +67,7 @@ $buttons .= $category_form;
 
 // construct page header
 ?>
-<div id="content_header" class="clearfloat">
+<div id="content_header" class="clearfix">
 	<div class="content_header_title"><?php echo $title ?></div>
 	<div class="content_header_options"><?php echo $buttons ?></div>
 </div>
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
index 846dde9d4..017c6e7fe 100644
--- a/views/default/admin/plugins/simple.php
+++ b/views/default/admin/plugins/simple.php
@@ -25,7 +25,7 @@ foreach ($installed_plugins as $installed_name => $plugin) {
 
 ksort($plugin_list);
 $form_body  .= <<<___END
-	<div id="content_header" class="clearfloat">
+	<div id="content_header" class="clearfix">
 		<div class="content_header_title">$title</div>
 	</div>
 	<ul class="admin_plugins margin_top">
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 492c04eab..b2487e1ef 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -7,7 +7,7 @@ $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
 <a class="anchor_link" name="comment_<?php echo $vars['annotation']->id; ?>"></a>
-<div class="generic_comment clearfloat">
+<div class="generic_comment clearfix">
 	<div class="generic_comment_icon">
 		<?php
 			echo elgg_view("profile/icon", array(
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 43f44f43b..8e1f3e81b 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -28,7 +28,7 @@ if($vars['comments']){
 			$url_display = $objecttitle;
 		}
 	
-		echo "<div class='generic_comment latest clearfloat'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+		echo "<div class='generic_comment latest clearfix'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
 		echo "<div class='generic_comment_details'><span class='entity_subtext'><a href=\"".elgg_get_site_url()."pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity_title'>{$url_display}</span> ({$friendlytime})</span></div>";
 		echo "</div>";
 	
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 8b6be9220..cfa7e47e0 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -6,7 +6,7 @@
 $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
-<div class="elgg_likes_user clearfloat">
+<div class="elgg_likes_user clearfix">
 	<div class="entity_listing_icon">
 		<?php
 			echo elgg_view("profile/icon", array(
diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php
index 335fb55e5..c8d8e31e4 100644
--- a/views/default/canvas/layouts/administration.php
+++ b/views/default/canvas/layouts/administration.php
@@ -165,7 +165,7 @@ h2 {
 	border-bottom:1px solid #CCCCCC;
 	padding-bottom:5px;
 }
-.clearfloat:after {
+.clearfix:after {
 	content: ".";
 	display: block;
 	height: 0;
@@ -882,14 +882,14 @@ ul.admin_plugins {
 	</h2></span>
 </div>
 
-<div id="elgg_content" class="clearfloat admin_area">
+<div id="elgg_content" class="clearfix admin_area">
 	
-	<div id="elgg_page_contents" class="clearfloat">
+	<div id="elgg_page_contents" class="clearfix">
 		<?php 
 			if (isset($vars['area1'])) echo $vars['area1'];
 		?>
 	</div>
-	<div id="elgg_sidebar" class="clearfloat">
+	<div id="elgg_sidebar" class="clearfix">
 		<?php
 			echo elgg_view('page_elements/elgg_sidebar', $vars);
 		?>
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index e9c2cb113..67366efc6 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -6,8 +6,8 @@
  * @subpackage Core
  */
 ?>
-<div id="elgg_content" class="clearfloat">
-	<div id="elgg_page_contents" class="clearfloat one_column">
+<div id="elgg_content" class="clearfix">
+	<div id="elgg_page_contents" class="clearfix one_column">
 		<?php echo $vars['area1']; ?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php
index b7efee4d0..5b6207a92 100644
--- a/views/default/canvas/layouts/one_column_with_sidebar.php
+++ b/views/default/canvas/layouts/one_column_with_sidebar.php
@@ -6,14 +6,14 @@
  * @subpackage Core
  */
 ?>
-<div id="elgg_content" class="clearfloat sidebar">
+<div id="elgg_content" class="clearfix sidebar">
 	<div id="elgg_sidebar">
 		<?php
 			echo elgg_view('page_elements/elgg_sidebar', $vars);
 		?>
 	</div>
 	
-	<div id="elgg_page_contents" class="clearfloat">
+	<div id="elgg_page_contents" class="clearfix">
 		<?php 
 			if (isset($vars['area1'])) {
 				echo $vars['area1'];
diff --git a/views/default/css.php b/views/default/css.php
index 076bfdb62..c442081a2 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1,7 +1,6 @@
 /**
  * ELGG DEFAULT CSS
- * @uses $vars['wwwroot'] The site URL
-*/
+ */
 
 /* Table of Contents:
 
@@ -192,13 +191,11 @@ h2 {
 	border-bottom:1px solid #CCCCCC;
 	padding-bottom:5px;
 }
-.clearfloat:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
+
+/* Float-related */
+.clearfix:after {content:"."; display:block; height:0; clear:both; visibility:hidden;}
+.clearfloat {clear:both;}
+
 .link {
 	cursor:pointer;
 }
diff --git a/views/default/css_ie.php b/views/default/css_ie.php
index 3e0c91c40..e07fddf47 100644
--- a/views/default/css_ie.php
+++ b/views/default/css_ie.php
@@ -10,8 +10,8 @@
 .navigation li a:hover ul li a {display:block;}
 .navigation li.navigation_more ul li a {width:150px;background-color: #dedede;}
 
-.clearfloat { display: block; }
-.hidden.clearfloat { display: none; }
+.clearfix { display: block; }
+.hidden.clearfix { display: none; }
 #elgg_page_contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
 #breadcrumbs {top:-2px; margin-bottom: 5px;}
 
diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php
index 6e0d9c0f8..e547bbc68 100644
--- a/views/default/entities/entity_listing.php
+++ b/views/default/entities/entity_listing.php
@@ -9,7 +9,7 @@
  * @uses string $vars['info'] Info about the entity.
  */
 ?>
-<div class="entity_listing clearfloat">
+<div class="entity_listing clearfix">
 	<div class="entity_listing_icon">
 		<?php echo $vars['icon']; ?>
 	</div>
diff --git a/views/default/entities/gallery_listing.php b/views/default/entities/gallery_listing.php
index 897509b0a..58fa5e26b 100644
--- a/views/default/entities/gallery_listing.php
+++ b/views/default/entities/gallery_listing.php
@@ -11,7 +11,7 @@
 
 ?>
 
-<div class="gallery_listing clearfloat">
+<div class="gallery_listing clearfix">
 	<div class="gallery_listing_icon">
 		<?php echo $vars['icon']; ?>
 	</div>
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 34a02d086..9e1d556f6 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -259,7 +259,7 @@ if ($formtarget) {
 		echo $vars['formcontents'];
 
 ?>
-	<div class="clearfloat"></div>
+	<div class="clearfix"></div>
 	<div class="friendspicker_savebuttons">
 		<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
 		<input type="button" class="cancel_button" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index d438ff3be..96092d118 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -32,7 +32,7 @@ if (isset($vars['entity']) && isloggedin()) {
 		echo "<a class='likes_list_button link {$likes_classname}' {$likes_titletag}>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
 
 		//show the users who liked the object
-		echo "<div class='likes_list hidden clearfloat'>";
+		echo "<div class='likes_list hidden clearfix'>";
 		echo list_annotations($vars['entity']->getGUID(), 'likes', 99);
 		echo "</div>";	
 	}
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 846598d1b..de401eae4 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -29,7 +29,7 @@ if (($count > $limit || $offset > 0) && elgg_get_context() != 'widget') {
 
 	?>
 
-	<div class="pagination clearfloat">
+	<div class="pagination clearfix">
 	<?php
 
 	if ($offset > 0) {
diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
index a7f31c5f9..325f5a18b 100644
--- a/views/default/navigation/site_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -75,7 +75,7 @@ if ($more_nav_html) {
 // only display, if there are nav items to display
 if ($nav_html) {
 	echo <<<___END
-	<div id="elgg_main_nav" class="clearfloat">
+	<div id="elgg_main_nav" class="clearfix">
 		<ul class="navigation">
 			$nav_html
 		</ul>
diff --git a/views/default/output/rss_view.php b/views/default/output/rss_view.php
index 725f1619a..0e45ce1df 100644
--- a/views/default/output/rss_view.php
+++ b/views/default/output/rss_view.php
@@ -4,4 +4,4 @@
 	 * @todo check this - it doesn't appear this view is ever called
 	 **/
 ?>
-<div class="rss_link clearfloat"><a href="" title="RSS feed for the wire">RSS feed for the wire</a></div>
\ No newline at end of file
+<div class="rss_link clearfix"><a href="" title="RSS feed for the wire">RSS feed for the wire</a></div>
\ No newline at end of file
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 12e4eec44..4d382b9f5 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -86,7 +86,7 @@ if (isloggedin()) {
 }
 
 echo <<<HTML
-<div id="content_header" class="clearfloat">
+<div id="content_header" class="clearfix">
 	$title $new_button
 </div>
 HTML;
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
index 82909e1b5..3d4a0f853 100644
--- a/views/default/page_elements/content_header_member.php
+++ b/views/default/page_elements/content_header_member.php
@@ -18,7 +18,7 @@ $title = elgg_echo($type);
 $title = $name . "'s " . $type;
 ?>
 
-<div id="content_header" class="clearfloat">
+<div id="content_header" class="clearfix">
 	<?php echo '<div class="content_header_title">' . elgg_view_title($title) . '</div>'; ?>
 </div>
 
diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php
index 6d6fd8965..93aac4d96 100644
--- a/views/default/page_elements/elgg_footer.php
+++ b/views/default/page_elements/elgg_footer.php
@@ -10,7 +10,7 @@
 
 ?>
 <div id="elgg_footer">
-	<div id="elgg_footer_contents" class="clearfloat">
+	<div id="elgg_footer_contents" class="clearfix">
 		<?php echo elgg_view('footer/links'); ?>
 		<a href="http://www.elgg.org" class="powered_by_elgg_badge">
 			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 4908625e4..3530cf197 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -6,7 +6,7 @@
 
 $user = get_loggedin_user();
 if (($user instanceof ElggUser) && ($user->guid > 0)) {
-	echo '<div id="elgg_topbar" class="clearfloat">';
+	echo '<div id="elgg_topbar" class="clearfix">';
 	echo '<div id="elgg_topbar_contents">';
 	
 	// Elgg logo
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 45e4f70af..ab1344b21 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -22,7 +22,7 @@ if (isset($autofeed) && $autofeed == true) {
 	$url = elgg_format_url($url);
 	$label = elgg_echo('feed:rss');
 	$contents .= <<<END
-	<div class="rss_link clearfloat"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
+	<div class="rss_link clearfix"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
 END;
 }
 
@@ -35,7 +35,7 @@ if(is_plugin_enabled('profile')) {
 		$icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
 		$owner_url = $owner->getURL();
 		$display = "<div class='owner_block_icon'>$icon</div>";
-		$display .= '<div class="owner_block_contents clearfloat">';
+		$display .= '<div class="owner_block_contents clearfix">';
 		$display .= "<h3><a href=\"$owner_url\">{$owner->name}</a></h3>";
 
 		if ($owner->briefdescription) {
@@ -67,7 +67,7 @@ if(is_plugin_enabled('profile')) {
 		// Allow plugins to extend the owner block contents
 		$display .= elgg_view('owner_block/profile_extend');
 
-		$contents .= "<div id='owner_block' class='clearfloat'>$display</div>";
+		$contents .= "<div id='owner_block' class='clearfix'>$display</div>";
 	}
 }
 
diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php
index 4f88501d9..0da1aeb67 100644
--- a/views/default/page_shells/walled_garden.php
+++ b/views/default/page_shells/walled_garden.php
@@ -269,10 +269,10 @@ body {background: white;}
 <?php
 $view = elgg_view('messages/list', array('object' => $vars['sysmessages']));
 
-echo "<div id='walledgarden_sysmessages' class='clearfloat'>$view</div>";       
-echo '<div id="walledgarden_container"><div id="walledgarden" class="clearfloat">';
-echo "<div class=\"walledgardenintro clearfloat\"><h1>Welcome to:<br />$title</h1></div>";
-echo "<div class=\"walledgardenlogin clearfloat\">{$vars['body']}</div>";
+echo "<div id='walledgarden_sysmessages' class='clearfix'>$view</div>";       
+echo '<div id="walledgarden_container"><div id="walledgarden" class="clearfix">';
+echo "<div class=\"walledgardenintro clearfix\"><h1>Welcome to:<br />$title</h1></div>";
+echo "<div class=\"walledgardenlogin clearfix\">{$vars['body']}</div>";
 echo '</div>';
 echo '<div id="walledgarden_bottom"></div>';
 echo '</div>';
-- 
cgit v1.2.3