From 2c2ad03dce82a3fffa575a9a1233345a85e0db34 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Thu, 10 Feb 2011 01:43:36 +0000 Subject: Converted buttons to elgg-object-type naming convention. Added table of buttons to forms theming preview meant for previewing all button types and states (still have to implement those...) git-svn-id: http://code.elgg.org/elgg/trunk@8091 36083f99-b078-4883-b0ff-0f9b5a30f544 --- documentation/theming/preview/forms.php | 106 ++++++++++----------- mod/blog/lib/blog.php | 2 +- mod/blog/views/default/forms/blog/save.php | 2 +- .../views/default/admin/utilities/diagnostics.php | 2 +- mod/file/index.php | 2 +- mod/file/views/default/object/file.php | 2 +- mod/groups/views/default/groups/css.php | 4 +- mod/groups/views/default/groups/edit.php | 2 +- .../views/default/groups/invitationrequests.php | 4 +- .../views/default/groups/membershiprequests.php | 4 +- .../views/default/groups/profile/buttons.php | 2 +- mod/messages/read.php | 2 +- .../views/default/forms/messages/process.php | 2 +- mod/pages/view.php | 2 +- mod/profile/views/default/profile/css.php | 2 +- mod/profile/views/default/profile/owner_block.php | 2 +- .../views/default/object/reported_content.php | 4 +- 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 +- .../views/default/thewire/profile_status.php | 2 +- views/default/admin/components/plugin.php | 6 +- views/default/admin/plugins/advanced.php | 6 +- views/default/admin/plugins/simple.php | 2 +- views/default/core/account/login_walled_garden.php | 4 +- views/default/core/friends/picker.php | 4 +- views/default/css/admin.php | 50 +++++----- views/default/css/elements/forms.php | 50 +++++----- views/default/css/elements/misc.php | 8 +- views/default/forms/profile/fields/reset.php | 2 +- views/default/input/button.php | 2 +- views/default/layout/shells/content/header.php | 2 +- views/default/layout/shells/widgets/add_button.php | 2 +- views/default/page/elements/content_header.php | 4 +- views/installation/input/button.php | 2 +- 35 files changed, 148 insertions(+), 152 deletions(-) diff --git a/documentation/theming/preview/forms.php b/documentation/theming/preview/forms.php index 89caf8e8b..592f5f844 100644 --- a/documentation/theming/preview/forms.php +++ b/documentation/theming/preview/forms.php @@ -159,62 +159,58 @@ $url = current_page_url();

Buttons

-

- 'b1', - 'value' => 'input[type=submit]', - )); - ?> -

-

- "$url#", - 'text' => 'a.elgg-submit-button', - 'class' => 'elgg-button elgg-submit-button', - )); - ?> -

-

- "$url#", - 'text' => 'submit button disabled', - 'class' => 'elgg-button elgg-submit-button disabled', - )); - ?> -

-

- 'b3', - 'value' => 'input[type=button]', - )); - ?> -

-

- "$url#", - 'text' => 'a.elgg-cancel-button', - 'class' => 'elgg-button elgg-cancel-button', - )); - ?> -

-

- "$url#", - 'text' => 'a.elgg-action-button', - 'class' => 'elgg-action-button', - )); - ?> -

-

