From 4d80bc33b8924038bd1ca57d548828afe661bb42 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 2 Dec 2010 03:10:57 +0000 Subject: Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change git-svn-id: http://code.elgg.org/elgg/trunk@7493 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/blog/css.php | 6 +- mod/blog/views/default/blog/forms/edit.php | 4 +- mod/blog/views/default/blog/sidebar_revisions.php | 4 +- mod/blog/views/default/object/blog.php | 24 +- .../views/default/river/object/blog/create.php | 2 +- .../views/default/bookmarks/bookmarklet.php | 2 +- mod/bookmarks/views/default/bookmarks/form.php | 2 +- .../views/default/bookmarks/group_bookmarks.php | 10 +- mod/bookmarks/views/default/object/bookmarks.php | 10 +- .../default/river/object/bookmarks/create.php | 2 +- .../views/default/widgets/bookmarks/view.php | 2 +- .../views/default/defaultwidgets/editor.php | 8 +- .../views/default/embed/web_services/content.php | 2 +- mod/ecml/views/default/settings/ecml/edit.php | 2 +- mod/embed/views/default/embed/css.php | 48 +-- mod/embed/views/default/embed/embed.php | 6 +- mod/embed/views/default/embed/item/list.php | 4 +- mod/embed/views/default/embed/js.php | 2 +- mod/embed/views/default/object/file/embedlist.php | 10 +- mod/file/friends.php | 2 +- mod/file/index.php | 2 +- mod/file/views/default/file/css.php | 4 +- mod/file/views/default/file/groupprofile_files.php | 12 +- mod/file/views/default/file/upload.php | 2 +- mod/file/views/default/object/file.php | 4 +- .../views/default/widgets/filerepo/content.php | 4 +- mod/groups/groupprofile.php | 2 +- mod/groups/views/default/forms/forums/addtopic.php | 2 +- mod/groups/views/default/forms/groups/edit.php | 2 +- mod/groups/views/default/forms/groups/invite.php | 2 +- mod/groups/views/default/forum/maintopic.php | 22 +- mod/groups/views/default/forum/topics.php | 6 +- .../views/default/groups/closedmembership.php | 2 +- mod/groups/views/default/groups/css.php | 20 +- mod/groups/views/default/groups/featured.php | 4 +- mod/groups/views/default/groups/find.php | 2 +- mod/groups/views/default/groups/forum_latest.php | 12 +- .../views/default/groups/group_sort_menu.php | 2 +- mod/groups/views/default/groups/grouplisting.php | 6 +- mod/groups/views/default/groups/groupprofile.php | 4 +- .../views/default/groups/invitationrequests.php | 12 +- .../views/default/groups/membershiprequests.php | 10 +- .../views/default/object/groupforumtopic.php | 20 +- mod/groups/views/default/river/forum/create.php | 2 +- .../views/default/river/forum/topic/create.php | 2 +- mod/groups/views/default/river/group/create.php | 2 +- .../default/river/relationship/member/create.php | 2 +- .../views/default/invitefriends/formitems.php | 2 +- mod/members/index.php | 2 +- mod/members/views/default/members/css.php | 2 +- .../views/default/members/members_navigation.php | 2 +- mod/members/views/default/members/search.php | 4 +- .../views/default/widgets/messageboard/content.php | 2 +- mod/messages/index.php | 4 +- mod/messages/sent.php | 4 +- mod/messages/views/default/messages/css.php | 6 +- .../views/default/messages/forms/reply.php | 2 +- mod/messages/views/default/messages/forms/send.php | 8 +- mod/messages/views/default/messages/messages.php | 20 +- mod/messages/views/default/messages/view.php | 16 +- mod/notifications/start.php | 6 +- .../notifications/subscriptions/collections.php | 2 +- .../default/notifications/subscriptions/form.php | 2 +- .../notifications/subscriptions/forminternals.php | 14 +- .../notifications/subscriptions/groupsform.php | 2 +- .../views/default/river/object/page/create.php | 2 +- .../default/profile/commentwall/commentwall.php | 2 +- .../profile/commentwall/commentwall_content.php | 10 +- mod/profile/views/default/profile/css.php | 18 +- mod/profile/views/default/profile/edit.php | 2 +- .../views/default/profile/editdefaultprofile.php | 2 +- .../default/profile/editdefaultprofileitems.php | 2 +- mod/profile/views/default/profile/editicon.php | 2 +- mod/profile/views/default/profile/listing.php | 6 +- .../views/default/profile/profile_navigation.php | 2 +- .../river/user/default/profileiconupdate.php | 2 +- .../default/river/user/default/profileupdate.php | 2 +- .../default/admin/overview/reportedcontent.php | 2 +- .../views/default/reportedcontent/form.php | 2 +- mod/riverdashboard/endpoint/get_comments.php | 8 +- mod/riverdashboard/endpoint/ping.php | 6 +- mod/riverdashboard/index.php | 2 +- mod/riverdashboard/start.php | 2 +- .../views/default/river/item/list.php | 6 +- .../views/default/river/item/wrapper.php | 42 +-- .../views/default/river/item/wrapper_classic.php | 6 +- .../views/default/riverdashboard/container.php | 2 +- .../views/default/riverdashboard/css.php | 72 ++-- .../views/default/riverdashboard/ecml/activity.php | 2 +- .../views/default/riverdashboard/js.php | 32 +- .../views/default/riverdashboard/nav.php | 4 +- .../views/default/riverdashboard/rivercomment.php | 2 +- .../views/default/search/comments/entity.php | 4 +- mod/search/views/default/search/entity.php | 6 +- mod/search/views/default/search/search_box.php | 6 +- .../views/default/canvas/layouts/frontpage.php | 6 +- mod/sitepages/views/default/sitepages/css.php | 10 +- mod/sitepages/views/default/sitepages/members.php | 2 +- mod/sitepages/views/default/sitepages/menu.php | 2 +- mod/thewire/views/default/object/thewire.php | 2 +- .../views/default/river/object/thewire/create.php | 2 +- mod/thewire/views/default/thewire/css.php | 2 +- .../views/default/thewire/profile_status.php | 2 +- mod/tinymce/views/default/tinymce/css.php | 26 +- views/default/account/forms/forgotten_password.php | 2 +- views/default/account/forms/login.php | 4 +- views/default/account/forms/register.php | 2 +- views/default/account/forms/useradd.php | 2 +- views/default/account/login_dropdown.php | 18 +- views/default/account/login_walled_garden.php | 8 +- views/default/admin/appearance/menu_items.php | 2 +- views/default/admin/overview.php | 6 +- views/default/admin/overview/online.php | 2 +- views/default/admin/plugins/advanced.php | 4 +- views/default/admin/plugins/simple.php | 4 +- views/default/admin/site/advanced.php | 2 +- views/default/admin/site/basic.php | 2 +- views/default/admin/users/newest.php | 2 +- views/default/admin/users/online.php | 2 +- views/default/ajax/loader.php | 2 +- views/default/annotation/annotate.php | 2 +- views/default/annotation/annotatelike.php | 2 +- views/default/annotation/generic_comment.php | 10 +- views/default/annotation/latest_comments.php | 4 +- views/default/annotation/likes.php | 12 +- views/default/comments/forms/edit.php | 2 +- views/default/css/admin.php | 54 +-- views/default/css/ie.php | 38 +- views/default/css/ie6.php | 4 +- views/default/css/screen.php | 398 ++++++++++----------- views/default/dashboard/blurb.php | 2 +- views/default/entities/entity_listing.php | 2 +- views/default/export/entity.php | 14 +- views/default/export/metadata.php | 2 +- views/default/export/relationship.php | 2 +- views/default/friends/collection.php | 4 +- views/default/friends/collections.php | 2 +- views/default/friends/collectiontabs.php | 6 +- views/default/friends/picker.php | 16 +- views/default/input/userpicker.php | 34 +- views/default/js/friendsPickerv1.php | 36 +- views/default/js/initialise_elgg.php | 42 +-- views/default/layouts/administration.php | 8 +- views/default/layouts/one_column.php | 4 +- views/default/layouts/one_column_with_sidebar.php | 6 +- views/default/layouts/widgets.php | 2 +- views/default/likes/forms/edit.php | 10 +- views/default/likes/forms/link.php | 2 +- views/default/messages/errors/list.php | 2 +- views/default/messages/list.php | 2 +- views/default/messages/messages/list.php | 2 +- views/default/navigation/listtype.php | 2 +- views/default/navigation/pagination.php | 10 +- views/default/navigation/site_nav.php | 4 +- views/default/navigation/tabs.php | 2 +- .../notifications/settings/usersettings.php | 2 +- views/default/output/rss_view.php | 2 +- views/default/page_elements/content_header.php | 4 +- .../page_elements/content_header_member.php | 2 +- views/default/page_elements/footer.php | 8 +- views/default/page_elements/header.php | 6 +- views/default/page_elements/header_logo.php | 4 +- views/default/page_elements/owner_block.php | 2 +- views/default/page_elements/topbar.php | 8 +- views/default/page_elements/topbar_logout.php | 2 +- views/default/page_shells/walled_garden.php | 4 +- views/default/river/item/wrapper.php | 4 +- views/default/settings/system.php | 2 +- views/default/settings/upgrading.php | 2 +- views/default/user/settings/default_access.php | 2 +- views/default/user/settings/email.php | 2 +- views/default/user/settings/language.php | 2 +- views/default/user/settings/password.php | 2 +- views/default/usersettings/plugins.php | 2 +- views/default/usersettings/plugins_opt/plugin.php | 2 +- .../usersettings/statistics_opt/numentities.php | 4 +- .../default/usersettings/statistics_opt/online.php | 10 +- views/default/widgets/add_button.php | 2 +- views/default/widgets/add_panel.php | 6 +- views/default/widgets/controls.php | 14 +- views/default/widgets/settings.php | 2 +- views/default/widgets/wrapper.php | 6 +- views/installation/page_shells/default.php | 8 +- 183 files changed, 827 insertions(+), 827 deletions(-) diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php index d9e565ee6..0cd539ca4 100644 --- a/mod/blog/views/default/blog/css.php +++ b/mod/blog/views/default/blog/css.php @@ -8,10 +8,10 @@ .blogpost { border-bottom:1px dotted #CCCCCC; } -.blogpost .entity_listing_icon { +.blogpost .entity-listing-icon { margin-top:6px; } -.blogpost .entity_listing_info { +.blogpost .entity-listing-info { margin-top:4px; } .blog_post { @@ -31,7 +31,7 @@ } /* blogs list view */ -.entity_listing.blog .entity_metadata { +.entity-listing.blog .entity-metadata { min-width:400px; text-align: right; } diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php index 5da9c3cd1..e9fb7d37f 100644 --- a/mod/blog/views/default/blog/forms/edit.php +++ b/mod/blog/views/default/blog/forms/edit.php @@ -167,7 +167,7 @@ $form_body = <<<___END $draft_warning -

