diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/admin/plugins/advanced.php | 6 | ||||
| -rw-r--r-- | views/default/annotation/generic_comment.php | 2 | ||||
| -rw-r--r-- | views/default/annotation/likes.php | 2 | ||||
| -rw-r--r-- | views/default/core/account/login_dropdown.php | 12 | ||||
| -rw-r--r-- | views/default/core/friends/picker.php | 4 | ||||
| -rw-r--r-- | views/default/forms/profile/fields/reset.php | 2 | ||||
| -rw-r--r-- | views/default/input/button.php | 4 | ||||
| -rw-r--r-- | views/default/object/plugin/advanced.php | 2 | ||||
| -rw-r--r-- | views/default/page/layouts/content/header.php | 2 | ||||
| -rw-r--r-- | views/default/page/layouts/widgets/add_button.php | 2 |
10 files changed, 22 insertions, 16 deletions
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 = "<div class=\"mbl\">"; - $buttons .= "<a class='elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> '; - $buttons .= "<a class='elgg-button-cancel' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> '; + $buttons .= "<a class='elgg-button elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> '; + $buttons .= "<a class='elgg-button elgg-button-cancel' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> '; $buttons .= "</div>"; } 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 = "<span class=\"elgg-button-delete\">$delete_button</span>"; + $delete_button = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>"; } $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 = "<span class=\"elgg-button-delete\">$delete_button</span>"; + $delete_button = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>"; } $body = <<<HTML diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index d188364c0..06a9a15fb 100644 --- a/views/default/core/account/login_dropdown.php +++ b/views/default/core/account/login_dropdown.php @@ -17,8 +17,12 @@ if (elgg_get_config('https_login')) { $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE)); ?> <div id="login-dropdown"> - <a href="<?php echo $vars['url']; ?>pg/login" class="elgg-toggler elgg-toggles-login-dropdown-box elgg-button-dropdown"> - <?php echo elgg_echo('login') ?> - </a> - <?php echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); ?> + <?php + echo elgg_view('output/url', array( + 'href' => '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')); + ?> </div>
\ 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) { ?> <div class="clearfix"></div> <div class="friendspicker-savebuttons"> - <input type="submit" class="elgg-button-submit" value="<?php echo elgg_echo('save'); ?>" /> - <input type="button" class="elgg-button-cancel" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" /> + <input type="submit" class="elgg-button elgg-button-submit" value="<?php echo elgg_echo('save'); ?>" /> + <input type="button" class="elgg-button elgg-button-cancel" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" /> <br /></div> </form> 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 @@ */ ?> <div class="elgg-widget-add-control"> - <a class="elgg-button-action elgg-toggler elgg-toggles-widgets-add-panel"> + <a class="elgg-button elgg-button-action elgg-toggler elgg-toggles-widgets-add-panel"> <?php echo elgg_echo('widgets:add'); ?> </a> </div> |