diff options
63 files changed, 98 insertions, 101 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 0075c9baa..7533b2af0 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1328,7 +1328,7 @@ function registration_page_handler($page_elements) { function elgg_user_login_page_handler() { $content = elgg_view_layout('one_column', elgg_view('account/forms/login')); $content = ' - <div id="elgg_content" class="clearfloat"> + <div id="elgg_content" class="clearfix"> ' . elgg_view('account/forms/login') . ' </div> '; diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index b93608b7e..eaf25d726 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -75,11 +75,11 @@ if ($blog->canEdit()) { if ($full) { echo <<<___END -<div class="blogpost clearfloat"> - <div id="content_header" class="clearfloat"> +<div class="blogpost clearfix"> + <div id="content_header" class="clearfix"> <div class="content_header_title"><h2>{$blog->title}</h2></div> </div> - <div class="clearfloat"> + <div class="clearfix"> <div class="entity_listing_icon"> $owner_icon </div> @@ -101,7 +101,7 @@ ___END; } else { echo <<<___END -<div class="blog $status_class entity_listing clearfloat"> +<div class="blog $status_class entity_listing clearfix"> <div class="entity_listing_icon"> $owner_icon </div> diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php index 59619d587..83d6c97ea 100755 --- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php +++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php @@ -26,7 +26,7 @@ if($bookmarks){ $info .= "<p class='entity_subtext'>{$friendlytime}</p>"; $info .= "</div>"; //display - echo "<div class='entity_listing clearfloat'>" . $info . "</div>"; + echo "<div class='entity_listing clearfix'>" . $info . "</div>"; } } else { $create_bookmark = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner()->username . "/add"; diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php index cfe9fccf5..5c46dfad4 100644 --- a/mod/ecml/views/default/embed/web_services/content.php +++ b/mod/ecml/views/default/embed/web_services/content.php @@ -15,7 +15,7 @@ $keywords = ecml_get_keywords(); elgg_sort_3d_array_by_value($keywords, 'name'); $keyword_js_array = array(); -$keywords_html = "<ul class='ecml_web_service_list clearfloat'>"; +$keywords_html = "<ul class='ecml_web_service_list clearfix'>"; // include support for standard ECML so you can get previews and validation. //$keyword_html = '<li class="ecml_web_service"><a class="ecml">Generic ECML</a></li>'; diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php index 1f287b938..bf306b4e7 100644 --- a/mod/embed/views/default/object/file/embedlist.php +++ b/mod/embed/views/default/object/file/embedlist.php @@ -7,7 +7,7 @@ $icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . "</a>"; ?> <div id="embed_entity_<?php echo $file->guid; ?>"> - <div class="entity_listing clearfloat"> + <div class="entity_listing clearfix"> <div class="entity_listing_icon"> <?php echo $icon; ?> </div> diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php index 23b087c31..745c5f053 100644 --- a/mod/file/views/default/file/groupprofile_files.php +++ b/mod/file/views/default/file/groupprofile_files.php @@ -30,7 +30,7 @@ foreach($files as $f){ $mime = $f->mimetype; - echo "<div class='entity_listing clearfloat'>"; + echo "<div class='entity_listing clearfix'>"; echo "<div class='entity_listing_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>"; echo "<div class='entity_listing_info'>"; echo "<p class='entity_title'>" . $f->title . "</p>"; diff --git a/mod/file/views/default/widgets/filerepo/view.php b/mod/file/views/default/widgets/filerepo/view.php index aac2c4012..09c29a3ce 100644 --- a/mod/file/views/default/widgets/filerepo/view.php +++ b/mod/file/views/default/widgets/filerepo/view.php @@ -45,7 +45,7 @@ foreach($files as $f){ $mime = $f->mimetype; - echo "<div class='filerepo_widget_singleitem clearfloat'>"; + echo "<div class='filerepo_widget_singleitem clearfix'>"; echo "<div class='filerepo_listview_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>"; echo "<div class='filerepo_widget_content'>"; echo "<div class='filerepo_listview_title'><p class='filerepo_title'>" . $f->title . "</p></div>"; diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php index 61b6c49fd..fc4dd3b32 100644 --- a/mod/groups/views/default/forum/maintopic.php +++ b/mod/groups/views/default/forum/maintopic.php @@ -13,7 +13,7 @@ ?>
-<div class="entity_listing topic clearfloat">
+<div class="entity_listing topic clearfix">
<a class="anchor_link" name="<?php echo $vars['entity']->id; ?>"></a>
<?php
// get infomation about the owner of the comment
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php index ea6431037..beab468a3 100644 --- a/mod/groups/views/default/forum/topics.php +++ b/mod/groups/views/default/forum/topics.php @@ -4,7 +4,7 @@ */ ?> -<div id="content_header" class="clearfloat"> +<div id="content_header" class="clearfix"> <div class="content_header_title"> <h2><?php echo elgg_echo("groups:forum"); ?></h2> </div> diff --git a/mod/groups/views/default/groups/featured.php b/mod/groups/views/default/groups/featured.php index e811642f8..580f1ca0f 100644 --- a/mod/groups/views/default/groups/featured.php +++ b/mod/groups/views/default/groups/featured.php @@ -18,7 +18,7 @@ 'size' => 'tiny', )); - echo "<div class='featured_group'>".$icon."<p class='entity_title clearfloat'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>"; + echo "<div class='featured_group'>".$icon."<p class='entity_title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>"; echo "<p class='entity_subtext'>" . $group->briefdescription . "</p></div>"; } } diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php index ed4e41c0d..d78a47456 100644 --- a/mod/groups/views/default/groups/forum_latest.php +++ b/mod/groups/views/default/groups/forum_latest.php @@ -16,7 +16,7 @@ if($vars['entity']->forum_enable != 'no'){ $count_annotations = $f->countAnnotations("generic_comment"); - echo "<div class='entity_listing clearfloat'>"; + echo "<div class='entity_listing clearfix'>"; echo "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>"; echo "<div class='entity_listing_info'><p class='entity_title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>"; echo "<p class='entity_subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>"; diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php index 9d8aae8fc..0bf980a96 100644 --- a/mod/groups/views/default/groups/groupprofile.php +++ b/mod/groups/views/default/groups/groupprofile.php @@ -61,7 +61,7 @@ echo elgg_view('navigation/breadcrumbs'); // build and display header echo <<<__HTML -<div id="content_header" class="clearfloat"> +<div id="content_header" class="clearfix"> <div class="content_header_title"> <h2>{$vars['entity']->name}</h2> </div> @@ -70,7 +70,7 @@ echo <<<__HTML __HTML; ?> -<div class="group_profile clearfloat"> +<div class="group_profile clearfix"> <div class="group_profile_column icon"> <div class="group_profile_icon"> <?php diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index c905cf8f7..cf84a6ab0 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -6,7 +6,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) { if ($group instanceof ElggGroup) { ?> - <div class="entity_listing group_invitations clearfloat"> + <div class="entity_listing group_invitations clearfix"> <?php echo "<div class='entity_listing_icon'>"; echo elgg_view("profile/icon", array( diff --git a/mod/groups/views/default/groups/members.php b/mod/groups/views/default/groups/members.php index eaf469cd7..4738edf28 100644 --- a/mod/groups/views/default/groups/members.php +++ b/mod/groups/views/default/groups/members.php @@ -9,7 +9,7 @@ //var_export($vars['entity']); ?> -<div id="group_members" class="clearfloat"> +<div id="group_members" class="clearfix"> <h3><?php echo elgg_echo("groups:members"); ?></h3> <?php diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php index dbd65a667..9a5163b1d 100644 --- a/mod/groups/views/default/groups/membershiprequests.php +++ b/mod/groups/views/default/groups/membershiprequests.php @@ -6,7 +6,7 @@ if ($request instanceof ElggUser) { ?> - <div class="entity_listing group_invitations clearfloat"> + <div class="entity_listing group_invitations clearfix"> <?php echo "<div class='entity_listing_icon'>"; echo elgg_view("profile/icon", array( diff --git a/mod/groups/views/default/groups/profileitems.php b/mod/groups/views/default/groups/profileitems.php index 7191cf6d1..6f5fa32ce 100644 --- a/mod/groups/views/default/groups/profileitems.php +++ b/mod/groups/views/default/groups/profileitems.php @@ -6,15 +6,15 @@ */ // tools widget area -echo "<div id='group_tools_latest' class='clearfloat'>"; +echo "<div id='group_tools_latest' class='clearfix'>"; // activity latest - echo "<div class='group_tool_widget activity clearfloat'>"; + echo "<div class='group_tool_widget activity clearfix'>"; echo elgg_view("groups/activity_latest",array('entity' => $vars['entity'])); echo "</div>"; // forum latest - echo "<div class='group_tool_widget forum clearfloat'>"; + echo "<div class='group_tool_widget forum clearfix'>"; echo elgg_view("groups/forum_latest",array('entity' => $vars['entity'])); echo "</div>"; diff --git a/mod/groups/views/default/widgets/a_users_groups/view.php b/mod/groups/views/default/widgets/a_users_groups/view.php index ec74443ff..462ac419c 100644 --- a/mod/groups/views/default/widgets/a_users_groups/view.php +++ b/mod/groups/views/default/widgets/a_users_groups/view.php @@ -45,7 +45,7 @@ if ($groups) { $group->briefdescription </p> </div> - <div class="clearfloat"></div> + <div class="clearfix"></div> </div> ___END; diff --git a/mod/logbrowser/views/default/admin/overview/logbrowser.php b/mod/logbrowser/views/default/admin/overview/logbrowser.php index d3b5f13be..5ff3df096 100644 --- a/mod/logbrowser/views/default/admin/overview/logbrowser.php +++ b/mod/logbrowser/views/default/admin/overview/logbrowser.php @@ -58,7 +58,7 @@ $list = elgg_view_entity_list($log_entries, $count, $offset, $limit, false, fals $body = <<<__HTML $title $form -<div class="admin_settings log_browser radius8 clearfloat"> +<div class="admin_settings log_browser radius8 clearfix"> $list </div> __HTML; 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>"; diff --git a/mod/profile/views/default/profile/admin_menu.php b/mod/profile/views/default/profile/admin_menu.php index 434da5a74..99ed3a4f5 100755 --- a/mod/profile/views/default/profile/admin_menu.php +++ b/mod/profile/views/default/profile/admin_menu.php @@ -12,7 +12,7 @@ if (isadminloggedin()){ $token = generate_action_token($ts); ?> -<div class="owner_block_links clearfloat"> +<div class="owner_block_links clearfix"> <ul class="admin_menu"> <li><a href="#" onclick="elgg_slide_toggle(this,'.owner_block_links','.admin_menu_options');">Admin options…</a> diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php index c334e33d8..15cb2584e 100644 --- a/mod/profile/views/default/profile/commentwall/commentwall_content.php +++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php @@ -3,7 +3,7 @@ * Elgg Message board individual item display page */ ?> -<div class="entity_listing clearfloat"> +<div class="entity_listing clearfix"> <!-- display the user icon of the user that posted the message --> <div class="entity_listing_icon"> <?php diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php index f80f54cc2..fd3ff6b11 100755 --- a/mod/profile/views/default/profile/profile_ownerblock.php +++ b/mod/profile/views/default/profile/profile_ownerblock.php @@ -29,7 +29,7 @@ if ($section == 'details') { $icon_class = "large"; } else { $icon = elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); - $more_info = "<div class='owner_block_contents clearfloat'>"; + $more_info = "<div class='owner_block_contents clearfix'>"; $more_info .= "<h3><a href='{$url}'>{$user->name}</a></h3>"; $more_info .= "<p class='profile_info briefdescription'>{$user->briefdescription}</p>"; $more_info .= "<p class='profile_info location'>{$location}</p>"; @@ -37,7 +37,7 @@ if ($section == 'details') { } $profile_actions = ""; if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { - $profile_actions = "<div class='clearfloat profile_actions'>"; + $profile_actions = "<div class='clearfix profile_actions'>"; $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/details' class='action_button'>". elgg_echo('profile:edit') ."</a>"; $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/icon' class='action_button'>". elgg_echo('profile:editicon') ."</a>"; $profile_actions .= "</div>"; diff --git a/mod/reportedcontent/views/default/reportedcontent/listing.php b/mod/reportedcontent/views/default/reportedcontent/listing.php index 1004effc9..4236894c2 100644 --- a/mod/reportedcontent/views/default/reportedcontent/listing.php +++ b/mod/reportedcontent/views/default/reportedcontent/listing.php @@ -24,7 +24,7 @@ if($vars['entity']){ } echo "<div class='admin_settings reported_content {$reportedcontent_background}'>"; - echo "<div class='clearfloat controls'>"; + echo "<div class='clearfix controls'>"; if($report->state != 'archived') echo "<a class='action_button' href=\"" . elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/reportedcontent/archive?item={$report->guid}") . "\">" . elgg_echo('reportedcontent:archive') . "</a>"; echo "<a class='action_button disabled' href=\"" . elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/reportedcontent/delete?item={$report->guid}") . "\" onclick=\"return confirm('" . elgg_echo('reportedcontent:areyousure') . "')\">" . elgg_echo('reportedcontent:delete') . "</a></div>"; diff --git a/mod/riverdashboard/endpoint/get_comments.php b/mod/riverdashboard/endpoint/get_comments.php index cc210b126..22d89bcfd 100644 --- a/mod/riverdashboard/endpoint/get_comments.php +++ b/mod/riverdashboard/endpoint/get_comments.php @@ -25,7 +25,7 @@ foreach ($comments as $comment) { $comment_owner_url = $comment_owner->getURL(); //display comment - echo "<div class='river_comment clearfloat'>"; + echo "<div class='river_comment clearfix'>"; echo "<span class='river_comment_owner_icon'>"; echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); echo "</span>"; diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php index e980f5dbd..a0f547e45 100644 --- a/mod/riverdashboard/views/default/river/item/list.php +++ b/mod/riverdashboard/views/default/river/item/list.php @@ -48,7 +48,7 @@ if ($vars['pagination'] !== false) { } if (!empty($nav)) { - echo '<div class="pagination clearfloat">'.$nav.'</div>'; + echo '<div class="pagination clearfix">'.$nav.'</div>'; } } diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index cd474df2a..98c240de5 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -46,7 +46,7 @@ if ($comment_count < 3) { <?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?> </span> - <div class="river_item_contents clearfloat"> + <div class="river_item_contents clearfix"> <?php // body contents, generated by the river view in each plugin @@ -56,7 +56,7 @@ echo $vars['body']; if ($comments){ $counter = 0; - echo "<div class='river_comments_tabs clearfloat'>"; + echo "<div class='river_comments_tabs clearfix'>"; echo "<a class='river_more_comments show_comments_button link'>" . elgg_echo('comments') . '</a>'; if ($likes_count != 0) { @@ -95,7 +95,7 @@ if ($comments){ $alt = 'penultimate'; } //display comment - echo "<div class='river_comment $alt clearfloat'>"; + echo "<div class='river_comment $alt clearfix'>"; echo "<span class='river_comment_owner_icon'>"; echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); echo "</span>"; @@ -115,7 +115,7 @@ if ($comments){ } else { // tab bar nav - for users that liked object if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "<div class='river_comments_tabs clearfloat'>"; + echo "<div class='river_comments_tabs clearfix'>"; } if ($likes_count != 0) { diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php index 384beef4d..60568642a 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php +++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php @@ -12,7 +12,7 @@ echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));
?>
</span>
- <div class="river_item_contents clearfloat">
+ <div class="river_item_contents clearfix">
<?php
echo $vars['body'];
?>
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php index f5e016b47..820ebb5ae 100644 --- a/mod/riverdashboard/views/default/riverdashboard/nav.php +++ b/mod/riverdashboard/views/default/riverdashboard/nav.php @@ -54,4 +54,4 @@ switch($vars['orient']) { ?> <input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" /> </div> -<div id="riverdashboard_updates" class="clearfloat"></div> +<div id="riverdashboard_updates" class="clearfix"></div> diff --git a/mod/search/views/default/search/comments/entity.php b/mod/search/views/default/search/comments/entity.php index 279d7a94f..008455242 100644 --- a/mod/search/views/default/search/comments/entity.php +++ b/mod/search/views/default/search/comments/entity.php @@ -45,7 +45,7 @@ $tc = $entity->getVolatileData('search_matched_comment_time_created');; $time = elgg_view_friendly_time($tc); echo <<<___END - <div class="search_listing clearfloat"> + <div class="search_listing clearfix"> <div class="search_listing_icon">$icon</div> <div class="search_listing_info"> <p class="entity_title">$title</p>$description diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php index 917ebe9d7..e008da10d 100644 --- a/mod/search/views/default/search/entity.php +++ b/mod/search/views/default/search/entity.php @@ -53,7 +53,7 @@ if (!$time) { $time = elgg_view_friendly_time(($tu > $tc) ? $tu : $tc); } ?> - <div class="search_listing clearfloat"> + <div class="search_listing clearfix"> <div class="search_listing_icon"><?php echo $icon; ?></div> <div class="search_listing_info"> <p class="entity_title"><?php echo $title; ?></p> diff --git a/mod/sitepages/views/default/canvas/layouts/frontpage.php b/mod/sitepages/views/default/canvas/layouts/frontpage.php index 04ae75504..00e978492 100644 --- a/mod/sitepages/views/default/canvas/layouts/frontpage.php +++ b/mod/sitepages/views/default/canvas/layouts/frontpage.php @@ -1,7 +1,7 @@ <?php
?>
-<div id="elgg_content" class="clearfloat">
+<div id="elgg_content" class="clearfix">
<div id="elgg_sidebar" class="frontpage">
<?php
if (isset($vars['area2'])) echo $vars['area2'];
@@ -9,7 +9,7 @@ ?>
</div>
- <div id="elgg_page_contents" class="frontpage clearfloat">
+ <div id="elgg_page_contents" class="frontpage clearfix">
<?php
if (isset($vars['area1'])) echo $vars['area1'];
?>
diff --git a/mod/sitepages/views/default/sitepages/members.php b/mod/sitepages/views/default/sitepages/members.php index 1a9513e54..73a010332 100644 --- a/mod/sitepages/views/default/sitepages/members.php +++ b/mod/sitepages/views/default/sitepages/members.php @@ -1,4 +1,4 @@ -<div class="sidebar_container clearfloat">
+<div class="sidebar_container clearfix">
<?php
$newest_members = $vars['members'];
?>
diff --git a/mod/sitepages/views/default/sitepages/sidebar.php b/mod/sitepages/views/default/sitepages/sidebar.php index aacbc43ac..8326a3087 100644 --- a/mod/sitepages/views/default/sitepages/sidebar.php +++ b/mod/sitepages/views/default/sitepages/sidebar.php @@ -8,6 +8,6 @@ $sidebartitle = $sitepages_object->sidebartitle; $sidebarmessage = $sitepages_object->sidebarmessage;
if($sidebarmessage){
- echo "<div class='sidebar_container clearfloat'><h3>" . $sidebartitle . "</h3>";
+ echo "<div class='sidebar_container clearfix'><h3>" . $sidebartitle . "</h3>";
echo $sidebarmessage ."</div>";
}
\ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/welcome.php b/mod/sitepages/views/default/sitepages/welcome.php index 471b50490..584dd1c0b 100644 --- a/mod/sitepages/views/default/sitepages/welcome.php +++ b/mod/sitepages/views/default/sitepages/welcome.php @@ -8,6 +8,6 @@ $welcometitle = $sitepages_object->welcometitle; $welcomemessage = $sitepages_object->welcomemessage;
if($welcomemessage){
- echo "<div class='sitepages_welcome clearfloat'><h2>" . $welcometitle . "</h2>";
- echo "<div class='sitepages_message clearfloat'>".$welcomemessage."</div></div>";
+ echo "<div class='sitepages_welcome clearfix'><h2>" . $welcometitle . "</h2>";
+ echo "<div class='sitepages_message clearfix'>".$welcomemessage."</div></div>";
}
\ No newline at end of file diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 9e59596ac..4ef51cae6 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -18,7 +18,7 @@ if (isset($vars['entity'])) { $note_owner = elgg_echo("thewire:notedeleted"); ?> <div class="wire_post"> - <div class="wire_post_contents clearfloat radius8"> + <div class="wire_post_contents clearfix radius8"> <div class="wire_post_icon"> <?php diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php index 5e29549e2..536ec6ee2 100644 --- a/mod/thewire/views/default/thewire/forms/add.php +++ b/mod/thewire/views/default/thewire/forms/add.php @@ -11,7 +11,7 @@ if (!empty($wire_user)) { $msg = '@' . $wire_user . ' '; } else { $msg = ''; } ?> -<div class="new_wire_post clearfloat"> +<div class="new_wire_post clearfix"> <h3><?php echo elgg_echo("thewire:doing"); ?></h3> <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/thewire/views/default/thewire/scripts/counter.js"></script> <form action="<?php echo elgg_get_site_url(); ?>action/thewire/add" method="post" name="new_post"> diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php index dbcb7385c..6750a29cb 100644 --- a/mod/thewire/views/default/thewire/profile_status.php +++ b/mod/thewire/views/default/thewire/profile_status.php @@ -22,7 +22,7 @@ if ($latest_wire) { $time = "<p class='entity_subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>"; } - echo "<div class='wire_post'><div class='wire_post_contents clearfloat radius8'>"; + echo "<div class='wire_post'><div class='wire_post_contents clearfix radius8'>"; echo $content; if ($owner == get_loggedin_userid()) { $text = elgg_echo('thewire:update'); 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>'; |