+

$title_input

@@ -204,7 +204,7 @@ $body_input $categories_input
-

+

$save_status $saved

diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php index e53ba9e52..ecc479812 100644 --- a/mod/blog/views/default/blog/sidebar_revisions.php +++ b/mod/blog/views/default/blog/sidebar_revisions.php @@ -40,7 +40,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) { 'text' => elgg_echo('blog:status:published') )); - $time = "".elgg_view_friendly_time($blog->publish_date).""; + $time = "".elgg_view_friendly_time($blog->publish_date).""; echo '
  • ' . $load . ": $time @@ -48,7 +48,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) { } foreach ($revisions as $revision) { - $time = "".elgg_view_friendly_time($revision->time_created).""; + $time = "".elgg_view_friendly_time($revision->time_created).""; if ($revision->name == 'blog_auto_save') { $revision_lang = elgg_echo('blog:auto_saved_revision'); } else { diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 91fc7f594..733d42fa4 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -49,7 +49,7 @@ $edit = elgg_view('output/access', array('entity' => $vars['entity'])); if ($blog->canEdit()) { $edit_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/"; - $edit_link = "" . elgg_echo('edit') . ''; + $edit_link = "" . elgg_echo('edit') . ''; $delete_url = "action/blog/delete?guid={$blog->getGUID()}"; $delete_link = "" . elgg_view('output/confirmlink', array( @@ -77,15 +77,15 @@ if ($full) { echo <<<___END
    -

    {$blog->title}

    +

    {$blog->title}

    -
    +
    $owner_icon
    -
    -
    $edit
    -

    +

    +
    $edit
    +

    $author_text $date $categories @@ -101,14 +101,14 @@ ___END; } else { echo <<<___END -

    -
    +
    +
    $owner_icon
    -
    -
    $edit
    -

    $linked_title

    -

    +

    +
    $edit
    +

    $linked_title

    +

    $author_text $date $categories diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php index d311c5883..2b52429a6 100644 --- a/mod/blog/views/default/river/object/blog/create.php +++ b/mod/blog/views/default/river/object/blog/create.php @@ -10,7 +10,7 @@ $contents = strip_tags($object->excerpt); $url = "getURL()}\">{$performed_by->name}"; $title = elgg_echo('blog:river:create', array($url)); -$string .= $title . " getURL()}\">{$object->title} " . elgg_view_friendly_time($object->time_created); +$string .= $title . " getURL()}\">{$object->title} " . elgg_view_friendly_time($object->time_created); if (isloggedin()) { $string .= '' . elgg_echo('generic_comments:text') . ''; diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php index 17a304d78..b1929486d 100644 --- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php +++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php @@ -23,7 +23,7 @@ if (!$name && ($user = get_loggedin_user())) {


    -Instructions +Instructions