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 --- 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 +- 14 files changed, 72 insertions(+), 72 deletions(-) (limited to 'views') 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'))) . "

"; ?>