replacing action-button with elgg-action-button

git-svn-id: http://code.elgg.org/elgg/trunk@7688 36083f99-b078-4883-b0ff-0f9b5a30f544

32 files changed, 83 insertions, 79 deletions

diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index 022473e9d..f49340985 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -21,7 +21,7 @@ if ($vars['guid']) {
 	$delete_link = elgg_view('output/confirmlink', array(
 		'href' => $delete_url,
 		'text' => elgg_echo('delete'),
-		'class' => 'action-button disabled'
+		'class' => 'elgg-action-button disabled'
 	));
 }
 
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 37019c1aa..b4754cb18 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="elgg-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/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index d3eb7ac68..be0a5912c 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -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="elgg-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/topics.php b/mod/groups/views/default/forum/topics.php
index 799e252d8..e67294c72 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="elgg-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 dcda51fd8..534cb3a91 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -34,7 +34,7 @@
 
 
 /* group invitations */
-.group_invitations a.action-button,
+.group_invitations a.elgg-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 02b1205fe..a21985bea 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=\"elgg-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 a1cca6489..17922c7a9 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -20,7 +20,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 			<div class="entity-listing-info">
 			<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="elgg-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 714b8e8f9..2801b2301 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -21,7 +21,7 @@
 					<div class="entity-listing-info">
 					<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="elgg-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/messages/index.php b/mod/messages/index.php
index 3fe1b0f84..02257551e 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='elgg-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 989337f55..e70d34711 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='elgg-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/messages.php b/mod/messages/views/default/messages/messages.php
index 5ac749135..0379bef35 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="elgg-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' => "elgg-action-button disabled"
 						));
 				?>
 				</div>
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 4522f7f6e..3ad8d7a29 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -145,7 +145,7 @@ img.medium {
 #owner_block .profile_actions {
 	margin-top:10px;
 }
-#owner_block .profile_actions a.action-button {
+#owner_block .profile_actions a.elgg-action-button {
 	margin-bottom:4px;
 	display: table;
 }
@@ -344,7 +344,7 @@ p.visit_twitter a {
 	border-top: 1px solid #dedede;
 	margin-top:30px;
 }
-.default_profile_reset .action-button {
+.default_profile_reset .elgg-action-button {
 	float:right;
 }
 /* field re-order */
diff --git a/mod/profile/views/default/profile/ownerblock.php b/mod/profile/views/default/profile/ownerblock.php
index 684209569..0350aea2f 100755
--- a/mod/profile/views/default/profile/ownerblock.php
+++ b/mod/profile/views/default/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/avatar/edit/{$user->username}' class='action-button'>". elgg_echo('avatar:edit') ."</a>";
+	$profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/details' class='elgg-action-button'>". elgg_echo('profile:edit') ."</a>";
+	$profile_actions .= "<a href='".elgg_get_site_url()."pg/avatar/edit/{$user->username}' class='elgg-action-button'>". elgg_echo('avatar:edit') ."</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='elgg-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='elgg-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='elgg-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 1c4647cfe..0ac4457da 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' => 'elgg-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' => 'elgg-action-button disabled',
 	);
 	echo elgg_view('output/url', $params);
 ?>
diff --git a/mod/tabbed_profile/views/default/profile/css.php b/mod/tabbed_profile/views/default/profile/css.php
index 812daf16d..45c67b6b2 100644
--- a/mod/tabbed_profile/views/default/profile/css.php
+++ b/mod/tabbed_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.elgg-action-button {
 	margin-bottom:4px;
 	display: table;
 }
@@ -334,7 +334,7 @@ p.visit_twitter a {
 	border-top: 1px solid #dedede;
 	margin-top:30px;
 }
