From a7b0a98e223e36090f7b2fc2a68a036e655727cc Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 19 Dec 2010 18:47:10 +0000 Subject: replacing action-button with elgg-action-button git-svn-id: http://code.elgg.org/elgg/trunk@7688 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/forms/blog/save.php | 2 +- mod/file/views/default/object/file.php | 2 +- mod/groups/views/default/forms/groups/edit.php | 2 +- mod/groups/views/default/forum/topics.php | 2 +- mod/groups/views/default/groups/css.php | 2 +- mod/groups/views/default/groups/groupprofile.php | 2 +- mod/groups/views/default/groups/invitationrequests.php | 2 +- mod/groups/views/default/groups/membershiprequests.php | 2 +- mod/messages/index.php | 2 +- mod/messages/sent.php | 2 +- mod/messages/views/default/messages/messages.php | 4 ++-- mod/profile/views/default/profile/css.php | 4 ++-- mod/profile/views/default/profile/ownerblock.php | 10 +++++----- mod/reportedcontent/views/default/object/reported_content.php | 4 ++-- mod/tabbed_profile/views/default/profile/css.php | 4 ++-- mod/tabbed_profile/views/default/profile/ownerblock.php | 10 +++++----- mod/thewire/views/default/object/thewire.php | 2 +- mod/thewire/views/default/thewire/css.php | 4 ++-- mod/thewire/views/default/thewire/forms/add.php | 2 +- mod/thewire/views/default/thewire/profile_status.php | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) (limited to 'mod') diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index 022473e9d..f49340985 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -21,7 +21,7 @@ if ($vars['guid']) { $delete_link = elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), - 'class' => 'action-button disabled' + 'class' => 'elgg-action-button disabled' )); } diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index 37019c1aa..b4754cb18 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -138,7 +138,7 @@ ?> -

+

- " onclick="javascript:return confirm('')"/> diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php index 799e252d8..e67294c72 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 a1cca6489..17922c7a9 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -20,7 +20,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
"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 714b8e8f9..2801b2301 100644 --- a/mod/groups/views/default/groups/membershiprequests.php +++ b/mod/groups/views/default/groups/membershiprequests.php @@ -21,7 +21,7 @@
'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/messages/index.php b/mod/messages/index.php index 3fe1b0f84..02257551e 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 .= "
"; +$area2 .= "
"; // 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 989337f55..e70d34711 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 .= "
"; +$area2 .= "
"; // 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/messages.php b/mod/messages/views/default/messages/messages.php index 5ac749135..0379bef35 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' => "elgg-action-button disabled" )); ?>
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index 4522f7f6e..3ad8d7a29 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -145,7 +145,7 @@ img.medium { #owner_block .profile_actions { margin-top:10px; } -#owner_block .profile_actions a.action-button { +#owner_block .profile_actions a.elgg-action-button { margin-bottom:4px; display: table; } @@ -344,7 +344,7 @@ p.visit_twitter a { border-top: 1px solid #dedede; margin-top:30px; } -.default_profile_reset .action-button { +.default_profile_reset .elgg-action-button { float:right; } /* field re-order */ diff --git a/mod/profile/views/default/profile/ownerblock.php b/mod/profile/views/default/profile/ownerblock.php index 684209569..0350aea2f 100755 --- a/mod/profile/views/default/profile/ownerblock.php +++ b/mod/profile/views/default/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('avatar:edit') .""; + $profile_actions .= "". elgg_echo('profile:edit') .""; + $profile_actions .= "". elgg_echo('avatar:edit') .""; $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='elgg-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 1c4647cfe..0ac4457da 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' => 'elgg-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' => 'elgg-action-button disabled', ); echo elgg_view('output/url', $params); ?> diff --git a/mod/tabbed_profile/views/default/profile/css.php b/mod/tabbed_profile/views/default/profile/css.php index 812daf16d..45c67b6b2 100644 --- a/mod/tabbed_profile/views/default/profile/css.php +++ b/mod/tabbed_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.elgg-action-button { margin-bottom:4px; display: table; } @@ -334,7 +334,7 @@ p.visit_twitter a { border-top: 1px solid #dedede; margin-top:30px; } -.default_profile_reset .action-button { +.default_profile_reset .elgg-action-button { float:right; } /* field re-order */ diff --git a/mod/tabbed_profile/views/default/profile/ownerblock.php b/mod/tabbed_profile/views/default/profile/ownerblock.php index 85c930678..8f6d333a5 100755 --- a/mod/tabbed_profile/views/default/profile/ownerblock.php +++ b/mod/tabbed_profile/views/default/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('avatar:edit') .""; + $profile_actions .= "". elgg_echo('profile:edit') .""; + $profile_actions .= "". elgg_echo('avatar:edit') .""; $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='elgg-action-button'>". elgg_echo('messages:send') .""; } $profile_actions .= "
"; } diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 4ccd5d7f4..b2a8b65c9 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -30,7 +30,7 @@ if (isset($vars['entity'])) { - + {$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 09d878c81..ec1980abc 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 "
"; -- cgit v1.2.3