From a7b0a98e223e36090f7b2fc2a68a036e655727cc Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 19 Dec 2010 18:47:10 +0000
Subject: replacing action-button with elgg-action-button

git-svn-id: http://code.elgg.org/elgg/trunk@7688 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/admin/components/plugin_settings.php |  2 +-
 views/default/admin/plugins/advanced.php           |  4 +--
 views/default/admin/plugins/simple.php             |  2 +-
 views/default/core/account/login_walled_garden.php |  4 +--
 views/default/css/admin.php                        | 36 +++++++++++-----------
 views/default/css/elements/forms.php               | 32 +++++++++----------
 views/default/css/elements/skin.php                |  4 +++
 views/default/css/screen.php                       |  2 +-
 views/default/forms/profile/fields/reset.php       |  2 +-
 views/default/layout/shells/content/header.php     |  2 +-
 views/default/layout/shells/widgets/add_button.php |  2 +-
 views/default/page/elements/content_header.php     |  4 +--
 12 files changed, 50 insertions(+), 46 deletions(-)

(limited to 'views')

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>";
 	}
-- 
cgit v1.2.3