diff options
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(); <div class="mtl"> <h2>Buttons</h2> - <p> - <?php echo elgg_view('input/submit', array( - 'internalname' => 'b1', - 'value' => 'input[type=submit]', - )); - ?> - </p> - <p> - <?php echo elgg_view('output/url', array( - 'href' => "$url#", - 'text' => 'a.elgg-submit-button', - 'class' => 'elgg-button elgg-submit-button', - )); - ?> - </p> - <p> - <?php echo elgg_view('output/url', array( - 'href' => "$url#", - 'text' => 'submit button disabled', - 'class' => 'elgg-button elgg-submit-button disabled', - )); - ?> - </p> - <p> - <?php echo elgg_view('input/button', array( - 'internalname' => 'b3', - 'value' => 'input[type=button]', - )); - ?> - </p> - <p> - <?php echo elgg_view('output/url', array( - 'href' => "$url#", - 'text' => 'a.elgg-cancel-button', - 'class' => 'elgg-button elgg-cancel-button', - )); - ?> - </p> - <p> - <?php echo elgg_view('output/url', array( - 'href' => "$url#", - 'text' => 'a.elgg-action-button', - 'class' => 'elgg-action-button', - )); - ?> - </p> - <p> - <?php echo elgg_view('output/url', array( - 'href' => "$url#", - 'text' => 'action button disabled', - 'class' => 'elgg-action-button disabled', - )); - ?> - </p> + <table> + <thead> + <tr> + <th>Anchors</th> + <th>Default</th> + <th>Hover</th> + <th>Focus</th> + <th>Active</th> + <th>Disabled</th> + <th>Selected</th> + </tr> + </thead> + <tbody> + <tr> + <th>Default</th> + <td><a href="#" class="elgg-button">anchor</a></td> + <td><a href="#" class="elgg-button elgg-state-hover">anchor</a></td> + <td><a href="#" class="elgg-button elgg-state-focus">anchor</a></td> + <td><a href="#" class="elgg-button elgg-state-active">anchor</a></td> + <td><a href="#" class="elgg-button elgg-state-disabled">anchor</a></td> + <td><a href="#" class="elgg-button elgg-state-selected">anchor</a></td> + </tr> + <tr> + <th>Action</th> + <td><a href="#" class="elgg-button elgg-button-action">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-action elgg-state-hover">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-action elgg-state-focus">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-action elgg-state-active">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-action elgg-state-disabled">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-action elgg-state-selected">anchor</a></td> + </tr> + <tr> + <th>Default</th> + <td><a href="#" class="elgg-button elgg-button-submit">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-submit elgg-state-hover">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-submit elgg-state-focus">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-submit elgg-state-active">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-submit elgg-state-disabled">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-submit elgg-state-selected">anchor</a></td> + </tr> + <tr> + <th>Default</th> + <td><a href="#" class="elgg-button elgg-button-cancel">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-hover">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-focus">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-active">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-disabled">anchor</a></td> + <td><a href="#" class="elgg-button elgg-button-cancel elgg-state-selected">anchor</a></td> + </tr> + </tbody> + </table> </div> - </div> </body> </html>
\ 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"); ?> <input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" /> - <input type="submit" class="elgg-action-button disabled" name="delete" value="<?php echo elgg_echo('groups:delete'); ?>" onclick="javascript:return confirm('<?php echo $warning; ?>')"/><?php + <input type="submit" class="elgg-button-action disabled" name="delete" value="<?php echo elgg_echo('groups:delete'); ?>" onclick="javascript:return confirm('<?php echo $warning; ?>')"/><?php ?> </form> </div> 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}"); ?> <div class="entity-listing-info"> - <a href="<?php echo $url; ?>" class="elgg-submit-button"><?php echo elgg_echo('accept'); ?></a> + <a href="<?php echo $url; ?>" class="elgg-button-submit"><?php echo elgg_echo('accept'); ?></a> <?php - echo str_replace('<a', '<a class="elgg-action-button disabled" ', elgg_view('output/confirmlink',array( + echo str_replace('<a', '<a class="elgg-button-action disabled" ', elgg_view('output/confirmlink',array( 'href' => "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}"); ?> <div class="entity-listing-info"> - <a href="<?php echo $url; ?>" class="elgg-submit-button"><?php echo elgg_echo('accept'); ?></a> + <a href="<?php echo $url; ?>" class="elgg-button-submit"><?php echo elgg_echo('accept'); ?></a> <?php - echo str_replace('<a', '<a class="elgg-action-button disabled" ', elgg_view('output/confirmlink',array( + echo str_replace('<a', '<a class="elgg-button-action disabled" ', elgg_view('output/confirmlink',array( 'href' => '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 = '<ul class="elgg-menu">'; foreach ($actions as $action) { - $profile_actions .= '<li>' . $action->getLink(array('class' => 'elgg-action-button')) . '</li>'; + $profile_actions .= '<li>' . $action->getLink(array('class' => 'elgg-button-action')) . '</li>'; } $profile_actions .= '</ul>'; } 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'])) { <?php if(elgg_is_logged_in()){ ?> - <a href="<?php echo elgg_get_site_url(); ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="elgg-action-button reply small"><?php echo elgg_echo('thewire:reply'); ?></a> + <a href="<?php echo elgg_get_site_url(); ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="elgg-button-action reply small"><?php echo elgg_echo('thewire:reply'); ?></a> <?php }//close reply if statement // if the user looking at thewire post can edit, show the delete link diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php index 26981d86e..d7beac105 100644 --- a/mod/thewire/views/default/thewire/css.php +++ b/mod/thewire/views/default/thewire/css.php @@ -77,7 +77,7 @@ float:right; width:65px; } -.wire_post_options .elgg-action-button.reply.small { +.wire_post_options .elgg-button-action.reply.small { float:right; } .wire_post_options .delete-button { @@ -88,7 +88,7 @@ /* latest wire post on profile page */ -.wire_post .elgg-action-button.update.small { +.wire_post .elgg-button-action.update.small { float:right; padding:4px; position: absolute; diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php index 5a3e40e5f..3b3519e40 100644 --- a/mod/thewire/views/default/thewire/forms/add.php +++ b/mod/thewire/views/default/thewire/forms/add.php @@ -18,7 +18,7 @@ <?php $action_txt = elgg_echo('post'); $display .= "<textarea name='new_post_textarea' value='' onKeyDown=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\" onKeyUp=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\">{$msg}</textarea>"; - $display .= "<input type='submit' class='elgg-action-button' value='{$action_txt}' />"; + $display .= "<input type='submit' class='elgg-button-action' value='{$action_txt}' />"; $display .= "<div class='character_count'><input readonly type=\"text\" name=\"remLen1\" size=\"3\" maxlength=\"3\" value=\"140\">"; echo $display; echo elgg_echo("thewire:charleft") . "</div>"; 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 "<a class='elgg-action-button update small' href=\"{$url_to_wire}\">$text</a>"; + echo "<a class='elgg-button-action update small' href=\"{$url_to_wire}\">$text</a>"; } echo $time; echo "</div></div>"; 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 = "<a class='elgg-action-button' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> '; - $buttons .= "<a class='elgg-action-button disabled' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> '; + $buttons = "<a class='elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> '; + $buttons .= "<a class='elgg-button-action disabled' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> '; $buttons .= "<br /><br />"; } 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 .= '</ul>'; $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 .= "<p class='margin-none'><label>". elgg_echo('username') . " " . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea lostusername')) . "</label></p>"; $lostpassword_form_body .= elgg_view('input/captcha'); - $lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='elgg-action-button disabled cancel_request' type='reset' value='Cancel'></p>"; + $lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='elgg-button-action disabled cancel_request' type='reset' value='Cancel'></p>"; ?> <div id="lostpassword_form" class="hidden clearfix"> @@ -58,7 +58,7 @@ $(document).ready(function() { $('input.username').focus(); // add cancel button to inline register form - $('#registration_form').find('input.elgg-submit-button').after("<input class='elgg-action-button disabled cancel_request' type='reset' value='Cancel'>"); + $('#registration_form').find('input.elgg-button-submit').after("<input class='elgg-button-action disabled cancel_request' type='reset' value='Cancel'>"); function elgg_slide_hiddenform(activateLink, parentElement, toggleElement) { $(activateLink).closest(parentElement).find(toggleElement).animate({"width": "563px", duration: 400}); diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php index da647b0ac..2344d7d94 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-submit-button" value="<?php echo elgg_echo('save'); ?>" /> - <input type="button" class="elgg-cancel-button" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" /> + <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();" /> <br /></div> </form> diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 729c770bb..09a5bf73e 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -395,7 +395,7 @@ input { -webkit-border-radius: 5px; -moz-border-radius: 5px; } -input[type="submit"], .elgg-submit-button, .elgg-action-button { +input[type="submit"], .elgg-button-submit, .elgg-button-action { font-size: 14px; font-weight: bold; color: white; @@ -410,12 +410,12 @@ input[type="submit"], .elgg-submit-button, .elgg-action-button { cursor: pointer; outline: none; } -input[type="submit"]:hover, .elgg-submit-button:hover, .elgg-action-button:hover { +input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover { color: white; background-color: #000000; text-decoration: none; } -.elgg-submit-button, .elgg-action-button { +.elgg-button-submit, .elgg-button-action { padding: 4px 8px; } /* *************************************** @@ -691,7 +691,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { .elgg-admin form#plugin_settings { margin-top: 10px; } -.elgg-admin form#plugin_settings .elgg-action-button.disabled { +.elgg-admin form#plugin_settings .elgg-button-action.disabled { margin-top:10px; float:right; } @@ -755,7 +755,7 @@ a.elgg-longtext-control { float: right; margin-left: 14px; } -.admin_area .elgg-submit-button { +.admin_area .elgg-button-submit { font-size: 14px; font-weight: bold; color: white; @@ -775,7 +775,7 @@ a.elgg-longtext-control { -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); } -.admin_area .elgg-submit-button:hover { +.admin_area .elgg-button-submit:hover { color: white; border-color: #333333; text-decoration:none; @@ -818,7 +818,7 @@ a.elgg-longtext-control { background-repeat: repeat-x; background-position: left 10px; } -.admin_area .elgg-cancel-button { +.admin_area .elgg-button-cancel { font-size: 14px; font-weight: bold; text-decoration:none; @@ -835,18 +835,18 @@ a.elgg-longtext-control { margin:10px 0 10px 10px; cursor: pointer; } -.admin_area .elgg-cancel-button:hover { +.admin_area .elgg-button-cancel:hover { background-color: #999999; background-position: left 10px; text-decoration:none; color:white; } -.admin_area .content-header-options .elgg-action-button { +.admin_area .content-header-options .elgg-button-action { margin-top:0; margin-left:10px; } -.admin_area input.elgg-action-button, -.admin_area a.elgg-action-button { +.admin_area input.elgg-button-action, +.admin_area a.elgg-button-action { -webkit-border-radius: 5px; -moz-border-radius: 5px; background-color:#cccccc; @@ -864,10 +864,10 @@ a.elgg-longtext-control { -webkit-box-shadow: none; -moz-box-shadow: none; } -.admin_area input.elgg-action-button:hover, -.admin_area a.elgg-action-button:hover, -.admin_area input.elgg-action-button:focus, -.admin_area a.elgg-action-button:focus { +.admin_area input.elgg-button-action:hover, +.admin_area a.elgg-button-action:hover, +.admin_area input.elgg-button-action:focus, +.admin_area a.elgg-button-action:focus { background-position:0 -15px; background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); background-repeat: repeat-x; @@ -876,33 +876,33 @@ a.elgg-longtext-control { background-color:#cccccc; border:1px solid #999999; } -.admin_area .elgg-action-button:active { +.admin_area .elgg-button-action:active { background-image:none; } -.admin_area .elgg-action-button.disabled { +.admin_area .elgg-button-action.disabled { color:#999999; padding:2px 7px 2px 7px; } -.admin_area .elgg-action-button.disabled:hover { +.admin_area .elgg-button-action.disabled:hover { background-position:0 -15px; color:#111111; border:1px solid #999999; } -.admin_area .elgg-action-button.disabled:active { +.admin_area .elgg-button-action.disabled:active { background-image:none; } -.admin_area .elgg-action-button.download { +.admin_area .elgg-button-action.download { padding: 5px 9px 5px 6px; } -.admin_area .elgg-action-button.download:hover { +.admin_area .elgg-button-action.download:hover { } -.admin_area .elgg-action-button.download img { +.admin_area .elgg-button-action.download img { margin-right:6px; position:relative; top:5px; } -.admin_area .elgg-action-button.small { +.admin_area .elgg-button-action.small { -webkit-border-radius: 3px; -moz-border-radius: 3px; width: auto; @@ -911,7 +911,7 @@ a.elgg-longtext-control { font-size: 0.9em; line-height: 0.6em; } -.admin_area .elgg-action-button.small:hover { +.admin_area .elgg-button-action.small:hover { background-color: #0054A7; background-image: none; border-color: #0054A7; @@ -968,7 +968,7 @@ a.elgg-longtext-control { float: left; width: 150px; } -form.admin_plugins_simpleview .elgg-submit-button { +form.admin_plugins_simpleview .elgg-button-submit { margin-right:20px; } .plugin_info { diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 1cac80b58..816accbe7 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -75,7 +75,7 @@ input[type="button"], -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); } input[type="submit"], -.elgg-submit-button { +.elgg-button-submit { color: white; text-shadow: 1px 1px 0px black; text-decoration: none; @@ -86,7 +86,7 @@ input[type="submit"], background-position: left 10px; } input[type="submit"]:hover, -.elgg-submit-button:hover { +.elgg-button-submit:hover { border-color: #0054a7; text-decoration: none; color: white; @@ -95,7 +95,7 @@ input[type="submit"]:hover, background-repeat: repeat-x; background-position: left 10px; } -.elgg-cancel-button { +.elgg-button-cancel { color: #333333; background-color: #dddddd; background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); @@ -103,13 +103,13 @@ input[type="submit"]:hover, background-position: left 10px; border: 1px solid #999999; } -.elgg-cancel-button:hover { +.elgg-button-cancel:hover { color: white; background-color: #999999; background-position: left 10px; text-decoration: none; } -.elgg-action-button { +.elgg-button-action { background-color:#cccccc; background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); background-repeat: repeat-x; @@ -127,8 +127,8 @@ input[type="submit"]:hover, -webkit-box-shadow: none; -moz-box-shadow: none; } -.elgg-action-button:hover, -.elgg-action-button:focus { +.elgg-button-action:hover, +.elgg-button-action:focus { background-position: 0 -15px; background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); background-repeat: repeat-x; @@ -139,22 +139,22 @@ input[type="submit"]:hover, } /* <?php //@todo elgg-state-disabled? ?> -.elgg-submit-button.disabled { +.elgg-button-submit.disabled { background-color:#999999; border-color:#999999; color:#dedede; } -.elgg-submit-button.disabled:hover { +.elgg-button-submit.disabled:hover { background-color:#999999; border-color:#999999; color:#dedede; } -.elgg-action-button { +.elgg-button-action { margin-left: 10px; } -input.elgg-action-button, -a.elgg-action-button { +input.elgg-button-action, +a.elgg-button-action { -webkit-border-radius: 5px; -moz-border-radius: 5px; background-color:#cccccc; @@ -173,10 +173,10 @@ a.elgg-action-button { -webkit-box-shadow: none; -moz-box-shadow: none; } -input.elgg-action-button:hover, -a.elgg-action-button:hover, -input.elgg-action-button:focus, -a.elgg-action-button:focus { +input.elgg-button-action:hover, +a.elgg-button-action:hover, +input.elgg-button-action:focus, +a.elgg-button-action:focus { background-position:0 -15px; background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); background-repeat: repeat-x; @@ -185,33 +185,33 @@ a.elgg-action-button:focus { background-color:#cccccc; border:1px solid #999999; } -.elgg-action-button:active { +.elgg-button-action:active { background-image:none; } -.elgg-action-button.disabled { +.elgg-button-action.disabled { color:#999999; padding:2px 7px 2px 7px; } -.elgg-action-button.disabled:hover { +.elgg-button-action.disabled:hover { background-position:0 -15px; color:#111111; border:1px solid #999999; } -.elgg-action-button.disabled:active { +.elgg-button-action.disabled:active { background-image:none; } -.elgg-action-button.download { +.elgg-button-action.download { padding: 5px 9px 5px 6px; } -.elgg-action-button.download:hover { +.elgg-button-action.download:hover { } -.elgg-action-button.download img { +.elgg-button-action.download img { margin-right:6px; position:relative; top:5px; } -.elgg-action-button.small { +.elgg-button-action.small { -webkit-border-radius: 3px; -moz-border-radius: 3px; width: auto; @@ -220,7 +220,7 @@ a.elgg-action-button:focus { font-size: 0.9em; line-height: 0.6em; } -.elgg-action-button.small:hover { +.elgg-button-action.small:hover { background-color: #4690d6; background-image: none; border-color: #4690d6; diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php index 92107db8c..944f72bc6 100644 --- a/views/default/css/elements/misc.php +++ b/views/default/css/elements/misc.php @@ -37,7 +37,7 @@ font-weight:normal; font-size:100%; } -.loginbox .elgg-submit-button { +.loginbox .elgg-button-submit { margin-right: 15px; } #login .persistent-login { @@ -133,7 +133,7 @@ font-weight:normal; font-size: 100%; } -#login-dropdown #signin-menu .elgg-submit-button { +#login-dropdown #signin-menu .elgg-button-submit { margin-right:15px; } @@ -263,8 +263,8 @@ .friends-picker-navigation-r:hover { background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px; } -.friendspicker-savebuttons .elgg-submit-button, -.friendspicker-savebuttons .elgg-cancel-button { +.friendspicker-savebuttons .elgg-button-submit, +.friendspicker-savebuttons .elgg-button-cancel { margin:5px 20px 5px 5px; } #collectionMembersTable { diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php index 86ab16e24..9da325788 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-action-button disabled', + 'class' => 'elgg-button-action disabled', ); echo elgg_view('input/submit', $params); diff --git a/views/default/input/button.php b/views/default/input/button.php index db520b6ac..52a85ace6 100644 --- a/views/default/input/button.php +++ b/views/default/input/button.php @@ -10,7 +10,7 @@ $defaults = array( 'type' => 'button', - 'class' => 'elgg-submit-button', + 'class' => 'elgg-button-submit', ); $vars = array_merge($defaults, $vars); diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php index f3517e9ad..92456bac4 100644 --- a/views/default/layout/shells/content/header.php +++ b/views/default/layout/shells/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-action-button', + 'class' => 'elgg-button-action', ); $buttons = elgg_view('output/url', $params); } diff --git a/views/default/layout/shells/widgets/add_button.php b/views/default/layout/shells/widgets/add_button.php index 51b03edbb..0304c50a0 100644 --- a/views/default/layout/shells/widgets/add_button.php +++ b/views/default/layout/shells/widgets/add_button.php @@ -4,7 +4,7 @@ */ ?> <div class="elgg-widget-add-control"> - <a class="elgg-action-button elgg-toggle" id="elgg-toggler-add-widgets"> + <a class="elgg-button-action elgg-toggle" id="elgg-toggler-add-widgets"> <?php echo elgg_echo('widgets:add'); ?> </a> </div> diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php index becf4a13a..10ba4b052 100644 --- a/views/default/page/elements/content_header.php +++ b/views/default/page/elements/content_header.php @@ -70,10 +70,10 @@ if (elgg_is_logged_in()) { // @todo remove the hard coded reference to the videolist plugin if (elgg_get_context() == "videolist"){ $video_link = elgg_get_site_url() . "pg/videolist/browse/$username/"; - $new_button = "<a href=\"{$video_link}\" class='elgg-action-button'>" . elgg_echo('videolist:browsemenu') . '</a>'; + $new_button = "<a href=\"{$video_link}\" class='elgg-button-action'>" . elgg_echo('videolist:browsemenu') . '</a>'; } else { $new_link = elgg_normalize_url((isset($vars['new_link'])) ? $vars['new_link'] : "pg/$type/$username/new"); - $new_button = "<a href=\"{$new_link}\" class='elgg-action-button'>" . elgg_echo($type . ':new') . '</a>'; + $new_button = "<a href=\"{$new_link}\" class='elgg-button-action'>" . elgg_echo($type . ':new') . '</a>'; } $new_button = "<div class='content-header-options'>$new_button</div>"; } diff --git a/views/installation/input/button.php b/views/installation/input/button.php index 6704fa8c5..81a5414c4 100644 --- a/views/installation/input/button.php +++ b/views/installation/input/button.php @@ -17,7 +17,7 @@ $class = $vars['class']; if (!$class) { - $class = "elgg-submit-button"; + $class = "elgg-button-submit"; } if (isset($vars['type'])) { |