- "$url#", - 'text' => 'action button disabled', - 'class' => 'elgg-action-button disabled', - )); - ?> -

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AnchorsDefaultHoverFocusActiveDisabledSelected
Defaultanchoranchoranchoranchoranchoranchor
Actionanchoranchoranchoranchoranchoranchor
Defaultanchoranchoranchoranchoranchoranchor
Defaultanchoranchoranchoranchoranchoranchor
- \ No newline at end of file diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index 5e2cc7c52..062a8a0eb 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -95,7 +95,7 @@ function blog_get_page_content_list($container_guid = NULL) { $params = array( 'href' => $url, 'text' => elgg_echo("blog:add"), - 'class' => 'elgg-action-button', + 'class' => 'elgg-button-action', ); $buttons = elgg_view('output/url', $params); $return['buttons'] = $buttons; diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index 127bd447d..c7039aa00 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -19,7 +19,7 @@ if ($vars['guid']) { $delete_link = elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), - 'class' => 'elgg-action-button disabled' + 'class' => 'elgg-button-action disabled' )); } diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/utilities/diagnostics.php index ee1898b8d..9b5da95f7 100644 --- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php +++ b/mod/diagnostics/views/default/admin/utilities/diagnostics.php @@ -15,7 +15,7 @@ if (elgg_get_config('debug')) { $params = array( 'text' => elgg_echo('diagnostics:test:executeall'), 'href' => elgg_get_site_url() . 'engine/tests/suite.php', - 'class' => 'elgg-submit-button', + 'class' => 'elgg-button-submit', ); $unit_tests .= elgg_view('output/url', $params); } else { diff --git a/mod/file/index.php b/mod/file/index.php index 4a8e35bdb..ad5f4378c 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -36,7 +36,7 @@ if ($owner->guid == elgg_get_logged_in_user_guid()) { $vars = array( 'href' => $url, 'text' => elgg_echo("file:add"), - 'class' => 'elgg-action-button', + 'class' => '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 cbe19f3c6..00c777b39 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-action-button', + 'class' => 'elgg-button-action', )); $header = elgg_view_title($file->title); diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index 17cd12031..93e15337f 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -55,8 +55,8 @@ /* group invitations */ -.group_invitations a.elgg-action-button, -.group_invitations a.elgg-submit-button { +.group_invitations a.elgg-button-action, +.group_invitations a.elgg-button-submit { float:right; margin:0 0 0 14px; } diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php index 233ef8306..416ec6375 100644 --- a/mod/groups/views/default/groups/edit.php +++ b/mod/groups/views/default/groups/edit.php @@ -18,7 +18,7 @@ if ($entity) { $warning = elgg_echo("groups:deletewarning"); ?> - " onclick="javascript:return confirm('')"/> diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index c65e8987e..f69482deb 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 05f194059..0ea6967af 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/groups/profile/buttons.php b/mod/groups/views/default/groups/profile/buttons.php index bd7560bb8..31df7a5b5 100644 --- a/mod/groups/views/default/groups/profile/buttons.php +++ b/mod/groups/views/default/groups/profile/buttons.php @@ -47,7 +47,7 @@ if ($actions) { echo elgg_view('output/url', array( 'text' => $action, 'href' => $url, - 'class' => 'elgg-action-button', + 'class' => 'elgg-button-action', )); } } diff --git a/mod/messages/read.php b/mod/messages/read.php index 561eaa3ce..9fda13f5f 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-action-button', + 'class' => 'elgg-button-action', 'internalid' => 'messages-show-reply', )); } diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php index 2c97fcb6f..6c7c07ee6 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-cancel-button', + 'class' => 'elgg-button-cancel', 'internalid' => 'messages-toggle', )); diff --git a/mod/pages/view.php b/mod/pages/view.php index f3d846f23..3a323cc23 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-action-button', + 'class' => 'elgg-button-action', )); } diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index b2a3ff935..d252dec68 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -31,7 +31,7 @@ #profile-owner-block .large { margin-bottom: 10px; } -#profile-owner-block a.elgg-action-button { +#profile-owner-block a.elgg-button-action { margin-bottom: 4px; display: table; } diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php index e36658004..a51db87ef 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-action-button')) . '
    • '; + $profile_actions .= '
  • ' . $action->getLink(array('class' => '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 0ab157d62..83e49142c 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-action-button', + 'class' => '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-action-button', + 'class' => 'elgg-button-action', ); echo elgg_view('output/url', $params); ?> diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 09568a47f..d15454815 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 401401171..29dc69329 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 == elgg_get_logged_in_user_guid()) { $text = elgg_echo('thewire:update'); - echo "$text"; + echo "$text"; } echo $time; echo "
"; diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php index e75c2c63e..010e8482d 100644 --- a/views/default/admin/components/plugin.php +++ b/views/default/admin/components/plugin.php @@ -83,10 +83,10 @@ if ($priority < $max_priority) { if ($can_activate) { if ($active) { $action = 'deactivate'; - $class = 'elgg-cancel-button'; + $class = 'elgg-button-cancel'; } else { $action = 'activate'; - $class = 'elgg-submit-button'; + $class = 'elgg-button-submit'; } $url = elgg_http_add_url_query_elements($actions_base . $action, array( @@ -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-action-button disabled" + 'class' => "elgg-button-action disabled" )); } diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php index 05754e4c7..1bde9c8ae 100644 --- a/views/default/admin/plugins/advanced.php +++ b/views/default/admin/plugins/advanced.php @@ -51,7 +51,7 @@ $category_dropdown = elgg_view('input/dropdown', array( $category_button = elgg_view('input/submit', array( 'value' => elgg_echo('filter'), - 'class' => 'elgg-action-button' + 'class' => 'elgg-button-action' )); $category_form = elgg_view('input/form', array( @@ -63,8 +63,8 @@ if (!isset($show_category) || empty($show_category)) { $activate_url = "{$CONFIG->url}action/admin/plugins/activate_all?__elgg_token=$token&__elgg_ts=$ts"; $deactivate_url = "{$CONFIG->url}action/admin/plugins/deactivate_all?__elgg_token=$token&__elgg_ts=$ts"; - $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/admin/plugins/simple.php b/views/default/admin/plugins/simple.php index e9d7d5ffb..2672aa55d 100644 --- a/views/default/admin/plugins/simple.php +++ b/views/default/admin/plugins/simple.php @@ -102,7 +102,7 @@ ___END; $form_body .= ''; $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); -$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'elgg-action-button disabled')); +$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'elgg-button-action disabled')); echo elgg_view('input/form', array( 'action' => "action/admin/plugins/simple_update_states", diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 9335c0dfd..feda2f047 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -39,7 +39,7 @@ __HTML; $lostpassword_form_body .= "

"; $lostpassword_form_body .= elgg_view('input/captcha'); - $lostpassword_form_body .= "

" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "

"; + $lostpassword_form_body .= "

" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "

"; ?>