diff options
Diffstat (limited to 'views/default')
35 files changed, 122 insertions, 122 deletions
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php index 157104b2d..b0a48cf35 100644 --- a/views/default/account/forms/register.php +++ b/views/default/account/forms/register.php @@ -22,11 +22,11 @@ if ($loggedin_user && $loggedin_user->isAdmin() && isset($vars['show_admin'])) { $admin_option = true; } -$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input_text name", 'value' => $name)) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input_text", 'value' => $email)) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input_text", 'value' => $username)) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input_password")) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input_password")) . "</label></p>"; +$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input-text name", 'value' => $name)) . "</label></p>"; +$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input-text", 'value' => $email)) . "</label></p>"; +$form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input-text", 'value' => $username)) . "</label></p>"; +$form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input-password")) . "</label></p>"; +$form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input-password")) . "</label></p>"; // view to extend to add more fields to the registration form $form_body .= elgg_view('register/extend'); diff --git a/views/default/account/login_walled_garden.php b/views/default/account/login_walled_garden.php index f97e8c731..e24c80f78 100644 --- a/views/default/account/login_walled_garden.php +++ b/views/default/account/login_walled_garden.php @@ -57,7 +57,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='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='action-button disabled cancel_request' type='reset' value='Cancel'></p>"; ?> <div id="lostpassword_form" class="hidden clearfix"> @@ -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='action_button disabled cancel_request' type='reset' value='Cancel'>"); + $('#registration_form').find('input.submit-button').after("<input class='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/admin/components/plugin.php b/views/default/admin/components/plugin.php index 013f0cd07..ad3d0ad96 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="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="submit-button" href="' . elgg_format_url($url) . '">' . elgg_echo('enable') . '</a>'; } diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php index e96f77635..4e32b0e14 100644 --- a/views/default/admin/components/plugin_settings.php +++ b/views/default/admin/components/plugin_settings.php @@ -12,7 +12,7 @@ $plugin_info = load_plugin_manifest($plugin); $form_body = elgg_view("settings/{$plugin}/edit", $vars); $form_body .= elgg_view('input/hidden', array('internalname' => 'plugin', 'value' => $plugin)); $form_body .= "<div class='divider'></div>" . elgg_view('input/submit', array('value' => elgg_echo('save'))); -$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'action_button disabled')); +$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'action-button disabled')); echo elgg_view_title($plugin_info['name']); diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php index dc5846108..ee4366679 100644 --- a/views/default/admin/plugins/advanced.php +++ b/views/default/admin/plugins/advanced.php @@ -45,7 +45,7 @@ $category_pulldown = elgg_view('input/pulldown', array( $category_button = elgg_view('input/submit', array( 'value' => elgg_echo('filter'), - 'class' => 'action_button' + 'class' => 'action-button' )); $category_form = elgg_view('input/form', array( @@ -57,7 +57,7 @@ $title = elgg_view_title(elgg_echo('admin:plugins')); // @todo Until "en/disable all" means "All plugins on this page" hide when not looking at all. if (!isset($show_category) || empty($show_category)) { - $buttons = "<a class='action_button' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a> <a class='action_button disabled' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> "; + $buttons = "<a class='action-button' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a> <a class='action-button disabled' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> "; $buttons .= "<br /><br />"; } else { $buttons = ''; diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php index 9b9897944..8a269c43b 100644 --- a/views/default/admin/plugins/simple.php +++ b/views/default/admin/plugins/simple.php @@ -85,7 +85,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' => 'action_button disabled')); +$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'action-button disabled')); echo elgg_view('input/form', array( 'action' => "action/admin/plugins/simple_update_states", diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index b2487e1ef..f016609e2 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -22,7 +22,7 @@ $owner = get_user($vars['annotation']->owner_guid); // if the user looking at the comment can edit, show the delete link if ($vars['annotation']->canEdit()) { ?> - <span class="delete_button"> + <span class="delete-button"> <?php echo elgg_view("output/confirmlink",array( 'href' => "action/comments/delete?annotation_id=" . $vars['annotation']->id, 'text' => elgg_echo('delete'), diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php index cfa7e47e0..6538e65dc 100644 --- a/views/default/annotation/likes.php +++ b/views/default/annotation/likes.php @@ -21,7 +21,7 @@ $owner = get_user($vars['annotation']->owner_guid); // if the user looking at the like listing can edit, show the delete link if ($vars['annotation']->canEdit()) { ?> - <div class="entity_metadata"><span class="delete_button"> + <div class="entity_metadata"><span class="delete-button"> <?php echo elgg_view("output/confirmlink",array( 'href' => "action/likes/delete?annotation_id=" . $vars['annotation']->id, 'text' => elgg_echo('remove'), diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 1cc97f54c..af2a16f55 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -328,13 +328,13 @@ table.mceLayout { font-size:100%; font-weight:normal; } -.admin_area .input_textarea { +.admin_area .input-textarea { width:98%; } .admin_area form#plugin_settings { margin-top: 10px; } -.admin_area form#plugin_settings .action_button.disabled { +.admin_area form#plugin_settings .action-button.disabled { margin-top:10px; float:right; } @@ -344,24 +344,24 @@ table.mceLayout { GENERAL FORM ELEMENTS *************************************** */ /* default elgg core input field classes */ -.admin_area .input_text, -.admin_area .input_tags, -.admin_area .input_url, -.admin_area .input_textarea { +.admin_area .input-text, +.admin_area .input-tags, +.admin_area .input-url, +.admin_area .input-textarea { width:98%; } -.admin_area .input_access { +.admin_area .input-access { margin:5px 0 0 0; } -.admin_area .input_password { +.admin_area .input-password { width:200px; } -.admin_area .input_textarea { +.admin_area .input-textarea { height: 200px; width:718px; } .admin_area input[type="checkbox"], -.admin_area input.input_radio { +.admin_area input.input-radio { margin:0 3px 0 0; padding:0; border:none; @@ -393,15 +393,15 @@ table.mceLayout { background: #f5f5f5; color:#333333; } -.admin_area .input_textarea.monospace { +.admin_area .input-textarea.monospace { font-family:Monaco,"Courier New",Courier,monospace; font-size:13px; } -.admin_area a.longtext_control { +.admin_area a.longtext-control { float:right; margin-left:14px; } -.admin_area .submit_button { +.admin_area .submit-button { font-size: 14px; font-weight: bold; color: white; @@ -421,7 +421,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 .submit-button:hover { color: white; border-color: #333333; text-decoration:none; @@ -465,7 +465,7 @@ table.mceLayout { background-repeat: repeat-x; background-position: left 10px; } -.admin_area .cancel_button { +.admin_area .cancel-button { font-size: 14px; font-weight: bold; text-decoration:none; @@ -482,18 +482,18 @@ table.mceLayout { margin:10px 0 10px 10px; cursor: pointer; } -.admin_area .cancel_button:hover { +.admin_area .cancel-button:hover { background-color: #999999; background-position: left 10px; text-decoration:none; color:white; } -.admin_area .content_header_options .action_button { +.admin_area .content_header_options .action-button { margin-top:0; margin-left:10px; } -.admin_area input.action_button, -.admin_area a.action_button { +.admin_area input.action-button, +.admin_area a.action-button { -webkit-border-radius: 5px; -moz-border-radius: 5px; background-color:#cccccc; @@ -511,10 +511,10 @@ table.mceLayout { -webkit-box-shadow: none; -moz-box-shadow: none; } -.admin_area input.action_button:hover, -.admin_area a.action_button:hover, -.admin_area input.action_button:focus, -.admin_area a.action_button:focus { +.admin_area input.action-button:hover, +.admin_area a.action-button:hover, +.admin_area input.action-button:focus, +.admin_area a.action-button:focus { background-position:0 -15px; background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); background-repeat: repeat-x; @@ -523,33 +523,33 @@ table.mceLayout { background-color:#cccccc; border:1px solid #999999; } -.admin_area .action_button:active { +.admin_area .action-button:active { background-image:none; } -.admin_area .action_button.disabled { +.admin_area .action-button.disabled { color:#999999; padding:2px 7px 2px 7px; } -.admin_area .action_button.disabled:hover { +.admin_area .action-button.disabled:hover { background-position:0 -15px; color:#111111; border:1px solid #999999; } -.admin_area .action_button.disabled:active { +.admin_area .action-button.disabled:active { background-image:none; } -.admin_area .action_button.download { +.admin_area .action-button.download { padding: 5px 9px 5px 6px; } -.admin_area .action_button.download:hover { +.admin_area .action-button.download:hover { } -.admin_area .action_button.download img { +.admin_area .action-button.download img { margin-right:6px; position:relative; top:5px; } -.admin_area .action_button.small { +.admin_area .action-button.small { -webkit-border-radius: 3px; -moz-border-radius: 3px; width: auto; @@ -558,7 +558,7 @@ table.mceLayout { font-size: 0.9em; line-height: 0.6em; } -.admin_area .action_button.small:hover { +.admin_area .action-button.small:hover { background-color: #0054A7; background-image: none; border-color: #0054A7; @@ -596,7 +596,7 @@ table.mceLayout { .content_header_options { float:right; } -.content_header_options .action_button { +.content_header_options .action-button { float:right; margin:0 0 5px 10px; } @@ -710,7 +710,7 @@ table.mceLayout { float: left; width: 150px; } -form.admin_plugins_simpleview .submit_button { +form.admin_plugins_simpleview .submit-button { margin-right:20px; } .plugin_info { @@ -758,7 +758,7 @@ ul.admin_plugins { .configure_menuitems { margin-bottom:30px; } -.admin_settings.menuitems .input_pulldown { +.admin_settings.menuitems .input-pulldown { margin-right:15px; margin-bottom:10px; } diff --git a/views/default/css/components/forms.php b/views/default/css/components/forms.php index 344ae7d86..c9e85e5a3 100644 --- a/views/default/css/components/forms.php +++ b/views/default/css/components/forms.php @@ -10,24 +10,24 @@ Form Elements *************************************** */ /* default elgg core input field classes */ -.input_text, -.input_tags, -.input_url, -.input_textarea { +.input-text, +.input-tags, +.input-url, +.input-textarea { width:98%; } -.input_access { +.input-access { margin:5px 0 0 0; } -.input_password { +.input-password { width:200px; } -.input_textarea { +.input-textarea { height: 200px; width:718px; } input[type="checkbox"], -input.input_radio { +input.input-radio { margin:0 3px 0 0; padding:0; border:none; @@ -59,15 +59,15 @@ input[type="text"]:focus { background: #e4ecf5; color:#333333; } -.input_textarea.monospace { +.input-textarea.monospace { font-family:Monaco,"Courier New",Courier,monospace; font-size:13px; } -a.longtext_control { +a.longtext-control { float:right; margin-left:14px; } -.submit_button { +.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 { +.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 { +.submit-button.disabled { background-color:#999999; border-color:#999999; color:#dedede; } -.submit_button.disabled:hover { +.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 { +.cancel-button { font-size: 14px; font-weight: bold; text-decoration:none; @@ -158,14 +158,14 @@ input[type="submit"]:hover { margin:10px 0 10px 10px; cursor: pointer; } -.cancel_button:hover { +.cancel-button:hover { background-color: #999999; background-position: left 10px; text-decoration:none; color:white; } -input.action_button, -a.action_button { +input.action-button, +a.action-button { -webkit-border-radius: 5px; -moz-border-radius: 5px; background-color:#cccccc; @@ -183,10 +183,10 @@ a.action_button { -webkit-box-shadow: none; -moz-box-shadow: none; } -input.action_button:hover, -a.action_button:hover, -input.action_button:focus, -a.action_button:focus { +input.action-button:hover, +a.action-button:hover, +input.action-button:focus, +a.action-button:focus { background-position:0 -15px; background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); background-repeat: repeat-x; @@ -195,33 +195,33 @@ a.action_button:focus { background-color:#cccccc; border:1px solid #999999; } -.action_button:active { +.action-button:active { background-image:none; } -.action_button.disabled { +.action-button.disabled { color:#999999; padding:2px 7px 2px 7px; } -.action_button.disabled:hover { +.action-button.disabled:hover { background-position:0 -15px; color:#111111; border:1px solid #999999; } -.action_button.disabled:active { +.action-button.disabled:active { background-image:none; } -.action_button.download { +.action-button.download { padding: 5px 9px 5px 6px; } -.action_button.download:hover { +.action-button.download:hover { } -.action_button.download img { +.action-button.download img { margin-right:6px; position:relative; top:5px; } -.action_button.small { +.action-button.small { -webkit-border-radius: 3px; -moz-border-radius: 3px; width: auto; @@ -230,7 +230,7 @@ a.action_button:focus { font-size: 0.9em; line-height: 0.6em; } -.action_button.small:hover { +.action-button.small:hover { background-color: #4690d6; background-image: none; border-color: #4690d6; @@ -238,13 +238,13 @@ a.action_button:focus { text-shadow:0 -1px 0 black; } /* small round delete button */ -.delete_button { +.delete-button { width:14px; height:14px; margin:0; float:right; } -.delete_button a { +.delete-button a { display:block; cursor: pointer; width:14px; @@ -253,6 +253,6 @@ a.action_button:focus { text-indent: -9000px; text-align: left; } -.delete_button a:hover { +.delete-button a:hover { background-position: -200px -16px; } diff --git a/views/default/css/ie.php b/views/default/css/ie.php index d22417ada..95f2d34a9 100644 --- a/views/default/css/ie.php +++ b/views/default/css/ie.php @@ -26,11 +26,11 @@ .likes_list {display:none;} .likes_list_holder .likes_list {top:20px !important;} /* position likes list below link in IE to prevent clipping */ -.elgg_likes_user .entity_metadata .delete_button {float:none;} +.elgg_likes_user .entity_metadata .delete-button {float:none;} /* profile */ .elgg_horizontal_tabbed_nav.profile .profile_name {margin-left: -260px;} -#profile_content .river_comment_form.hidden .input_text { width:510px; } +#profile_content .river_comment_form.hidden .input-text { width:510px; } /* notifications */ .friends_picker_navigation {margin:0;padding:0;} @@ -54,7 +54,7 @@ #riverdashboard_updates {clear:both;} #riverdashboard_updates a.update_link {margin:0 0 9px 0;} .riverdashboard_filtermenu {margin:10px 0 0 0;} -.river_comment_form.hidden .input_text { +.river_comment_form.hidden .input-text { width:530px; float:left; } diff --git a/views/default/css/ie6.php b/views/default/css/ie6.php index 57890e62d..943b94e32 100644 --- a/views/default/css/ie6.php +++ b/views/default/css/ie6.php @@ -12,5 +12,5 @@ .navigation li.navigation_more ul li a {width:150px;background-color: #dedede;} /* @todo check this one */ -.delete_button a { background-position-y: 2px; } -.delete_button a:hover { background-position-y: -14px; }
\ No newline at end of file +.delete-button a { background-position-y: 2px; } +.delete-button a:hover { background-position-y: -14px; }
\ No newline at end of file diff --git a/views/default/css/screen.php b/views/default/css/screen.php index 9221d810f..59016b777 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -963,7 +963,7 @@ a.widget_edit_button:hover, a.widget_delete_button:hover { font-weight:normal; font-size:100%; } -.loginbox .submit_button { +.loginbox .submit-button { margin-right: 15px; } #login .persistent_login { @@ -1059,7 +1059,7 @@ a.widget_edit_button:hover, a.widget_delete_button:hover { font-weight:normal; font-size: 100%; } -#login_dropdown #signin_menu .submit_button { +#login_dropdown #signin_menu .submit-button { margin-right:15px; } @@ -1091,7 +1091,7 @@ a.widget_edit_button:hover, a.widget_delete_button:hover { .content_header_options { float:right; } -.content_header_options .action_button { +.content_header_options .action-button { float:right; margin:0 0 5px 10px; } @@ -1218,7 +1218,7 @@ a.widget_edit_button:hover, a.widget_delete_button:hover { .entity_metadata .entity_edit a:hover { color:#555555; } -.entity_metadata .delete_button { +.entity_metadata .delete-button { margin-top:3px; } /* override hover for lists of site users/members */ @@ -1391,8 +1391,8 @@ a.widget_edit_button:hover, a.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 .submit-button, +.friendspicker_savebuttons .cancel-button { margin:5px 20px 5px 5px; } #collectionMembersTable { @@ -1476,7 +1476,7 @@ p.elgg_likes_owner { margin-top:5px; border-bottom:1px solid #cccccc; } -.user_picker_entry .delete_button { +.user_picker_entry .delete-button { margin-right:10px; } diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php index 6a9551732..f348b754d 100644 --- a/views/default/friends/picker.php +++ b/views/default/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="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();" /> <br /></div> </form> diff --git a/views/default/input/access.php b/views/default/input/access.php index b7273acb1..d4f366363 100644 --- a/views/default/input/access.php +++ b/views/default/input/access.php @@ -14,7 +14,7 @@ * */ -$class = "input_access"; +$class = "input-access"; if (isset($vars['class'])) { $class = $vars['class']; } diff --git a/views/default/input/button.php b/views/default/input/button.php index 1be03e3eb..1c8bdaf3c 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' => 'submit-button', ); $vars = array_merge($defaults, $vars); diff --git a/views/default/input/checkbox.php b/views/default/input/checkbox.php index e70064ddb..59af3216f 100644 --- a/views/default/input/checkbox.php +++ b/views/default/input/checkbox.php @@ -15,7 +15,7 @@ */ $defaults = array( - 'class' => 'input_checkbox', + 'class' => 'input-checkbox', ); $vars = array_merge($defaults, $vars); diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php index 94f01867c..4abeabf58 100644 --- a/views/default/input/checkboxes.php +++ b/views/default/input/checkboxes.php @@ -29,7 +29,7 @@ if (!isset($vars['value']) || $vars['value'] === FALSE) { $vars['value'] = elgg_get_sticky_value($vars['internalname']); } -$class = (isset($vars['class'])) ? $vars['class'] : 'input_checkboxes'; +$class = (isset($vars['class'])) ? $vars['class'] : 'input-checkboxes'; $value = (isset($vars['value'])) ? $vars['value'] : NULL; $value_array = (is_array($value)) ? array_map('strtolower', $value) : array(strtolower($value)); $internalname = (isset($vars['internalname'])) ? $vars['internalname'] : ''; diff --git a/views/default/input/email.php b/views/default/input/email.php index 81e617476..c973ff7e4 100644 --- a/views/default/input/email.php +++ b/views/default/input/email.php @@ -8,7 +8,7 @@ */ $defaults = array( - 'class' => 'input_text', //@todo input_email? + 'class' => 'input-text', //@todo input-email? 'disabled' => FALSE, ); diff --git a/views/default/input/file.php b/views/default/input/file.php index bf9101991..8f0461083 100644 --- a/views/default/input/file.php +++ b/views/default/input/file.php @@ -19,7 +19,7 @@ if (!empty($vars['value'])) { echo elgg_echo('fileexists') . "<br />"; } -$class = "input_file"; +$class = "input-file"; if (isset($vars['class'])) { $class = $vars['class']; } diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php index 6fe2c9e8e..d784c6014 100644 --- a/views/default/input/longtext.php +++ b/views/default/input/longtext.php @@ -14,7 +14,7 @@ * @uses $vars['disabled'] Is the input field disabled? */ -$class = "input_textarea"; +$class = "input-textarea"; if (isset($vars['class'])) { $class = $vars['class']; } diff --git a/views/default/input/password.php b/views/default/input/password.php index 90864a4a7..0d1523977 100644 --- a/views/default/input/password.php +++ b/views/default/input/password.php @@ -14,7 +14,7 @@ $class = $vars['class']; if (!$class) { - $class = "input_password"; + $class = "input-password"; } ?> diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php index cf798e4d8..e2b8c5ed2 100644 --- a/views/default/input/plaintext.php +++ b/views/default/input/plaintext.php @@ -14,7 +14,7 @@ $class = $vars['class']; if (!$class) { - $class = "input_textarea"; + $class = "input-textarea"; } if (!isset($vars['value']) || $vars['value'] === FALSE) { diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php index 7eb9456b4..f789d1020 100644 --- a/views/default/input/pulldown.php +++ b/views/default/input/pulldown.php @@ -18,7 +18,7 @@ $class = $vars['class']; if (!$class) { - $class = "input_pulldown"; + $class = "input-pulldown"; } if (!isset($vars['value'])) { diff --git a/views/default/input/radio.php b/views/default/input/radio.php index 82c49fea4..0a5885f8b 100644 --- a/views/default/input/radio.php +++ b/views/default/input/radio.php @@ -15,7 +15,7 @@ $class = $vars['class']; if (!$class) { - $class = "input_radio"; + $class = "input-radio"; } if (!isset($vars['value']) || $vars['value'] === FALSE) { diff --git a/views/default/input/tags.php b/views/default/input/tags.php index 1cafb7904..6ce074a2a 100644 --- a/views/default/input/tags.php +++ b/views/default/input/tags.php @@ -8,7 +8,7 @@ */ $defaults = array( - 'class' => 'input_tags', + 'class' => 'input-tags', 'disabled' => FALSE, ); diff --git a/views/default/input/text.php b/views/default/input/text.php index 3e8de2c35..9f3076ed3 100644 --- a/views/default/input/text.php +++ b/views/default/input/text.php @@ -8,7 +8,7 @@ */ $defaults = array( - 'class' => 'input_text', + 'class' => 'input-text', 'disabled' => FALSE, ); diff --git a/views/default/input/url.php b/views/default/input/url.php index 29f5edb30..fddf44a5b 100644 --- a/views/default/input/url.php +++ b/views/default/input/url.php @@ -8,7 +8,7 @@ */ $defaults = array( - 'class' => 'input_url', + 'class' => 'input-url', ); $vars = array_merge($defaults, $vars); diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php index fb98afc97..74ec10818 100644 --- a/views/default/input/userpicker.php +++ b/views/default/input/userpicker.php @@ -31,7 +31,7 @@ function user_picker_add_user($user_id) { $code = '<li class="user_picker_entry">'; $code .= "<img class=\"livesearch_icon\" src=\"$icon\" />"; $code .= "$user->name - $user->username"; - $code .= '<div class="delete_button">'; + $code .= '<div class="delete-button">'; $code .= "<a onclick=\"userPickerRemoveUser(this, $user_id)\"><strong>X</strong></a>"; $code .= '</div>'; $code .= "<input type=\"hidden\" name=\"members[]\" value=\"$user_id\">"; @@ -145,7 +145,7 @@ function userPickerAddUser(event, data, formatted) { var formatted = userPickerFormatItem(data); // add guid as hidden input and to list. - var li = formatted + ' <div class="delete_button"><a onclick="userPickerRemoveUser(this, ' + info.guid + ')"><strong>X</strong></a></div>' + var li = formatted + ' <div class="delete-button"><a onclick="userPickerRemoveUser(this, ' + info.guid + ')"><strong>X</strong></a></div>' + '<input type="hidden" name="' + internalName + '[]" value="' + info.guid + '" />'; $('<li class="user_picker_entry">').html(li).appendTo(users); diff --git a/views/default/js/upload_js.php b/views/default/js/upload_js.php index 83530d67a..cdd011729 100644 --- a/views/default/js/upload_js.php +++ b/views/default/js/upload_js.php @@ -45,7 +45,7 @@ function file_addtoform() { var o,el; o = document.getElementById('option_container'); title_label = "<?php echo elgg_echo("title"); ?>"; - bit = file_generate_bit(title_label,'title_','input_text','text',0); + bit = file_generate_bit(title_label,'title_','input-text','text',0); o.appendChild(bit); file_label = "<?php echo elgg_echo("file:file"); ?>"; bit = file_generate_bit(file_label,'upload_','input-file','file',30); diff --git a/views/default/layouts/widgets.php b/views/default/layouts/widgets.php index 4b097dcf6..afb44f551 100644 --- a/views/default/layouts/widgets.php +++ b/views/default/layouts/widgets.php @@ -19,7 +19,7 @@ $widgets = elgg_get_widgets($owner->guid, $context); if (elgg_can_edit_widget_layout($context)) { if ($show_add_widgets) { - echo elgg_view('widgets/add_button'); + echo elgg_view('widgets/add-button'); } $params = array( 'widgets' => $widgets, diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php index 4d382b9f5..f10d8b7ad 100644 --- a/views/default/page_elements/content_header.php +++ b/views/default/page_elements/content_header.php @@ -70,10 +70,10 @@ if (isloggedin()) { // @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='action_button'>" . elgg_echo('videolist:browsemenu') . '</a>'; + $new_button = "<a href=\"{$video_link}\" class='action-button'>" . 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='action_button'>" . elgg_echo($type . ':new') . '</a>'; + $new_button = "<a href=\"{$new_link}\" class='action-button'>" . elgg_echo($type . ':new') . '</a>'; } $new_button = "<div class='content_header_options'>$new_button</div>"; } diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php index cdd3982ec..7d96c80d8 100644 --- a/views/default/page_shells/walled_garden.php +++ b/views/default/page_shells/walled_garden.php @@ -128,10 +128,10 @@ body {background: white;} -moz-box-shadow: none; box-shadow: none; } -.walledgardenlogin .input_password { +.walledgardenlogin .input-password { width:200px; } -.walledgardenlogin input.input_password:focus { +.walledgardenlogin input.input-password:focus { border: solid 1px #4690d6; background-color: #e4ecf5; color:#333333; diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php index 05cef83d2..2e3526aa3 100644 --- a/views/default/usersettings/form.php +++ b/views/default/usersettings/form.php @@ -5,6 +5,6 @@ */ $form_body = elgg_view("usersettings/user"); -$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit_button usersettings_save')); +$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit-button usersettings_save')); echo elgg_view('input/form', array('action' => "action/usersettings/save", 'body' => $form_body));
\ No newline at end of file diff --git a/views/default/widgets/add_button.php b/views/default/widgets/add_button.php index 2957513b6..dc84528f2 100644 --- a/views/default/widgets/add_button.php +++ b/views/default/widgets/add_button.php @@ -6,7 +6,7 @@ $options = array( 'href' => '#', 'text' => elgg_echo('widgets:add'), - 'class' => 'action_button', + 'class' => 'action-button', ); echo elgg_view('output/url', $options); ?> |