From 6ed2d4f162a2e71c0977ca6b08fb591d2d71a86d Mon Sep 17 00:00:00 2001 From: ewinslow Date: Wed, 23 Feb 2011 16:19:50 +0000 Subject: Every occurrence of elgg-button-$type needs an elgg-button base class declaration -- or should we remove that requirement? git-svn-id: http://code.elgg.org/elgg/trunk@8444 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/lib/blog.php | 2 +- mod/file/index.php | 2 +- mod/file/views/default/object/file.php | 2 +- mod/groups/views/default/groups/invitationrequests.php | 2 +- mod/groups/views/default/groups/membershiprequests.php | 4 ++-- mod/messages/read.php | 2 +- mod/messages/views/default/forms/messages/process.php | 2 +- mod/messages/views/default/object/messages.php | 2 +- mod/pages/view.php | 2 +- mod/profile/views/default/profile/owner_block.php | 2 +- .../views/default/object/reported_content.php | 4 ++-- mod/thewire/views/default/thewire/profile_status.php | 4 ++-- views/default/admin/plugins/advanced.php | 6 +++--- views/default/annotation/generic_comment.php | 2 +- views/default/annotation/likes.php | 2 +- views/default/core/account/login_dropdown.php | 12 ++++++++---- views/default/core/friends/picker.php | 4 ++-- views/default/forms/profile/fields/reset.php | 2 +- views/default/input/button.php | 4 +++- views/default/object/plugin/advanced.php | 2 +- views/default/page/layouts/content/header.php | 2 +- views/default/page/layouts/widgets/add_button.php | 2 +- 22 files changed, 37 insertions(+), 31 deletions(-) diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index 5287844ab..4d5106bfb 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -93,7 +93,7 @@ function blog_get_page_content_list($container_guid = NULL) { $params = array( 'href' => $url, 'text' => elgg_echo("blog:add"), - 'class' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', ); $buttons = elgg_view('output/url', $params); $return['buttons'] = $buttons; diff --git a/mod/file/index.php b/mod/file/index.php index 257dd8af8..de2e46408 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -34,7 +34,7 @@ if ($owner->guid == elgg_get_logged_in_user_guid()) { $vars = array( 'href' => $url, 'text' => elgg_echo("file:add"), - 'class' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', ); $button = elgg_view('output/url', $vars); $params['buttons'] = $button; diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index d3a5c7e41..a43f12cc5 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -68,7 +68,7 @@ if ($full && !elgg_in_context('gallery')) { $download = elgg_view('output/url', array( 'href' => "mod/file/download.php?file_guid=$file->guid", 'text' => elgg_echo("file:download"), - 'class' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', )); $header = elgg_view_title($file->title); diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index 77dabaac2..2ede81bc5 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 8d4fe5c88..15ed3b258 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/messages/read.php b/mod/messages/read.php index 83c7dccee..b830aa51c 100644 --- a/mod/messages/read.php +++ b/mod/messages/read.php @@ -40,7 +40,7 @@ if ($inbox) { if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) { $buttons = elgg_view('output/url', array( 'text' => elgg_echo('messages:answer'), - 'class' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', 'id' => 'messages-show-reply', )); } diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php index ce24360e7..5cdd01c1f 100644 --- a/mod/messages/views/default/forms/messages/process.php +++ b/mod/messages/views/default/forms/messages/process.php @@ -25,7 +25,7 @@ if ($vars['folder'] == "inbox") { echo elgg_view('input/button', array( 'value' => elgg_echo('messages:toggle'), - 'class' => 'elgg-button-cancel', + 'class' => 'elgg-button elgg-button-cancel', 'id' => 'messages-toggle', )); diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php index 13b7ca35f..9e070455b 100644 --- a/mod/messages/views/default/object/messages.php +++ b/mod/messages/views/default/object/messages.php @@ -54,7 +54,7 @@ $subject_info .= elgg_view('output/url', array( 'text' => $message->title, )); -$delete_link = "" . elgg_view("output/confirmlink", array( +$delete_link = "" . elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?guid=" . $message->getGUID(), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/pages/view.php b/mod/pages/view.php index 3a323cc23..479ec1c93 100644 --- a/mod/pages/view.php +++ b/mod/pages/view.php @@ -38,7 +38,7 @@ if ($page->canEdit()) { $buttons = elgg_view('output/url', array( 'text' => elgg_echo('pages:newchild'), 'href' => $url, - 'class' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', )); } diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php index 81ba8a7bf..d257f03a8 100755 --- a/mod/profile/views/default/profile/owner_block.php +++ b/mod/profile/views/default/profile/owner_block.php @@ -28,7 +28,7 @@ $profile_actions = ''; if (elgg_is_logged_in() && $actions) { $profile_actions = '
    '; foreach ($actions as $action) { - $profile_actions .= '
  • ' . $action->getLink(array('class' => 'elgg-button-action')) . '
    • '; + $profile_actions .= '
  • ' . $action->getLink(array('class' => 'elgg-button elgg-button-action')) . '
    • '; } $profile_actions .= '
'; } diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php index 16f9c8773..9ac878ab4 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' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', ); 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' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', ); echo elgg_view('output/url', $params); ?> diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php index 9ff0c4d59..33b05f479 100644 --- a/mod/thewire/views/default/thewire/profile_status.php +++ b/mod/thewire/views/default/thewire/profile_status.php @@ -2,7 +2,7 @@ /** * Latest wire post on profile page */ - + $owner = $vars['entity']->guid; $url_to_wire = elgg_get_site_url() . "pg/thewire/owner/" . $vars['entity']->username; @@ -24,7 +24,7 @@ if ($latest_wire && count($latest_wire) > 0) { echo $content; if ($owner == elgg_get_logged_in_user_guid()) { $text = elgg_echo('thewire:update'); - echo "$text"; + echo "$text"; } echo $time; echo "
"; diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php index 8b12cd899..229c21f96 100644 --- a/views/default/admin/plugins/advanced.php +++ b/views/default/admin/plugins/advanced.php @@ -49,7 +49,7 @@ $category_dropdown = elgg_view('input/dropdown', array( $category_button = elgg_view('input/submit', array( 'value' => elgg_echo('filter'), - 'class' => 'elgg-button-action' + 'class' => 'elgg-button elgg-button-action' )); $category_form = elgg_view('input/form', array( @@ -64,8 +64,8 @@ if (!isset($show_category) || empty($show_category)) { $deactivate_url = elgg_add_action_tokens_to_url($deactivate_url); $buttons = "
"; - $buttons .= "" . elgg_echo('admin:plugins:activate_all') . ' '; - $buttons .= "" . elgg_echo('admin:plugins:deactivate_all') . ' '; + $buttons .= "" . elgg_echo('admin:plugins:activate_all') . ' '; + $buttons .= "" . elgg_echo('admin:plugins:deactivate_all') . ' '; $buttons .= "
"; } else { $buttons = ''; diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index f5408abbd..c55c04c78 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -42,7 +42,7 @@ if ($full_view) { 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm') )); - $delete_button = "$delete_button"; + $delete_button = "$delete_button"; } $comment_text = elgg_view("output/longtext", array("value" => $comment->value)); diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php index 459afce61..2ca129840 100644 --- a/views/default/annotation/likes.php +++ b/views/default/annotation/likes.php @@ -32,7 +32,7 @@ if ($like->canEdit()) { 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm') )); - $delete_button = "$delete_button"; + $delete_button = "$delete_button"; } $body = << "{$login_url}action/login"), array('returntoreferer' => TRUE)); ?>
- - 'login-dropdown-box')); ?> + 'pg/login', + 'text' => elgg_echo('login'), + 'class' => "elgg-button elgg-button-dropdown elgg-toggler elgg-toggles-login-dropdown-box", + )); + echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); + ?>
\ No newline at end of file diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php index c17a484f3..2df452958 100644 --- a/views/default/core/friends/picker.php +++ b/views/default/core/friends/picker.php @@ -270,8 +270,8 @@ if ($formtarget) { ?>
- - + +
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php index deb2d48ef..57dc00e85 100644 --- a/views/default/forms/profile/fields/reset.php +++ b/views/default/forms/profile/fields/reset.php @@ -5,6 +5,6 @@ $params = array( 'value' => elgg_echo('profile:resetdefault'), - 'class' => 'elgg-button-action elgg-state-disabled', + 'class' => 'elgg-button elgg-button-action elgg-state-disabled', ); echo elgg_view('input/submit', $params); diff --git a/views/default/input/button.php b/views/default/input/button.php index 52a85ace6..b1a884c77 100644 --- a/views/default/input/button.php +++ b/views/default/input/button.php @@ -6,11 +6,13 @@ * @subpackage Core * * @uses $vars['src'] Src of an image + * + * @todo Handle classes better */ $defaults = array( 'type' => 'button', - 'class' => 'elgg-button-submit', + 'class' => 'elgg-button elgg-button-action', ); $vars = array_merge($defaults, $vars); diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php index f6a760af4..f4b3b6fbc 100644 --- a/views/default/object/plugin/advanced.php +++ b/views/default/object/plugin/advanced.php @@ -104,7 +104,7 @@ if ($can_activate) { $action_button = elgg_view('output/url', array( 'text' => elgg_echo('admin:plugins:cannot_activate'), 'disabled' => 'disabled', - 'class' => "elgg-button-action elgg-state-disabled" + 'class' => "elgg-button elgg-button-action elgg-state-disabled" )); } diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php index 7a3ab1ae9..2a694c28f 100644 --- a/views/default/page/layouts/content/header.php +++ b/views/default/page/layouts/content/header.php @@ -36,7 +36,7 @@ if ($context) { $params = array( 'href' => $new_link = elgg_normalize_url($new_link), 'text' => elgg_echo("$context:add"), - 'class' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', ); $buttons = elgg_view('output/url', $params); } diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php index 23c0b99ee..cfcbcc998 100644 --- a/views/default/page/layouts/widgets/add_button.php +++ b/views/default/page/layouts/widgets/add_button.php @@ -4,7 +4,7 @@ */ ?>
- +
-- cgit v1.2.3