diff options
23 files changed, 50 insertions, 39 deletions
diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php index 54090b8fa..e84082107 100644 --- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php +++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php @@ -262,7 +262,9 @@ $(document).ready(function () { ?> <input type="hidden" name="context" value="<?php echo $context; ?>" /> <input type="hidden" name="owner" value="<?php echo elgg_get_page_owner_guid(); ?>" /> -<input type="submit" value="<?php echo elgg_echo('save'); ?>" class="submit-button" /> +<?php + echo elgg_view('input/submit', array('value' => elgg_echo('save'))); +?> </form> </div><!-- /customise_editpanel --> diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php index cc44d582f..9e7ffbbb4 100644 --- a/mod/ecml/views/default/embed/web_services/content.php +++ b/mod/ecml/views/default/embed/web_services/content.php @@ -45,7 +45,7 @@ $embed = elgg_view('input/submit', array( 'internalid' => 'embed_submit', 'type' => 'button', 'value' => elgg_echo('embed:embed'), - 'class' => 'submit-button disabled', + 'class' => 'elgg-submit-button disabled', 'disabled' => TRUE )); diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php index 7d61e2514..cf4921e20 100644 --- a/mod/groups/views/default/forms/forums/addtopic.php +++ b/mod/groups/views/default/forms/forums/addtopic.php @@ -97,7 +97,7 @@ <!-- required hidden info and submit button --> <p> <input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" /> - <input type="submit" class="submit-button" value="<?php echo elgg_echo('post'); ?>" /> + <?php echo elgg_view('input/submit', array('value' => elgg_echo('post'))); ?> </p> </form> diff --git a/mod/groups/views/default/forms/forums/edittopic.php b/mod/groups/views/default/forms/forums/edittopic.php index 6321a9536..d05389218 100644 --- a/mod/groups/views/default/forms/forums/edittopic.php +++ b/mod/groups/views/default/forms/forums/edittopic.php @@ -90,7 +90,7 @@ <input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" /> <input type="hidden" name="topic" value="<?php echo $topic_guid; ?>" /> <input type="hidden" name="message_id" value="<?php echo $message_id; ?>" /> - <input type="submit" class="submit-button" value="<?php echo elgg_echo('save'); ?>" /> + <?php echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?> </p> </form>
\ No newline at end of file diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index be0a5912c..99ff92616 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -139,8 +139,9 @@ if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0) <input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" /> <?php } + + echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?> - <input type="submit" class="submit-button" value="<?php echo elgg_echo("save"); ?>" /> </p> diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index ffe500b2f..acd18550e 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -35,7 +35,7 @@ /* group invitations */ .group_invitations a.elgg-action-button, -.group_invitations a.submit-button { +.group_invitations a.elgg-submit-button { float:right; margin:0 0 0 14px; } diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index 17922c7a9..9bb76e264 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -18,7 +18,7 @@ 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="submit-button"><?php echo elgg_echo('accept'); ?></a> + <a href="<?php echo $url; ?>" class="elgg-submit-button"><?php echo elgg_echo('accept'); ?></a> <?php echo str_replace('<a', '<a class="elgg-action-button disabled" ', elgg_view('output/confirmlink',array( 'href' => "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}", diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php index 2801b2301..05f194059 100644 --- a/mod/groups/views/default/groups/membershiprequests.php +++ b/mod/groups/views/default/groups/membershiprequests.php @@ -19,7 +19,7 @@ $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="submit-button"><?php echo elgg_echo('accept'); ?></a> + <a href="<?php echo $url; ?>" class="elgg-submit-button"><?php echo elgg_echo('accept'); ?></a> <?php echo str_replace('<a', '<a class="elgg-action-button disabled" ', elgg_view('output/confirmlink',array( 'href' => 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid, diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php index 0b78f4db3..bdf3d1283 100644 --- a/mod/messages/views/default/messages/forms/reply.php +++ b/mod/messages/views/default/messages/forms/reply.php @@ -26,9 +26,9 @@ echo "<input type='hidden' name='reply' value='" . $vars['entity']->getGUID() . "' />"; //pass along the owner of the message being replied to echo "<input type='hidden' name='send_to' value='BAAA" . $vars['entity']->fromId . "' />"; - + + echo elgg_view('input/submit', array('value' => elgg_echo("messages:fly"))); ?> - <input type="submit" class="submit-button" value="<?php echo elgg_echo("messages:fly"); ?>" /> </p> </form> diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php index 9a83ce103..7707dab82 100644 --- a/mod/messages/views/default/messages/forms/send.php +++ b/mod/messages/views/default/messages/forms/send.php @@ -66,5 +66,9 @@ unset($_SESSION['msg_contents']); )); ?> </p> - <p><input type="submit" class="submit-button" value="<?php echo elgg_echo("messages:fly"); ?>" /></p> + <p> + <?php + echo elgg_view('input/submit', array('value' => elgg_echo("messages:fly"))); + ?> + </p> </form> diff --git a/mod/messages/views/default/messages/forms/view.php b/mod/messages/views/default/messages/forms/view.php index 272ac91c6..5b9263382 100644 --- a/mod/messages/views/default/messages/forms/view.php +++ b/mod/messages/views/default/messages/forms/view.php @@ -16,7 +16,7 @@ if($vars['page_view'] == "inbox"){ $body .= '<input type="submit" name="submit" value="'.elgg_echo('messages:markread').'" /> '; } -$body .= '<input class="cancel-button" type="button" onclick="javascript:$(\'input[type=checkbox]\').click();" value="'.elgg_echo('messages:toggle').'" />'; +$body .= '<input class="elgg-cancel-button" type="button" onclick="javascript:$(\'input[type=checkbox]\').click();" value="'.elgg_echo('messages:toggle').'" />'; $body .= '</div>'; echo elgg_view('input/form',array('body' => $body, 'action' => 'action/messages/delete', 'method' => 'post', 'internalid' => 'messages_list_form'));
\ No newline at end of file diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php index 0379bef35..4567256b6 100644 --- a/mod/messages/views/default/messages/messages.php +++ b/mod/messages/views/default/messages/messages.php @@ -107,8 +107,9 @@ if (isloggedin()) echo "<input type='hidden' name='reply' value='" . $vars['entity']->getGUID() . "' />"; //pass along the owner of the message being replied to echo "<input type='hidden' name='send_to' value='" . $vars['entity']->fromId . "' />"; + + echo elgg_view('input/submit', array('value' => elgg_echo("messages:fly"))); ?> - <input type="submit" class="submit-button" value="<?php echo elgg_echo("messages:fly"); ?>" /> </form> </div> diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index 5c052b1c6..94e969a57 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -87,7 +87,9 @@ if ($container_guid) { ?> <input type="hidden" name="parent_guid" value="<?php if (!$new_page) echo $vars['entity']->parent_guid; else echo $parent_guid; ?>" /> <input type="hidden" name="owner_guid" value="<?php if (!$new_page) echo $vars['entity']->owner_guid; else echo elgg_get_page_owner_guid(); ?>" /> - <input type="submit" class="submit-button" value="<?php echo elgg_echo("save"); ?>" /> +<?php + echo elgg_view('input/submit', array('value' => elgg_echo('save'))); +?> </p> </form> diff --git a/mod/pages/views/default/forms/pages/editwelcome.php b/mod/pages/views/default/forms/pages/editwelcome.php index 883939fd4..a0ad3131b 100644 --- a/mod/pages/views/default/forms/pages/editwelcome.php +++ b/mod/pages/views/default/forms/pages/editwelcome.php @@ -49,7 +49,8 @@ $page_owner = $vars['owner']->guid; <input type="hidden" name="object_guid" value="<?php echo $object_guid; ?>" /> <?php } - ?> -<input type="submit" class="submit-button" value="<?php echo elgg_echo("save"); ?>" /> + echo elgg_view('input/submit', array('value' => elgg_echo('save'))); +?> + </form> diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php index 386e7edcb..bb207d33c 100644 --- a/mod/riverdashboard/views/default/riverdashboard/css.php +++ b/mod/riverdashboard/views/default/riverdashboard/css.php @@ -103,7 +103,7 @@ #profile-content .river-comment-form.hidden .input-text { /* when activity is displayed on profile page */ width:535px; } -.river-comment-form.hidden .submit-button { +.river-comment-form.hidden .elgg-submit-button { margin:0 0 0 10px; float:right; } diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php index ad3d0ad96..60a1e3f86 100644 --- a/views/default/admin/components/plugin.php +++ b/views/default/admin/components/plugin.php @@ -50,10 +50,10 @@ if ($vars['order'] < $vars['maxorder']) { if ($active) { $url = elgg_get_site_url()."action/admin/plugins/disable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; - $enable_disable = '<a class="cancel-button" href="' . elgg_format_url($url) . '">' . elgg_echo('disable') . '</a>'; + $enable_disable = '<a class="elgg-cancel-button" href="' . elgg_format_url($url) . '">' . elgg_echo('disable') . '</a>'; } else { $url = elgg_get_site_url()."action/admin/plugins/enable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; - $enable_disable = '<a class="submit-button" href="' . elgg_format_url($url) . '">' . elgg_echo('enable') . '</a>'; + $enable_disable = '<a class="elgg-submit-button" href="' . elgg_format_url($url) . '">' . elgg_echo('enable') . '</a>'; } diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 38a521293..8b801ed1d 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -76,7 +76,7 @@ $(document).ready(function() { $('input.username').focus(); // add cancel button to inline register form - $('#registration_form').find('input.submit-button').after("<input class='elgg-action-button disabled cancel_request' type='reset' value='Cancel'>"); + $('#registration_form').find('input.elgg-submit-button').after("<input class='elgg-action-button 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 3bbe4ffe2..da647b0ac 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="submit-button" value="<?php echo elgg_echo('save'); ?>" /> - <input type="button" class="cancel-button" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" /> + <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();" /> <br /></div> </form> diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 0c8c37cb4..c73bbfe42 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -237,7 +237,7 @@ table.mceLayout { float:right; margin-left:14px; } -.admin_area .submit-button { +.admin_area .elgg-submit-button { font-size: 14px; font-weight: bold; color: white; @@ -257,7 +257,7 @@ table.mceLayout { -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 .submit-button:hover { +.admin_area .elgg-submit-button:hover { color: white; border-color: #333333; text-decoration:none; @@ -301,7 +301,7 @@ table.mceLayout { background-repeat: repeat-x; background-position: left 10px; } -.admin_area .cancel-button { +.admin_area .elgg-cancel-button { font-size: 14px; font-weight: bold; text-decoration:none; @@ -318,7 +318,7 @@ table.mceLayout { margin:10px 0 10px 10px; cursor: pointer; } -.admin_area .cancel-button:hover { +.admin_area .elgg-cancel-button:hover { background-color: #999999; background-position: left 10px; text-decoration:none; @@ -546,7 +546,7 @@ table.mceLayout { float: left; width: 150px; } -form.admin_plugins_simpleview .submit-button { +form.admin_plugins_simpleview .elgg-submit-button { margin-right:20px; } .plugin_info { diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 603a128b7..698d5fdf3 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -67,7 +67,7 @@ a.longtext-control { float:right; margin-left:14px; } -.submit-button { +.elgg-submit-button { font-size: 14px; font-weight: bold; color: white; @@ -87,7 +87,7 @@ a.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); } -.submit-button:hover { +.elgg-submit-button:hover { color: white; border-color: #0054a7; text-decoration:none; @@ -96,12 +96,12 @@ a.longtext-control { background-repeat: repeat-x; background-position: left 10px; } -.submit-button.disabled { +.elgg-submit-button.disabled { background-color:#999999; border-color:#999999; color:#dedede; } -.submit-button.disabled:hover { +.elgg-submit-button.disabled:hover { background-color:#999999; border-color:#999999; color:#dedede; @@ -141,7 +141,7 @@ input[type="submit"]:hover { background-repeat: repeat-x; background-position: left 10px; } -.cancel-button { +.elgg-cancel-button { font-size: 14px; font-weight: bold; text-decoration:none; @@ -158,7 +158,7 @@ input[type="submit"]:hover { margin:10px 0 10px 10px; cursor: pointer; } -.cancel-button:hover { +.elgg-cancel-button:hover { background-color: #999999; background-position: left 10px; text-decoration:none; diff --git a/views/default/css/screen.php b/views/default/css/screen.php index 16529004f..3eb7e93a0 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -371,7 +371,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { font-weight:normal; font-size:100%; } -.loginbox .submit-button { +.loginbox .elgg-submit-button { margin-right: 15px; } #login .persistent-login { @@ -467,7 +467,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { font-weight:normal; font-size: 100%; } -#login-dropdown #signin-menu .submit-button { +#login-dropdown #signin-menu .elgg-submit-button { margin-right:15px; } @@ -744,8 +744,8 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { .friends-picker-navigation-r:hover { background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px; } -.friendspicker-savebuttons .submit-button, -.friendspicker-savebuttons .cancel-button { +.friendspicker-savebuttons .elgg-submit-button, +.friendspicker-savebuttons .elgg-cancel-button { margin:5px 20px 5px 5px; } #collectionMembersTable { diff --git a/views/default/input/button.php b/views/default/input/button.php index 1c8bdaf3c..8e58b7618 100644 --- a/views/default/input/button.php +++ b/views/default/input/button.php @@ -12,7 +12,7 @@ global $CONFIG; $defaults = array( 'type' => 'button', - 'class' => 'submit-button', + 'class' => 'elgg-submit-button', ); $vars = array_merge($defaults, $vars); diff --git a/views/installation/input/button.php b/views/installation/input/button.php index 759752c8c..76cf5afa1 100644 --- a/views/installation/input/button.php +++ b/views/installation/input/button.php @@ -19,7 +19,7 @@ global $CONFIG; $class = $vars['class']; if (!$class) { - $class = "submit-button"; + $class = "elgg-submit-button"; } if (isset($vars['type'])) { |