diff options
90 files changed, 206 insertions, 206 deletions
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php index 7578f5955..d9e565ee6 100644 --- a/mod/blog/views/default/blog/css.php +++ b/mod/blog/views/default/blog/css.php @@ -37,7 +37,7 @@ } /* blogs edit/create form */ -form#blog_post_edit .submit_button { +form#blog_post_edit .submit-button { margin-right:15px; } /* force tinymce input height for a more useful editing / blog creation area */ diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php index 60012dac6..5da9c3cd1 100644 --- a/mod/blog/views/default/blog/forms/edit.php +++ b/mod/blog/views/default/blog/forms/edit.php @@ -68,7 +68,7 @@ if (isset ($vars['entity'])) { $delete_link = elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), - 'class' => 'action_button disabled' + 'class' => 'action-button disabled' )); } diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 7f91ae608..91fc7f594 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -52,7 +52,7 @@ if ($blog->canEdit()) { $edit_link = "<span class='entity_edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>'; $delete_url = "action/blog/delete?guid={$blog->getGUID()}"; - $delete_link = "<span class='delete_button'>" . elgg_view('output/confirmlink', array( + $delete_link = "<span class='delete-button'>" . elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm') diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 09d91a3c3..7438f1570 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -59,7 +59,7 @@ if (@file_exists($faviconurl)) { //delete if($vars['entity']->canEdit()){ - $delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array( + $delete .= "<span class='delete-button'>" . elgg_view('output/confirmlink',array( 'href' => "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid, 'text' => elgg_echo("delete"), 'confirm' => elgg_echo("bookmarks:delete:confirm"), diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php index e63e84a79..0e2519690 100644 --- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php +++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php @@ -262,7 +262,7 @@ $(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" /> +<input type="submit" value="<?php echo elgg_echo('save'); ?>" class="submit-button" /> </form> </div><!-- /customise_editpanel --> diff --git a/mod/ecml/views/default/ecml/input_ext.php b/mod/ecml/views/default/ecml/input_ext.php index f9ab942e0..045f30288 100644 --- a/mod/ecml/views/default/ecml/input_ext.php +++ b/mod/ecml/views/default/ecml/input_ext.php @@ -7,4 +7,4 @@ $docs_href = elgg_get_site_url()."pg/ecml"; ?> -<a href="<?php echo $docs_href; ?>" class="longtext_control" title="<?php echo elgg_echo('ecml:help'); ?>" target="_new"><img src="<?php echo elgg_get_site_url(); ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ No newline at end of file +<a href="<?php echo $docs_href; ?>" class="longtext-control" title="<?php echo elgg_echo('ecml:help'); ?>" target="_new"><img src="<?php echo elgg_get_site_url(); ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ No newline at end of file diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php index b609db448..4697eedab 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' => 'submit-button disabled', 'disabled' => TRUE )); diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php index 1fed16080..559cd456d 100644 --- a/mod/embed/views/default/embed/css.php +++ b/mod/embed/views/default/embed/css.php @@ -114,8 +114,8 @@ } /* input field classes */ -#facebox .content .input_text, -#facebox .content .input_tags { +#facebox .content .input-text, +#facebox .content .input-tags { font: 120% Arial, Helvetica, sans-serif; padding: 5px; border: 1px solid #cccccc; @@ -127,13 +127,13 @@ -moz-box-shadow: none; box-shadow: none; } -#facebox .content .input_text:focus, -#facebox .content .input_tags:focus { +#facebox .content .input-text:focus, +#facebox .content .input-tags:focus { border: solid 1px #4690d6; background: #e4ecf5; color:#333333; } -#facebox .content .input_file { +#facebox .content .input-file { background-color: white; } #facebox .content p { diff --git a/mod/embed/views/default/embed/link.php b/mod/embed/views/default/embed/link.php index e2c3b1bff..bb8f74b4c 100644 --- a/mod/embed/views/default/embed/link.php +++ b/mod/embed/views/default/embed/link.php @@ -11,4 +11,4 @@ if (is_plugin_enabled('ecml')) { } ?> -<a class="longtext_control small link" href="<?php echo elgg_get_site_url() . 'pg/embed'; ?>?<?php echo $active_section; ?>internal_name=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a> +<a class="longtext-control small link" href="<?php echo elgg_get_site_url() . 'pg/embed'; ?>?<?php echo $active_section; ?>internal_name=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a> diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index 054184c7b..3b9731ed6 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -138,7 +138,7 @@ ?> - <div class="filerepo_download"><p><a class="action_button small" href="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("file:download"); ?></a></p></div> + <div class="filerepo_download"><p><a class="action-button small" href="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("file:download"); ?></a></p></div> <?php diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php index 72e66480b..af8c0a447 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'); ?>" /> + <input type="submit" class="submit-button" value="<?php echo 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 1426385ed..6321a9536 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'); ?>" /> + <input type="submit" class="submit-button" value="<?php echo 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 a78e0b982..32e9f6ff3 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -140,7 +140,7 @@ if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0) <?php } ?> - <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" /> + <input type="submit" class="submit-button" value="<?php echo elgg_echo("save"); ?>" /> </p> @@ -156,7 +156,7 @@ if ($vars['entity']) { $warning = elgg_echo("groups:deletewarning"); ?> <input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" /> - <input type="submit" class="action_button disabled" name="delete" value="<?php echo elgg_echo('groups:delete'); ?>" onclick="javascript:return confirm('<?php echo $warning; ?>')"/><?php + <input type="submit" class="action-button 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/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php index fc4dd3b32..8cf2e4a76 100644 --- a/mod/groups/views/default/forum/maintopic.php +++ b/mod/groups/views/default/forum/maintopic.php @@ -25,7 +25,7 @@ // if comment owner, group owner, or site admin - display edit and delete options
if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
echo "<div class='entity_metadata'>";
- echo "<span class='delete_button'>".elgg_view("output/confirmlink",array(
+ echo "<span class='delete-button'>".elgg_view("output/confirmlink",array(
'href' => "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm')
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php index beab468a3..1426ba274 100644 --- a/mod/groups/views/default/forum/topics.php +++ b/mod/groups/views/default/forum/topics.php @@ -12,7 +12,7 @@ if(elgg_get_page_owner()->isMember(get_loggedin_user())) { ?> <div class="content_header_options"> - <a class="action_button" href="<?php echo elgg_get_site_url(); ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a> + <a class="action-button" href="<?php echo elgg_get_site_url(); ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a> </div> <?php } diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index a2333d02f..eb93c4bd9 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -34,8 +34,8 @@ /* group invitations */ -.group_invitations a.action_button, -.group_invitations a.submit_button { +.group_invitations a.action-button, +.group_invitations a.submit-button { float:right; margin:0 0 0 14px; } diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php index 44613c08d..436901368 100644 --- a/mod/groups/views/default/groups/groupprofile.php +++ b/mod/groups/views/default/groups/groupprofile.php @@ -52,7 +52,7 @@ $action_buttons = ''; if (!empty($actions)) { $action_buttons = '<div class="content_header_options">'; foreach ($actions as $url => $action) { - $action_buttons .= "<a class=\"action_button\" href=\"$url\">$action</a>"; + $action_buttons .= "<a class=\"action-button\" href=\"$url\">$action</a>"; } $action_buttons .= '</div>'; } diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index cf84a6ab0..4674a3c23 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="submit_button"><?php echo elgg_echo('accept'); ?></a> + <a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a> <?php - echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array( + echo str_replace('<a', '<a class="action-button 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 9a5163b1d..6cb5f75f6 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="submit_button"><?php echo elgg_echo('accept'); ?></a> + <a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a> <?php - echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array( + echo str_replace('<a', '<a class="action-button 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/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 4250e9aff..efa4dee79 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -59,7 +59,7 @@ if (elgg_get_context() == "search") { $info .= '</span>'; // display the delete link to those allowed to delete - $info .= '<span class="delete_button">' . elgg_view("output/confirmlink", array( + $info .= '<span class="delete-button">' . elgg_view("output/confirmlink", array( 'href' => "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php index 8bf397d54..f189d4525 100644 --- a/mod/invitefriends/views/default/invitefriends/formitems.php +++ b/mod/invitefriends/views/default/invitefriends/formitems.php @@ -17,13 +17,13 @@ if ($CONFIG->allow_registration) { <p class="margin_top"> <label> $introduction - <textarea class="input_textarea" name="emails" ></textarea> + <textarea class="input-textarea" name="emails" ></textarea> </label> </p> <p> <label> $message - <textarea class="input_textarea" name="emailmessage" >$default</textarea> + <textarea class="input-textarea" name="emailmessage" >$default</textarea> </label> </p> HTML; diff --git a/mod/messageboard/views/default/messageboard/forms/add.php b/mod/messageboard/views/default/messageboard/forms/add.php index d44e477bf..6003bade7 100644 --- a/mod/messageboard/views/default/messageboard/forms/add.php +++ b/mod/messageboard/views/default/messageboard/forms/add.php @@ -11,7 +11,7 @@ <form action="<?php echo elgg_get_site_url(); ?>action/messageboard/add" method="post" name="messageboardForm"> <!-- textarea for the contents --> - <textarea name="message_content" value="" class="input_textarea"></textarea><br /> + <textarea name="message_content" value="" class="input-textarea"></textarea><br /> <!-- the page owner, this will be the profile owner --> <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>" /> diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php index 8c1abb47b..2f85a16ac 100644 --- a/mod/messageboard/views/default/widgets/messageboard/content.php +++ b/mod/messageboard/views/default/widgets/messageboard/content.php @@ -43,7 +43,7 @@ if (isloggedin()) { <div id="mb_input_wrapper"><!-- start of mb_input_wrapper div --> <!-- message textarea --> - <textarea name="message_content" class="input_textarea"></textarea> + <textarea name="message_content" class="input-textarea"></textarea> <!-- the page owner, this will be the profile owner --> <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>" class="pageOwner" /> diff --git a/mod/messages/index.php b/mod/messages/index.php index 5b79a54ae..496a8ee9d 100644 --- a/mod/messages/index.php +++ b/mod/messages/index.php @@ -32,7 +32,7 @@ $messages = elgg_get_entities_from_metadata(array( // Set the page title $area2 = "<div id='content_header'><div class='content_header_title'>"; $area2 .= elgg_view_title(elgg_echo("messages:inbox"))."</div>"; -$area2 .= "<div class='content_header_options'><a class='action_button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>"; +$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>"; // Display them. The last variable 'page_view' is to allow the view page to know where this data is coming from, // in this case it is the inbox, this is necessary to ensure the correct display diff --git a/mod/messages/sent.php b/mod/messages/sent.php index 89771d6b7..7331a8d52 100644 --- a/mod/messages/sent.php +++ b/mod/messages/sent.php @@ -28,7 +28,7 @@ $messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', ' // Set the page title $area2 = "<div id='content_header'><div class='content_header_title'>"; $area2 .= elgg_view_title(elgg_echo("messages:sentmessages"))."</div>"; -$area2 .= "<div class='content_header_options'><a class='action_button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>"; +$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>"; // Set content $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset)); diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php index 95bcba108..b186400f8 100644 --- a/mod/messages/views/default/messages/css.php +++ b/mod/messages/views/default/messages/css.php @@ -74,7 +74,7 @@ a.privatemessages.new span { width:513px; padding-top:6px; } -.message .delete_button { +.message .delete-button { margin-top:3px; } .entity_listing.messages:hover { diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php index 998c0071f..15eb3ebd0 100644 --- a/mod/messages/views/default/messages/forms/reply.php +++ b/mod/messages/views/default/messages/forms/reply.php @@ -16,8 +16,8 @@ <?php echo elgg_view('action/securitytoken'); ?> <!-- populate the title space with the orginal message title, inserting re: before it --> - <p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input_text" value='<?php echo $reply_title; ?>' /></label></p> - <p><label><?php echo elgg_echo("messages:message"); ?>: <br /><textarea name='message' value='' class="input_textarea" /></textarea></label></p> + <p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p> + <p><label><?php echo elgg_echo("messages:message"); ?>: <br /><textarea name='message' value='' class="input-textarea" /></textarea></label></p> <p> <?php @@ -28,7 +28,7 @@ echo "<input type='hidden' name='send_to' value='BAAA" . $vars['entity']->fromId . "' />"; ?> - <input type="submit" class="submit_button" value="<?php echo 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 c77931454..43ece8d89 100644 --- a/mod/messages/views/default/messages/forms/send.php +++ b/mod/messages/views/default/messages/forms/send.php @@ -57,7 +57,7 @@ unset($_SESSION['msg_contents']); } ?> - <p class="margin_top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input_text" /></label></p> + <p class="margin_top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p> <p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( @@ -66,5 +66,5 @@ unset($_SESSION['msg_contents']); )); ?> </p> - <p><input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" /></p> + <p><input type="submit" class="submit-button" value="<?php echo 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 f8fce93a9..272ac91c6 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="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 4d593a621..6fc87ac0e 100644 --- a/mod/messages/views/default/messages/messages.php +++ b/mod/messages/views/default/messages/messages.php @@ -44,12 +44,12 @@ if (isloggedin()) <div id="content_header" class="clearfix"> <div class="content_header_title"><h2><?php echo $vars['entity']->title; ?></h2></div> <div class="content_header_options"> - <a class="action_button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a> + <a class="action-button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a> <?php echo elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), - 'class' => "action_button disabled" + 'class' => "action-button disabled" )); ?> </div> @@ -94,7 +94,7 @@ if (isloggedin()) <h2><?php echo elgg_echo('messages:answer'); ?></h2> <form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin_top" id="messages_send_form"> <?php echo elgg_view('input/securitytoken'); ?> - <p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input_text" value='<?php echo $reply_title; ?>' /></label></p> + <p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p> <p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( "internalname" => "message", @@ -108,7 +108,7 @@ if (isloggedin()) //pass along the owner of the message being replied to echo "<input type='hidden' name='send_to' value='" . $vars['entity']->fromId . "' />"; ?> - <input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" /> + <input type="submit" class="submit-button" value="<?php echo elgg_echo("messages:fly"); ?>" /> </form> </div> diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php index 65091689a..76fa4a00c 100644 --- a/mod/messages/views/default/messages/view.php +++ b/mod/messages/views/default/messages/view.php @@ -40,7 +40,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { // display message subject echo "<div class='message_subject'>"; // display delete button - echo "<span class='delete_button'>" . elgg_view("output/confirmlink", array( + echo "<span class='delete-button'>" . elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), @@ -75,7 +75,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) { // display message subject echo "<div class='message_subject'>"; //display the link to 'delete' - echo "<div class='delete_button'>" . elgg_view("output/confirmlink", array( + echo "<div class='delete-button'>" . elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index e866037cc..5c052b1c6 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -87,7 +87,7 @@ 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"); ?>" /> + <input type="submit" class="submit-button" value="<?php echo 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 625628639..883939fd4 100644 --- a/mod/pages/views/default/forms/pages/editwelcome.php +++ b/mod/pages/views/default/forms/pages/editwelcome.php @@ -51,5 +51,5 @@ $page_owner = $vars['owner']->guid; } ?> -<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" /> +<input type="submit" class="submit-button" value="<?php echo elgg_echo("save"); ?>" /> </form> diff --git a/mod/profile/views/default/admin/appearance/defaultprofile.php b/mod/profile/views/default/admin/appearance/defaultprofile.php index b935797fb..b63525bf1 100644 --- a/mod/profile/views/default/admin/appearance/defaultprofile.php +++ b/mod/profile/views/default/admin/appearance/defaultprofile.php @@ -30,7 +30,7 @@ $listing = elgg_view('profile/editdefaultprofileitems',array('items' => $items, $resetlisting = elgg_view('input/form', array ( - 'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action_button disabled')), + 'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action-button disabled')), 'action' => 'action/profile/editdefault/reset' ) ); diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php index 15cb2584e..a7a7ca14d 100644 --- a/mod/profile/views/default/profile/commentwall/commentwall_content.php +++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php @@ -15,7 +15,7 @@ <?php // if the user looking at the comment can edit, show the delete link if ($vars['annotation']->canEdit()) { - echo "<div class='entity_metadata'><span class='delete_button'>" . elgg_view("output/confirmlink",array( + echo "<div class='entity_metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array( 'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index 22ebaa8f1..d1941bbc8 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -135,7 +135,7 @@ img.medium { #owner_block .profile_actions { margin-top:10px; } -#owner_block .profile_actions a.action_button { +#owner_block .profile_actions a.action-button { margin-bottom:4px; display: table; } @@ -366,7 +366,7 @@ p.visit_twitter a { border-top: 1px solid #dedede; margin-top:30px; } -.default_profile_reset .action_button { +.default_profile_reset .action-button { float:right; } /* field re-order */ diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php index 5e9cef774..4ca723385 100644 --- a/mod/profile/views/default/profile/edit.php +++ b/mod/profile/views/default/profile/edit.php @@ -74,7 +74,7 @@ <p> <input type="hidden" name="username" value="<?php echo elgg_get_page_owner()->username; ?>" /> - <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" /> + <input type="submit" class="submit-button" value="<?php echo elgg_echo("save"); ?>" /> </p> </form>
\ No newline at end of file diff --git a/mod/profile/views/default/profile/editdefaultprofileitems.php b/mod/profile/views/default/profile/editdefaultprofileitems.php index 368529118..4c093cb22 100644 --- a/mod/profile/views/default/profile/editdefaultprofileitems.php +++ b/mod/profile/views/default/profile/editdefaultprofileitems.php @@ -50,7 +50,7 @@ END; //$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/profile/editdefault/delete?id={$item->shortname}"); - echo "<li id=\"{$item->shortname}\"><div class='delete_button'><a href=\"$url\">" . elgg_echo('delete') . "</a></div>"; + echo "<li id=\"{$item->shortname}\"><div class='delete-button'><a href=\"$url\">" . elgg_echo('delete') . "</a></div>"; echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag_handle.png'/>"; echo "<b class=\"profile_field_editable\"><span class=\"{$item->shortname}_editable\">$item->translation</span></b>: [".elgg_echo($item->type)."]"; echo "</li>"; diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php index cdfa68a8a..9e1987d55 100644 --- a/mod/profile/views/default/profile/editicon.php +++ b/mod/profile/views/default/profile/editicon.php @@ -39,7 +39,7 @@ $currentuser = get_loggedin_user(); echo elgg_view("input/file",array('internalname' => 'profileicon')); ?> - <br /><input type="submit" class="submit_button" value="<?php echo elgg_echo("upload"); ?>" /> + <br /><input type="submit" class="submit-button" value="<?php echo elgg_echo("upload"); ?>" /> </p> </form> </div> diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php index bfed3aec1..216734aa5 100755 --- a/mod/profile/views/default/profile/profile_ownerblock.php +++ b/mod/profile/views/default/profile/profile_ownerblock.php @@ -38,8 +38,8 @@ if ($section == 'details') { $profile_actions = ""; if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { $profile_actions = "<div class='clearfix profile_actions'>"; - $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/details' class='action_button'>". elgg_echo('profile:edit') ."</a>"; - $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/icon' class='action_button'>". elgg_echo('profile:editicon') ."</a>"; + $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/details' class='action-button'>". elgg_echo('profile:edit') ."</a>"; + $profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/icon' class='action-button'>". elgg_echo('profile:editicon') ."</a>"; $profile_actions .= "</div>"; } else { $profile_actions = "<div class='profile_actions'>"; @@ -48,16 +48,16 @@ if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { if ($user->isFriend()) { $url = elgg_get_site_url()."action/friends/remove?friend={$user->getGUID()}"; $url = elgg_add_action_tokens_to_url($url); - $profile_actions .= "<a href=\"$url\" class='action_button'>" . elgg_echo('friend:remove') . "</a>"; + $profile_actions .= "<a href=\"$url\" class='action-button'>" . elgg_echo('friend:remove') . "</a>"; } else { $url = elgg_get_site_url()."action/friends/add?friend={$user->getGUID()}"; $url = elgg_add_action_tokens_to_url($url); - $profile_actions .= "<a href=\"$url\" class='action_button'>" . elgg_echo('friend:add') . "</a>"; + $profile_actions .= "<a href=\"$url\" class='action-button'>" . elgg_echo('friend:add') . "</a>"; } } } if (is_plugin_enabled('messages') && isloggedin()) { - $profile_actions .= "<a href=\"".elgg_get_site_url()."mod/messages/send.php?send_to={$user->guid}\" class='action_button'>". elgg_echo('messages:send') ."</a>"; + $profile_actions .= "<a href=\"".elgg_get_site_url()."mod/messages/send.php?send_to={$user->guid}\" class='action-button'>". elgg_echo('messages:send') ."</a>"; } $profile_actions .= "</div>"; } diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php index fa809bae6..1c4647cfe 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' => 'action_button', + 'class' => 'action-button', ); 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' => 'action_button disabled', + 'class' => 'action-button disabled', ); echo elgg_view('output/url', $params); ?> diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php index ec27f9686..a09a32712 100644 --- a/mod/riverdashboard/views/default/riverdashboard/css.php +++ b/mod/riverdashboard/views/default/riverdashboard/css.php @@ -96,14 +96,14 @@ padding:5px; height:26px; } -.river_comment_form.hidden .input_text { +.river_comment_form.hidden .input-text { width:560px; padding:3px; } -#profile_content .river_comment_form.hidden .input_text { /* when activity is displayed on profile page */ +#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 .submit-button { margin:0 0 0 10px; float:right; } diff --git a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php index b38fcd03b..c426e9ad9 100644 --- a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php +++ b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php @@ -26,7 +26,7 @@ $welcometitle_form = elgg_view('input/text', array( $welcomemessage_form = elgg_view('input/longtext', array(
'internalname' => 'welcomemessage',
'value' => $welcomemessage,
- 'class' => 'input_textarea monospace'
+ 'class' => 'input-textarea monospace'
));
$sidebartitle_form = elgg_view('input/text', array(
'internalname' => 'sidebartitle',
@@ -35,7 +35,7 @@ $sidebartitle_form = elgg_view('input/text', array( $sidebarmessage_form = elgg_view('input/longtext', array(
'internalname' => 'sidebarmessage',
'value' => $sidebarmessage,
- 'class' => 'input_textarea monospace'
+ 'class' => 'input-textarea monospace'
));;
$page_type = elgg_view('input/hidden', array(
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index a94d3a4aa..66debd5e2 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -30,12 +30,12 @@ if (isset($vars['entity'])) { <?php if(isloggedin()){ ?> - <a href="<?php echo elgg_get_site_url(); ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="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="action-button 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 if ($vars['entity']->canEdit()) { - echo "<span class='delete_button'>" . elgg_view("output/confirmlink",array( + echo "<span class='delete-button'>" . elgg_view("output/confirmlink",array( 'href' => "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php index 36c9bc844..230711c49 100644 --- a/mod/thewire/views/default/thewire/css.php +++ b/mod/thewire/views/default/thewire/css.php @@ -77,10 +77,10 @@ float:right; width:65px; } -.wire_post_options .action_button.reply.small { +.wire_post_options .action-button.reply.small { float:right; } -.wire_post_options .delete_button { +.wire_post_options .delete-button { position: absolute; bottom:5px; right:5px; @@ -88,7 +88,7 @@ /* latest wire post on profile page */ -.wire_post .action_button.update.small { +.wire_post .action-button.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 536ec6ee2..a7f7977b7 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='action_button' value='{$action_txt}' />"; + $display .= "<input type='submit' class='action-button' 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 6750a29cb..9a9c95ec0 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 == get_loggedin_userid()) { $text = elgg_echo('thewire:update'); - echo "<a class='action_button update small' href=\"{$url_to_wire}\">$text</a>"; + echo "<a class='action-button update small' href=\"{$url_to_wire}\">$text</a>"; } echo $time; echo "</div></div>"; diff --git a/mod/tinymce/views/default/input/longtext.php b/mod/tinymce/views/default/input/longtext.php index 2f90d5a1c..995cd8fd1 100644 --- a/mod/tinymce/views/default/input/longtext.php +++ b/mod/tinymce/views/default/input/longtext.php @@ -84,9 +84,9 @@ function toggleEditor(id) { ?> -<a class="longtext_control toggle_editor small link" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"><?php echo elgg_echo('tinymce:remove'); ?></a> +<a class="longtext-control toggle_editor small link" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"><?php echo elgg_echo('tinymce:remove'); ?></a> <!-- show the textarea --> -<textarea class="input_textarea mceEditor" name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea> +<textarea class="input-textarea mceEditor" name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea> <script type="text/javascript"> $(document).ready(function() { diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php index 1a0b21394..5c7b4eec5 100644 --- a/mod/twitter/views/default/twitter/css.php +++ b/mod/twitter/views/default/twitter/css.php @@ -35,7 +35,7 @@ p.visit_twitter a { padding:0 0 0 20px; margin:0; } -p.twitter_username .input_text { +p.twitter_username .input-text { width:200px; } .visit_twitter { diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php index 75898b4e2..1c1567aec 100644 --- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php +++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php @@ -13,7 +13,7 @@ $user = elgg_get_array_value('theuser', $vars); // 'internalname' => 'user_guids', // 'options' => array("$user->username - \"$user->name\" <$user->email>" => $user->guid) //)); -$checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"input_checkboxes\" name=\"user_guids[]\">" +$checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"input-checkboxes\" name=\"user_guids[]\">" . "$user->username - \"$user->name\" <$user->email></label>"; $created = elgg_echo('uservalidationbyemail:admin:user_created', array(elgg_view_friendly_time($user->time_created))); 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); ?> diff --git a/views/installation/input/access.php b/views/installation/input/access.php index 01ce69b80..51b8dfa00 100644 --- a/views/installation/input/access.php +++ b/views/installation/input/access.php @@ -16,7 +16,7 @@ if (isset($vars['class'])) { $class = $vars['class']; } if (!$class) { - $class = "input_access"; + $class = "input-access"; } if ((!isset($vars['options'])) || (!is_array($vars['options']))) { diff --git a/views/installation/input/button.php b/views/installation/input/button.php index 1b70800e9..759752c8c 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 = "submit-button"; } if (isset($vars['type'])) { diff --git a/views/installation/input/longtext.php b/views/installation/input/longtext.php index 766cd68e4..c7e465e9f 100644 --- a/views/installation/input/longtext.php +++ b/views/installation/input/longtext.php @@ -14,7 +14,7 @@ $class = $vars['class']; if (!$class) { - $class = "input_textarea"; + $class = "input-textarea"; } ?> diff --git a/views/installation/input/password.php b/views/installation/input/password.php index 34578a1e2..541728ee3 100644 --- a/views/installation/input/password.php +++ b/views/installation/input/password.php @@ -14,7 +14,7 @@ $class = $vars['class']; if (!$class) { - $class = "input_password"; + $class = "input-password"; } ?> diff --git a/views/installation/input/text.php b/views/installation/input/text.php index c8ce7266e..73801dcf7 100644 --- a/views/installation/input/text.php +++ b/views/installation/input/text.php @@ -17,7 +17,7 @@ $class = $vars['class']; if (!$class) { - $class = "input_text"; + $class = "input-text"; } ?> |