From 89ded32abebd0f2100e0014249df54bde7a44258 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 2 Dec 2010 01:19:33 +0000 Subject: Refs #2700 changed underscores to hyphens for the forms css elements git-svn-id: http://code.elgg.org/elgg/trunk@7492 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/blog/css.php | 2 +- mod/blog/views/default/blog/forms/edit.php | 2 +- mod/blog/views/default/object/blog.php | 2 +- mod/bookmarks/views/default/object/bookmarks.php | 2 +- .../views/default/defaultwidgets/editor.php | 2 +- mod/ecml/views/default/ecml/input_ext.php | 2 +- .../views/default/embed/web_services/content.php | 2 +- mod/embed/views/default/embed/css.php | 10 ++-- mod/embed/views/default/embed/link.php | 2 +- mod/file/views/default/object/file.php | 2 +- mod/groups/views/default/forms/forums/addtopic.php | 2 +- .../views/default/forms/forums/edittopic.php | 2 +- mod/groups/views/default/forms/groups/edit.php | 4 +- mod/groups/views/default/forum/maintopic.php | 2 +- mod/groups/views/default/forum/topics.php | 2 +- mod/groups/views/default/groups/css.php | 4 +- mod/groups/views/default/groups/groupprofile.php | 2 +- .../views/default/groups/invitationrequests.php | 4 +- .../views/default/groups/membershiprequests.php | 4 +- .../views/default/object/groupforumtopic.php | 2 +- .../views/default/invitefriends/formitems.php | 4 +- .../views/default/messageboard/forms/add.php | 2 +- .../views/default/widgets/messageboard/content.php | 2 +- mod/messages/index.php | 2 +- mod/messages/sent.php | 2 +- mod/messages/views/default/messages/css.php | 2 +- .../views/default/messages/forms/reply.php | 6 +- mod/messages/views/default/messages/forms/send.php | 4 +- mod/messages/views/default/messages/forms/view.php | 2 +- mod/messages/views/default/messages/messages.php | 8 +-- mod/messages/views/default/messages/view.php | 4 +- mod/pages/views/default/forms/pages/edit.php | 2 +- .../views/default/forms/pages/editwelcome.php | 2 +- .../default/admin/appearance/defaultprofile.php | 2 +- .../profile/commentwall/commentwall_content.php | 2 +- mod/profile/views/default/profile/css.php | 4 +- mod/profile/views/default/profile/edit.php | 2 +- .../default/profile/editdefaultprofileitems.php | 2 +- mod/profile/views/default/profile/editicon.php | 2 +- .../views/default/profile/profile_ownerblock.php | 10 ++-- .../views/default/object/reported_content.php | 4 +- .../views/default/riverdashboard/css.php | 6 +- .../default/sitepages/forms/editfrontsimple.php | 4 +- mod/thewire/views/default/object/thewire.php | 4 +- mod/thewire/views/default/thewire/css.php | 6 +- mod/thewire/views/default/thewire/forms/add.php | 2 +- .../views/default/thewire/profile_status.php | 2 +- mod/tinymce/views/default/input/longtext.php | 4 +- mod/twitter/views/default/twitter/css.php | 2 +- .../uservalidationbyemail/unvalidated_user.php | 2 +- views/default/account/forms/register.php | 10 ++-- views/default/account/login_walled_garden.php | 4 +- views/default/admin/components/plugin.php | 4 +- views/default/admin/components/plugin_settings.php | 2 +- views/default/admin/plugins/advanced.php | 4 +- views/default/admin/plugins/simple.php | 2 +- views/default/annotation/generic_comment.php | 2 +- views/default/annotation/likes.php | 2 +- views/default/css/admin.php | 70 +++++++++++----------- views/default/css/components/forms.php | 68 ++++++++++----------- views/default/css/ie.php | 6 +- views/default/css/ie6.php | 4 +- views/default/css/screen.php | 14 ++--- views/default/friends/picker.php | 4 +- views/default/input/access.php | 2 +- views/default/input/button.php | 2 +- views/default/input/checkbox.php | 2 +- views/default/input/checkboxes.php | 2 +- views/default/input/email.php | 2 +- views/default/input/file.php | 2 +- views/default/input/longtext.php | 2 +- views/default/input/password.php | 2 +- views/default/input/plaintext.php | 2 +- views/default/input/pulldown.php | 2 +- views/default/input/radio.php | 2 +- views/default/input/tags.php | 2 +- views/default/input/text.php | 2 +- views/default/input/url.php | 2 +- views/default/input/userpicker.php | 4 +- views/default/js/upload_js.php | 2 +- views/default/layouts/widgets.php | 2 +- views/default/page_elements/content_header.php | 4 +- views/default/page_shells/walled_garden.php | 4 +- views/default/usersettings/form.php | 2 +- views/default/widgets/add_button.php | 2 +- views/installation/input/access.php | 2 +- views/installation/input/button.php | 2 +- views/installation/input/longtext.php | 2 +- views/installation/input/password.php | 2 +- views/installation/input/text.php | 2 +- 90 files changed, 206 insertions(+), 206 deletions(-) diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php index 7578f5955..d9e565ee6 100644 --- a/mod/blog/views/default/blog/css.php +++ b/mod/blog/views/default/blog/css.php @@ -37,7 +37,7 @@ } /* blogs edit/create form */ -form#blog_post_edit .submit_button { +form#blog_post_edit .submit-button { margin-right:15px; } /* force tinymce input height for a more useful editing / blog creation area */ diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php index 60012dac6..5da9c3cd1 100644 --- a/mod/blog/views/default/blog/forms/edit.php +++ b/mod/blog/views/default/blog/forms/edit.php @@ -68,7 +68,7 @@ if (isset ($vars['entity'])) { $delete_link = elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), - 'class' => 'action_button disabled' + 'class' => 'action-button disabled' )); } diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 7f91ae608..91fc7f594 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -52,7 +52,7 @@ if ($blog->canEdit()) { $edit_link = "" . elgg_echo('edit') . ''; $delete_url = "action/blog/delete?guid={$blog->getGUID()}"; - $delete_link = "" . elgg_view('output/confirmlink', array( + $delete_link = "" . elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm') diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 09d91a3c3..7438f1570 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -59,7 +59,7 @@ if (@file_exists($faviconurl)) { //delete if($vars['entity']->canEdit()){ - $delete .= "" . elgg_view('output/confirmlink',array( + $delete .= "" . elgg_view('output/confirmlink',array( 'href' => "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid, 'text' => elgg_echo("delete"), 'confirm' => elgg_echo("bookmarks:delete:confirm"), diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php index e63e84a79..0e2519690 100644 --- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php +++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php @@ -262,7 +262,7 @@ $(document).ready(function () { ?> - + diff --git a/mod/ecml/views/default/ecml/input_ext.php b/mod/ecml/views/default/ecml/input_ext.php index f9ab942e0..045f30288 100644 --- a/mod/ecml/views/default/ecml/input_ext.php +++ b/mod/ecml/views/default/ecml/input_ext.php @@ -7,4 +7,4 @@ $docs_href = elgg_get_site_url()."pg/ecml"; ?> -ECML \ No newline at end of file +ECML \ No newline at end of file diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php index b609db448..4697eedab 100644 --- a/mod/ecml/views/default/embed/web_services/content.php +++ b/mod/ecml/views/default/embed/web_services/content.php @@ -45,7 +45,7 @@ $embed = elgg_view('input/submit', array( 'internalid' => 'embed_submit', 'type' => 'button', 'value' => elgg_echo('embed:embed'), - 'class' => 'submit_button disabled', + 'class' => 'submit-button disabled', 'disabled' => TRUE )); diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php index 1fed16080..559cd456d 100644 --- a/mod/embed/views/default/embed/css.php +++ b/mod/embed/views/default/embed/css.php @@ -114,8 +114,8 @@ } /* input field classes */ -#facebox .content .input_text, -#facebox .content .input_tags { +#facebox .content .input-text, +#facebox .content .input-tags { font: 120% Arial, Helvetica, sans-serif; padding: 5px; border: 1px solid #cccccc; @@ -127,13 +127,13 @@ -moz-box-shadow: none; box-shadow: none; } -#facebox .content .input_text:focus, -#facebox .content .input_tags:focus { +#facebox .content .input-text:focus, +#facebox .content .input-tags:focus { border: solid 1px #4690d6; background: #e4ecf5; color:#333333; } -#facebox .content .input_file { +#facebox .content .input-file { background-color: white; } #facebox .content p { diff --git a/mod/embed/views/default/embed/link.php b/mod/embed/views/default/embed/link.php index e2c3b1bff..bb8f74b4c 100644 --- a/mod/embed/views/default/embed/link.php +++ b/mod/embed/views/default/embed/link.php @@ -11,4 +11,4 @@ if (is_plugin_enabled('ecml')) { } ?> - + diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index 054184c7b..3b9731ed6 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -138,7 +138,7 @@ ?> -

