From 5170cc2b677a9d521dbc2176c6bb1f25efbbc785 Mon Sep 17 00:00:00 2001 From: ewinslow 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 --- engine/lib/users.php | 2 +- mod/blog/views/default/object/blog.php | 8 ++++---- mod/bookmarks/views/default/bookmarks/group_bookmarks.php | 2 +- mod/ecml/views/default/embed/web_services/content.php | 2 +- mod/embed/views/default/object/file/embedlist.php | 2 +- mod/file/views/default/file/groupprofile_files.php | 2 +- mod/file/views/default/widgets/filerepo/view.php | 2 +- mod/groups/views/default/forum/maintopic.php | 2 +- mod/groups/views/default/forum/topics.php | 2 +- mod/groups/views/default/groups/featured.php | 2 +- mod/groups/views/default/groups/forum_latest.php | 2 +- mod/groups/views/default/groups/groupprofile.php | 4 ++-- mod/groups/views/default/groups/invitationrequests.php | 2 +- mod/groups/views/default/groups/members.php | 2 +- mod/groups/views/default/groups/membershiprequests.php | 2 +- mod/groups/views/default/groups/profileitems.php | 6 +++--- mod/groups/views/default/widgets/a_users_groups/view.php | 2 +- .../views/default/admin/overview/logbrowser.php | 2 +- mod/messages/views/default/messages/forms/send.php | 2 +- mod/messages/views/default/messages/messages.php | 6 +++--- mod/messages/views/default/messages/view.php | 6 +++--- mod/profile/views/default/profile/admin_menu.php | 2 +- .../default/profile/commentwall/commentwall_content.php | 2 +- mod/profile/views/default/profile/profile_ownerblock.php | 4 ++-- .../views/default/reportedcontent/listing.php | 2 +- mod/riverdashboard/endpoint/get_comments.php | 2 +- mod/riverdashboard/views/default/river/item/list.php | 2 +- mod/riverdashboard/views/default/river/item/wrapper.php | 8 ++++---- .../views/default/river/item/wrapper_classic.php | 2 +- mod/riverdashboard/views/default/riverdashboard/nav.php | 2 +- mod/search/views/default/search/comments/entity.php | 2 +- mod/search/views/default/search/entity.php | 2 +- mod/sitepages/views/default/canvas/layouts/frontpage.php | 4 ++-- mod/sitepages/views/default/sitepages/members.php | 2 +- mod/sitepages/views/default/sitepages/sidebar.php | 2 +- mod/sitepages/views/default/sitepages/welcome.php | 4 ++-- mod/thewire/views/default/object/thewire.php | 2 +- mod/thewire/views/default/thewire/forms/add.php | 2 +- mod/thewire/views/default/thewire/profile_status.php | 2 +- 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 ++++---- 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 = ' -
+
' . elgg_view('account/forms/login') . '
'; 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 -
-
+
+

{$blog->title}

-
+
$owner_icon
@@ -101,7 +101,7 @@ ___END; } else { echo <<<___END -
+
$owner_icon
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 .= "

{$friendlytime}

"; $info .= "
"; //display - echo "
" . $info . "
"; + echo "
" . $info . "
"; } } 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 = "
    "; +$keywords_html = "
      "; // include support for standard ECML so you can get previews and validation. //$keyword_html = '
    • Generic ECML
      • '; 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 = "getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . ""; ?>
      -
      +
      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 "
      "; + echo "
      "; echo "
      getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "
      "; echo "
      "; echo "

      " . $f->title . "

      "; 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 "
      "; + echo "
      "; echo "
      getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "
      "; echo "
      "; echo "

      " . $f->title . "

      "; 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 @@ ?> -
      +
      -
      +

      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 "
      ".$icon."

      getUrl() . "\">" . $group->name . "

      "; + echo "
      ".$icon."

      getUrl() . "\">" . $group->name . "

      "; echo "

      " . $group->briefdescription . "

      "; } } 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 "
      "; + echo "
      "; echo "
      " . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "
      "; echo "

      guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "

      "; echo "

      ".elgg_echo('comments').": " . $count_annotations . "

      "; 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 -
      +

      {$vars['entity']->name}

      @@ -70,7 +70,7 @@ echo <<<__HTML __HTML; ?> -
      +
      -
      +
      "; 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']); ?> -
      +

      -
      +
      "; 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 "
      "; +echo "
      "; // activity latest - echo "
      "; + echo "
      "; echo elgg_view("groups/activity_latest",array('entity' => $vars['entity'])); echo "
      "; // forum latest - echo "
      "; + echo "
      "; echo elgg_view("groups/forum_latest",array('entity' => $vars['entity'])); echo "
      "; 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

      -
      +
      ___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 -
      +
      $list
      __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 "
      ".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."
      "; + echo "
      ".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."
      "; //draw it echo "
      ".elgg_echo("messages:to").": ".$user->name.""; 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'); ?> -
      +

      title; ?>

      @@ -55,7 +55,7 @@ if (isloggedin())
      -
      +
      -
      +
      (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 "
      "; + echo "
      "; }else{ - echo "
      "; + echo "
      "; } // 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 "
      "; + echo "
      "; //get the icon for the user the message was sent to echo "
      ".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."
      "; echo "
      ".get_loggedin_user()->name."

      ".elgg_view_friendly_time($message->time_created)."

      "; 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); ?> -
      +
      • Admin options… 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 */ ?> -
        +
        $user, 'size' => 'small')); - $more_info = "
        "; + $more_info = "
        "; $more_info .= "

        {$user->name}

        "; $more_info .= "

        {$user->briefdescription}

        "; $more_info .= "

        {$location}

        "; @@ -37,7 +37,7 @@ if ($section == 'details') { } $profile_actions = ""; if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { - $profile_actions = "
        "; + $profile_actions = "
        "; $profile_actions .= "". elgg_echo('profile:edit') .""; $profile_actions .= "". elgg_echo('profile:editicon') .""; $profile_actions .= "
        "; 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 "
        "; - echo "
        "; + echo "
        "; if($report->state != 'archived') echo "guid}") . "\">" . elgg_echo('reportedcontent:archive') . ""; echo "guid}") . "\" onclick=\"return confirm('" . elgg_echo('reportedcontent:areyousure') . "')\">" . elgg_echo('reportedcontent:delete') . "
        "; 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 "
        "; + echo "
        "; echo ""; echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); echo ""; 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 ''; + echo ''; } } 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) { $user, 'size' => 'small')); ?> -
        +
        "; + echo "
        "; echo "" . elgg_echo('comments') . ''; if ($likes_count != 0) { @@ -95,7 +95,7 @@ if ($comments){ $alt = 'penultimate'; } //display comment - echo "
        "; + echo "
        "; echo ""; echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); echo ""; @@ -115,7 +115,7 @@ if ($comments){ } else { // tab bar nav - for users that liked object if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "
        "; + echo "
        "; } 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')); ?> -
        +
        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']) { ?>
        -
        +
        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 -
        +
        $icon

        $title

        $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); } ?> -
        +

        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 @@ -
        +
        -
        +
        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 @@ -
        +
        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 "

        " . $sidebartitle . "

        "; + echo "

        " . $sidebartitle . "

        "; echo $sidebarmessage ."
        "; } \ 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 "

        " . $welcometitle . "

        "; - echo "
        ".$welcomemessage."
        "; + echo "

        " . $welcometitle . "

        "; + echo "
        ".$welcomemessage."
        "; } \ 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"); ?>
        -
        +
        -
        +

        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 = "

        (" . elgg_view_friendly_time($lw->time_created) . ")

        "; } - echo "
        "; + echo "
        "; 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 -