-.default_profile_reset .action-button {
+.default_profile_reset .elgg-action-button {
 	float:right;
 }
 /* field re-order */
diff --git a/mod/tabbed_profile/views/default/profile/ownerblock.php b/mod/tabbed_profile/views/default/profile/ownerblock.php
index 85c930678..8f6d333a5 100755
--- a/mod/tabbed_profile/views/default/profile/ownerblock.php
+++ b/mod/tabbed_profile/views/default/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/avatar/edit/{$user->username}' class='action-button'>". elgg_echo('avatar:edit') ."</a>";
+	$profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/details' class='elgg-action-button'>". elgg_echo('profile:edit') ."</a>";
+	$profile_actions .= "<a href='".elgg_get_site_url()."pg/avatar/edit/{$user->username}' class='elgg-action-button'>". elgg_echo('avatar:edit') ."</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='elgg-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='elgg-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='elgg-action-button'>". elgg_echo('messages:send') ."</a>";
 	}
 	$profile_actions .= "</div>";
 }
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 4ccd5d7f4..b2a8b65c9 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -30,7 +30,7 @@ if (isset($vars['entity'])) {
 		<?php
 			if(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="elgg-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
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index a00acaec5..26981d86e 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -77,7 +77,7 @@
 	float:right;
 	width:65px;
 }
-.wire_post_options .action-button.reply.small {
+.wire_post_options .elgg-action-button.reply.small {
 	float:right;
 }
 .wire_post_options .delete-button {
@@ -88,7 +88,7 @@
 
 
 /* latest wire post on profile page */
-.wire_post .action-button.update.small {
+.wire_post .elgg-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 a7f7977b7..5a3e40e5f 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='elgg-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 09d878c81..ec1980abc 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='elgg-action-button update small' href=\"{$url_to_wire}\">$text</a>";
 	}
 	echo $time;
 	echo "</div></div>";
diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 4e32b0e14..785b5550d 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' => 'elgg-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 f2eb56324..ead930090 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -47,7 +47,7 @@ $category_pulldown = elgg_view('input/pulldown', array(
 
 $category_button = elgg_view('input/submit', array(
 	'value' => elgg_echo('filter'),
-	'class' => 'action-button'
+	'class' => 'elgg-action-button'
 ));
 
 $category_form = elgg_view('input/form', array(
@@ -59,7 +59,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&amp;__elgg_ts=$ts\">".elgg_echo('enableall')."</a>  <a class='action-button disabled' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&amp;__elgg_ts=$ts\">".elgg_echo('disableall')."</a> ";
+	$buttons = "<a class='elgg-action-button' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&amp;__elgg_ts=$ts\">".elgg_echo('enableall')."</a>  <a class='elgg-action-button disabled' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&amp;__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 89373fc7d..e53ecb0c1 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' => 'elgg-action-button disabled'));
 
 echo elgg_view('input/form', array(
 	'action' => "action/admin/plugins/simple_update_states",
diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php
index bdd4cb016..38a521293 100644
--- a/views/default/core/account/login_walled_garden.php
+++ b/views/default/core/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='elgg-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='elgg-action-button disabled cancel_request' type='reset' value='Cancel'>");
 	
 	function elgg_slide_hiddenform(activateLink, parentElement, toggleElement) {
 		$(activateLink).closest(parentElement).find(toggleElement).animate({"width": "563px", duration: 400});
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index c9f4c2f88..069d16399 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -170,7 +170,7 @@ table.mceLayout {
 .elgg-admin form#plugin_settings {
 	margin-top: 10px;
 }
-.elgg-admin form#plugin_settings .action-button.disabled {
+.elgg-admin form#plugin_settings .elgg-action-button.disabled {
 	margin-top:10px;
 	float:right;
 }
@@ -324,12 +324,12 @@ table.mceLayout {
 	text-decoration:none;
 	color:white;
 }
-.admin_area .content-header-options .action-button {
+.admin_area .content-header-options .elgg-action-button {
 	margin-top:0;
 	margin-left:10px;
 }
-.admin_area input.action-button,
-.admin_area a.action-button {
+.admin_area input.elgg-action-button,
+.admin_area a.elgg-action-button {
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	background-color:#cccccc;
@@ -347,10 +347,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.elgg-action-button:hover,
+.admin_area a.elgg-action-button:hover,
+.admin_area input.elgg-action-button:focus,
+.admin_area a.elgg-action-button:focus {
 	background-position:0 -15px;
 	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
@@ -359,33 +359,33 @@ table.mceLayout {
 	background-color:#cccccc;
 	border:1px solid #999999;
 }
-.admin_area .action-button:active {
+.admin_area .elgg-action-button:active {
 	background-image:none;
 }
-.admin_area .action-button.disabled {
+.admin_area .elgg-action-button.disabled {
 	color:#999999;
 	padding:2px 7px 2px 7px;
 }
-.admin_area .action-button.disabled:hover {
+.admin_area .elgg-action-button.disabled:hover {
 	background-position:0 -15px;
 	color:#111111;
 	border:1px solid #999999;
 }
-.admin_area .action-button.disabled:active {
+.admin_area .elgg-action-button.disabled:active {
 	background-image:none;
 }
-.admin_area .action-button.download {
+.admin_area .elgg-action-button.download {
 	padding: 5px 9px 5px 6px;
 }
-.admin_area .action-button.download:hover {
+.admin_area .elgg-action-button.download:hover {
 
 }
-.admin_area .action-button.download img {
+.admin_area .elgg-action-button.download img {
 	margin-right:6px;
 	position:relative;
 	top:5px;
 }
-.admin_area .action-button.small {
+.admin_area .elgg-action-button.small {
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	width: auto;
@@ -394,7 +394,7 @@ table.mceLayout {
 	font-size: 0.9em;
 	line-height: 0.6em;
 }
-.admin_area .action-button.small:hover {
+.admin_area .elgg-action-button.small:hover {
 	background-color: #0054A7;
 	background-image: none;
 	border-color: #0054A7;
@@ -432,7 +432,7 @@ table.mceLayout {
 .content-header-options {
 	float:right;
 }
-.content-header-options .action-button {
+.content-header-options .elgg-action-button {
 	float:right;
 	margin:0 0 5px 10px;
 }
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index e54685f86..603a128b7 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -164,11 +164,11 @@ input[type="submit"]:hover {
 	text-decoration:none;
 	color:white;
 }
-.action-button {
+.elgg-action-button {
 	margin-left: 10px;
 }
-input.action-button,
-a.action-button {
+input.elgg-action-button,
+a.elgg-action-button {
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	background-color:#cccccc;
@@ -186,10 +186,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.elgg-action-button:hover,
+a.elgg-action-button:hover,
+input.elgg-action-button:focus,
+a.elgg-action-button:focus {
 	background-position:0 -15px;
 	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
@@ -198,33 +198,33 @@ a.action-button:focus {
 	background-color:#cccccc;
 	border:1px solid #999999;
 }
-.action-button:active {
+.elgg-action-button:active {
 	background-image:none;
 }
-.action-button.disabled {
+.elgg-action-button.disabled {
 	color:#999999;
 	padding:2px 7px 2px 7px;
 }
-.action-button.disabled:hover {
+.elgg-action-button.disabled:hover {
 	background-position:0 -15px;
 	color:#111111;
 	border:1px solid #999999;
 }
-.action-button.disabled:active {
+.elgg-action-button.disabled:active {
 	background-image:none;
 }
-.action-button.download {
+.elgg-action-button.download {
 	padding: 5px 9px 5px 6px;
 }
-.action-button.download:hover {
+.elgg-action-button.download:hover {
 
 }
-.action-button.download img {
+.elgg-action-button.download img {
 	margin-right:6px;
 	position:relative;
 	top:5px;
 }
-.action-button.small {
+.elgg-action-button.small {
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	width: auto;
@@ -233,7 +233,7 @@ a.action-button:focus {
 	font-size: 0.9em;
 	line-height: 0.6em;
 }
-.action-button.small:hover {
+.elgg-action-button.small:hover {
 	background-color: #4690d6;
 	background-image: none;
 	border-color: #4690d6;
diff --git a/views/default/css/elements/skin.php b/views/default/css/elements/skin.php
index d967b0097..a95fc37a2 100644
--- a/views/default/css/elements/skin.php
+++ b/views/default/css/elements/skin.php
@@ -136,6 +136,10 @@ a.selected {
 	margin-right: 10px;
 }
 
+.elgg-main > .elgg-header a {
+	float: right;
+}
+
 /***** PAGE SIDEBAR ******/
 
 .elgg-sidebar .elgg-module {
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index ea17acf9c..6444a4429 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -506,7 +506,7 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 .content-header-options {
 	float:right;
 }
-.content-header-options .action-button {
+.content-header-options .elgg-action-button {
 	float:right;
 	margin:0 0 5px 10px;
 }
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index 1661b2fa3..86ab16e24 100644
--- a/views/default/forms/profile/fields/reset.php
+++ b/views/default/forms/profile/fields/reset.php
@@ -5,6 +5,6 @@
 
 $params = array(
 	'value' => elgg_echo('profile:resetdefault'),
-	'class' => 'action-button disabled',
+	'class' => 'elgg-action-button disabled',
 );
 echo elgg_view('input/submit', $params);
diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php
index a4fa2d354..768f26337 100644
--- a/views/default/layout/shells/content/header.php
+++ b/views/default/layout/shells/content/header.php
@@ -31,7 +31,7 @@ if ($context) {
 			$params = array(
 				'href' => $new_link = elgg_normalize_url($new_link),
 				'text' => elgg_echo("$context:new"),
-				'class' => 'action-button right',
+				'class' => 'elgg-action-button',
 			);
 			$buttons = elgg_view('output/url', $params);
 		}
diff --git a/views/default/layout/shells/widgets/add_button.php b/views/default/layout/shells/widgets/add_button.php
index 92de8a99f..d281a2ffa 100644
--- a/views/default/layout/shells/widgets/add_button.php
+++ b/views/default/layout/shells/widgets/add_button.php
@@ -6,7 +6,7 @@
 $options = array(
 	'href' => '#',
 	'text' => elgg_echo('widgets:add'),
-	'class' => 'action-button',
+	'class' => 'elgg-action-button',
 );
 echo elgg_view('output/url', $options);
 ?>
diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php
index 8809ad8b7..8c0e01c57 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='elgg-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='elgg-action-button'>" . elgg_echo($type . ':new') . '</a>';
 		}
 		$new_button = "<div class='content-header-options'>$new_button</div>";
 	}