+

- +

diff --git a/mod/groups/views/default/forms/forums/edittopic.php b/mod/groups/views/default/forms/forums/edittopic.php index 1426385ed..6321a9536 100644 --- a/mod/groups/views/default/forms/forums/edittopic.php +++ b/mod/groups/views/default/forms/forums/edittopic.php @@ -90,7 +90,7 @@ - +

\ No newline at end of file diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index a78e0b982..32e9f6ff3 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -140,7 +140,7 @@ if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0) - " /> + " />

@@ -156,7 +156,7 @@ if ($vars['entity']) { $warning = elgg_echo("groups:deletewarning"); ?> - " onclick="javascript:return confirm('')"/> diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php index fc4dd3b32..8cf2e4a76 100644 --- a/mod/groups/views/default/forum/maintopic.php +++ b/mod/groups/views/default/forum/maintopic.php @@ -25,7 +25,7 @@ // if comment owner, group owner, or site admin - display edit and delete options if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) { echo "
"; - echo "".elgg_view("output/confirmlink",array( + echo "".elgg_view("output/confirmlink",array( 'href' => "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm') diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php index beab468a3..1426ba274 100644 --- a/mod/groups/views/default/forum/topics.php +++ b/mod/groups/views/default/forum/topics.php @@ -12,7 +12,7 @@ if(elgg_get_page_owner()->isMember(get_loggedin_user())) { ?>
- +
'; foreach ($actions as $url => $action) { - $action_buttons .= "$action"; + $action_buttons .= "$action"; } $action_buttons .= '
'; } diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index cf84a6ab0..4674a3c23 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -18,9 +18,9 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) { $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"); ?>
- + "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}", 'confirm' => elgg_echo('groups:invite:remove:check'), 'text' => elgg_echo('delete'), diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php index 9a5163b1d..6cb5f75f6 100644 --- a/mod/groups/views/default/groups/membershiprequests.php +++ b/mod/groups/views/default/groups/membershiprequests.php @@ -19,9 +19,9 @@ $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}"); ?>
- + 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid, 'confirm' => elgg_echo('groups:joinrequest:remove:check'), 'text' => elgg_echo('delete'), diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 4250e9aff..efa4dee79 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -59,7 +59,7 @@ if (elgg_get_context() == "search") { $info .= ''; // display the delete link to those allowed to delete - $info .= '' . elgg_view("output/confirmlink", array( + $info .= '' . elgg_view("output/confirmlink", array( 'href' => "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php index 8bf397d54..f189d4525 100644 --- a/mod/invitefriends/views/default/invitefriends/formitems.php +++ b/mod/invitefriends/views/default/invitefriends/formitems.php @@ -17,13 +17,13 @@ if ($CONFIG->allow_registration) {

HTML; diff --git a/mod/messageboard/views/default/messageboard/forms/add.php b/mod/messageboard/views/default/messageboard/forms/add.php index d44e477bf..6003bade7 100644 --- a/mod/messageboard/views/default/messageboard/forms/add.php +++ b/mod/messageboard/views/default/messageboard/forms/add.php @@ -11,7 +11,7 @@
-
+
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php index 8c1abb47b..2f85a16ac 100644 --- a/mod/messageboard/views/default/widgets/messageboard/content.php +++ b/mod/messageboard/views/default/widgets/messageboard/content.php @@ -43,7 +43,7 @@ if (isloggedin()) {
- + diff --git a/mod/messages/index.php b/mod/messages/index.php index 5b79a54ae..496a8ee9d 100644 --- a/mod/messages/index.php +++ b/mod/messages/index.php @@ -32,7 +32,7 @@ $messages = elgg_get_entities_from_metadata(array( // Set the page title $area2 = "
"; $area2 .= elgg_view_title(elgg_echo("messages:inbox"))."
"; -$area2 .= "
" . elgg_echo('messages:compose') . "
"; +$area2 .= "
" . elgg_echo('messages:compose') . "
"; // Display them. The last variable 'page_view' is to allow the view page to know where this data is coming from, // in this case it is the inbox, this is necessary to ensure the correct display diff --git a/mod/messages/sent.php b/mod/messages/sent.php index 89771d6b7..7331a8d52 100644 --- a/mod/messages/sent.php +++ b/mod/messages/sent.php @@ -28,7 +28,7 @@ $messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', ' // Set the page title $area2 = "
"; $area2 .= elgg_view_title(elgg_echo("messages:sentmessages"))."
"; -$area2 .= "
" . elgg_echo('messages:compose') . "
"; +$area2 .= "
" . elgg_echo('messages:compose') . "
"; // Set content $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset)); diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php index 95bcba108..b186400f8 100644 --- a/mod/messages/views/default/messages/css.php +++ b/mod/messages/views/default/messages/css.php @@ -74,7 +74,7 @@ a.privatemessages.new span { width:513px; padding-top:6px; } -.message .delete_button { +.message .delete-button { margin-top:3px; } .entity_listing.messages:hover { diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php index 998c0071f..15eb3ebd0 100644 --- a/mod/messages/views/default/messages/forms/reply.php +++ b/mod/messages/views/default/messages/forms/reply.php @@ -16,8 +16,8 @@ -

-

+

+

fromId . "' />"; ?> - " /> + " />

diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php index c77931454..43ece8d89 100644 --- a/mod/messages/views/default/messages/forms/send.php +++ b/mod/messages/views/default/messages/forms/send.php @@ -57,7 +57,7 @@ unset($_SESSION['msg_contents']); } ?> -

+

-

" />

+

" />

diff --git a/mod/messages/views/default/messages/forms/view.php b/mod/messages/views/default/messages/forms/view.php index f8fce93a9..272ac91c6 100644 --- a/mod/messages/views/default/messages/forms/view.php +++ b/mod/messages/views/default/messages/forms/view.php @@ -16,7 +16,7 @@ if($vars['page_view'] == "inbox"){ $body .= ' '; } -$body .= ''; +$body .= ''; $body .= '
'; echo elgg_view('input/form',array('body' => $body, 'action' => 'action/messages/delete', 'method' => 'post', 'internalid' => 'messages_list_form')); \ No newline at end of file diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php index 4d593a621..6fc87ac0e 100644 --- a/mod/messages/views/default/messages/messages.php +++ b/mod/messages/views/default/messages/messages.php @@ -44,12 +44,12 @@ if (isloggedin())

title; ?>

- + "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), - 'class' => "action_button disabled" + 'class' => "action-button disabled" )); ?>
@@ -94,7 +94,7 @@ if (isloggedin())

-

+

"message", @@ -108,7 +108,7 @@ if (isloggedin()) //pass along the owner of the message being replied to echo "fromId . "' />"; ?> - " /> + " />

diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php index 65091689a..76fa4a00c 100644 --- a/mod/messages/views/default/messages/view.php +++ b/mod/messages/views/default/messages/view.php @@ -40,7 +40,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { // display message subject echo "
"; // display delete button - echo "" . elgg_view("output/confirmlink", array( + echo "" . elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), @@ -75,7 +75,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { // display message subject echo "
"; //display the link to 'delete' - echo "
" . elgg_view("output/confirmlink", array( + echo "
" . elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index e866037cc..5c052b1c6 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -87,7 +87,7 @@ if ($container_guid) { ?> - " /> + " />

diff --git a/mod/pages/views/default/forms/pages/editwelcome.php b/mod/pages/views/default/forms/pages/editwelcome.php index 625628639..883939fd4 100644 --- a/mod/pages/views/default/forms/pages/editwelcome.php +++ b/mod/pages/views/default/forms/pages/editwelcome.php @@ -51,5 +51,5 @@ $page_owner = $vars['owner']->guid; } ?> -" /> +" /> diff --git a/mod/profile/views/default/admin/appearance/defaultprofile.php b/mod/profile/views/default/admin/appearance/defaultprofile.php index b935797fb..b63525bf1 100644 --- a/mod/profile/views/default/admin/appearance/defaultprofile.php +++ b/mod/profile/views/default/admin/appearance/defaultprofile.php @@ -30,7 +30,7 @@ $listing = elgg_view('profile/editdefaultprofileitems',array('items' => $items, $resetlisting = elgg_view('input/form', array ( - 'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action_button disabled')), + 'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action-button disabled')), 'action' => 'action/profile/editdefault/reset' ) ); diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php index 15cb2584e..a7a7ca14d 100644 --- a/mod/profile/views/default/profile/commentwall/commentwall_content.php +++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php @@ -15,7 +15,7 @@ canEdit()) { - echo "
" . elgg_view("output/confirmlink",array( + echo "
" . elgg_view("output/confirmlink",array( 'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index 22ebaa8f1..d1941bbc8 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -135,7 +135,7 @@ img.medium { #owner_block .profile_actions { margin-top:10px; } -#owner_block .profile_actions a.action_button { +#owner_block .profile_actions a.action-button { margin-bottom:4px; display: table; } @@ -366,7 +366,7 @@ p.visit_twitter a { border-top: 1px solid #dedede; margin-top:30px; } -.default_profile_reset .action_button { +.default_profile_reset .action-button { float:right; } /* field re-order */ diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php index 5e9cef774..4ca723385 100644 --- a/mod/profile/views/default/profile/edit.php +++ b/mod/profile/views/default/profile/edit.php @@ -74,7 +74,7 @@

- " /> + " />

\ No newline at end of file diff --git a/mod/profile/views/default/profile/editdefaultprofileitems.php b/mod/profile/views/default/profile/editdefaultprofileitems.php index 368529118..4c093cb22 100644 --- a/mod/profile/views/default/profile/editdefaultprofileitems.php +++ b/mod/profile/views/default/profile/editdefaultprofileitems.php @@ -50,7 +50,7 @@ END; //$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/profile/editdefault/delete?id={$item->shortname}"); - echo "
  • shortname}\">
    " . elgg_echo('delete') . "
    "; + echo "
  • shortname}\">
    " . elgg_echo('delete') . "
    "; echo "move"; echo "shortname}_editable\">$item->translation: [".elgg_echo($item->type)."]"; echo "
    • "; diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php index cdfa68a8a..9e1987d55 100644 --- a/mod/profile/views/default/profile/editicon.php +++ b/mod/profile/views/default/profile/editicon.php @@ -39,7 +39,7 @@ $currentuser = get_loggedin_user(); echo elgg_view("input/file",array('internalname' => 'profileicon')); ?> -
    " /> +
    " />

    diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php index bfed3aec1..216734aa5 100755 --- a/mod/profile/views/default/profile/profile_ownerblock.php +++ b/mod/profile/views/default/profile/profile_ownerblock.php @@ -38,8 +38,8 @@ if ($section == 'details') { $profile_actions = ""; if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { $profile_actions = "
    "; - $profile_actions .= "". elgg_echo('profile:edit') .""; - $profile_actions .= "". elgg_echo('profile:editicon') .""; + $profile_actions .= "". elgg_echo('profile:edit') .""; + $profile_actions .= "". elgg_echo('profile:editicon') .""; $profile_actions .= "
    "; } else { $profile_actions = "
    "; @@ -48,16 +48,16 @@ if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { if ($user->isFriend()) { $url = elgg_get_site_url()."action/friends/remove?friend={$user->getGUID()}"; $url = elgg_add_action_tokens_to_url($url); - $profile_actions .= "" . elgg_echo('friend:remove') . ""; + $profile_actions .= "" . elgg_echo('friend:remove') . ""; } else { $url = elgg_get_site_url()."action/friends/add?friend={$user->getGUID()}"; $url = elgg_add_action_tokens_to_url($url); - $profile_actions .= "" . elgg_echo('friend:add') . ""; + $profile_actions .= "" . elgg_echo('friend:add') . ""; } } } if (is_plugin_enabled('messages') && isloggedin()) { - $profile_actions .= "guid}\" class='action_button'>". elgg_echo('messages:send') .""; + $profile_actions .= "guid}\" class='action-button'>". elgg_echo('messages:send') .""; } $profile_actions .= "
    "; } diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php index fa809bae6..1c4647cfe 100644 --- a/mod/reportedcontent/views/default/object/reported_content.php +++ b/mod/reportedcontent/views/default/object/reported_content.php @@ -28,7 +28,7 @@ if ($report->state == 'archived') { 'href' => $archive_url, 'text' => elgg_echo('reportedcontent:archive'), 'is_action' => true, - 'class' => 'action_button', + 'class' => 'action-button', ); echo elgg_view('output/url', $params); } @@ -36,7 +36,7 @@ if ($report->state == 'archived') { 'href' => $delete_url, 'text' => elgg_echo('reportedcontent:delete'), 'is_action' => true, - 'class' => 'action_button disabled', + 'class' => 'action-button disabled', ); echo elgg_view('output/url', $params); ?> diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php index ec27f9686..a09a32712 100644 --- a/mod/riverdashboard/views/default/riverdashboard/css.php +++ b/mod/riverdashboard/views/default/riverdashboard/css.php @@ -96,14 +96,14 @@ padding:5px; height:26px; } -.river_comment_form.hidden .input_text { +.river_comment_form.hidden .input-text { width:560px; padding:3px; } -#profile_content .river_comment_form.hidden .input_text { /* when activity is displayed on profile page */ +#profile_content .river_comment_form.hidden .input-text { /* when activity is displayed on profile page */ width:535px; } -.river_comment_form.hidden .submit_button { +.river_comment_form.hidden .submit-button { margin:0 0 0 10px; float:right; } diff --git a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php index b38fcd03b..c426e9ad9 100644 --- a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php +++ b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php @@ -26,7 +26,7 @@ $welcometitle_form = elgg_view('input/text', array( $welcomemessage_form = elgg_view('input/longtext', array( 'internalname' => 'welcomemessage', 'value' => $welcomemessage, - 'class' => 'input_textarea monospace' + 'class' => 'input-textarea monospace' )); $sidebartitle_form = elgg_view('input/text', array( 'internalname' => 'sidebartitle', @@ -35,7 +35,7 @@ $sidebartitle_form = elgg_view('input/text', array( $sidebarmessage_form = elgg_view('input/longtext', array( 'internalname' => 'sidebarmessage', 'value' => $sidebarmessage, - 'class' => 'input_textarea monospace' + 'class' => 'input-textarea monospace' ));; $page_type = elgg_view('input/hidden', array( diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index a94d3a4aa..66debd5e2 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -30,12 +30,12 @@ if (isset($vars['entity'])) { - + canEdit()) { - echo "" . elgg_view("output/confirmlink",array( + echo "" . elgg_view("output/confirmlink",array( 'href' => "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php index 36c9bc844..230711c49 100644 --- a/mod/thewire/views/default/thewire/css.php +++ b/mod/thewire/views/default/thewire/css.php @@ -77,10 +77,10 @@ float:right; width:65px; } -.wire_post_options .action_button.reply.small { +.wire_post_options .action-button.reply.small { float:right; } -.wire_post_options .delete_button { +.wire_post_options .delete-button { position: absolute; bottom:5px; right:5px; @@ -88,7 +88,7 @@ /* latest wire post on profile page */ -.wire_post .action_button.update.small { +.wire_post .action-button.update.small { float:right; padding:4px; position: absolute; diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php index 536ec6ee2..a7f7977b7 100644 --- a/mod/thewire/views/default/thewire/forms/add.php +++ b/mod/thewire/views/default/thewire/forms/add.php @@ -18,7 +18,7 @@ {$msg}"; - $display .= ""; + $display .= ""; $display .= "
    "; echo $display; echo elgg_echo("thewire:charleft") . "
    "; diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php index 6750a29cb..9a9c95ec0 100644 --- a/mod/thewire/views/default/thewire/profile_status.php +++ b/mod/thewire/views/default/thewire/profile_status.php @@ -26,7 +26,7 @@ if ($latest_wire) { echo $content; if ($owner == get_loggedin_userid()) { $text = elgg_echo('thewire:update'); - echo "$text"; + echo "$text"; } echo $time; echo "
    "; diff --git a/mod/tinymce/views/default/input/longtext.php b/mod/tinymce/views/default/input/longtext.php index 2f90d5a1c..995cd8fd1 100644 --- a/mod/tinymce/views/default/input/longtext.php +++ b/mod/tinymce/views/default/input/longtext.php @@ -84,9 +84,9 @@ function toggleEditor(id) { ?> - + - +