aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-10 01:43:36 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-10 01:43:36 +0000
commit2c2ad03dce82a3fffa575a9a1233345a85e0db34 (patch)
tree5fab9727cb629c7f12af3a529addd809c433c985 /views
parent6b3ee5365b10afc37677781fc5f07539f1d8636f (diff)
downloadelgg-2c2ad03dce82a3fffa575a9a1233345a85e0db34.tar.gz
elgg-2c2ad03dce82a3fffa575a9a1233345a85e0db34.tar.bz2
Converted buttons to elgg-object-type naming convention. Added table of buttons to forms theming preview meant for previewing all button types and states (still have to implement those...)
git-svn-id: http://code.elgg.org/elgg/trunk@8091 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/admin/components/plugin.php6
-rw-r--r--views/default/admin/plugins/advanced.php6
-rw-r--r--views/default/admin/plugins/simple.php2
-rw-r--r--views/default/core/account/login_walled_garden.php4
-rw-r--r--views/default/core/friends/picker.php4
-rw-r--r--views/default/css/admin.php50
-rw-r--r--views/default/css/elements/forms.php50
-rw-r--r--views/default/css/elements/misc.php8
-rw-r--r--views/default/forms/profile/fields/reset.php2
-rw-r--r--views/default/input/button.php2
-rw-r--r--views/default/layout/shells/content/header.php2
-rw-r--r--views/default/layout/shells/widgets/add_button.php2
-rw-r--r--views/default/page/elements/content_header.php4
-rw-r--r--views/installation/input/button.php2
14 files changed, 72 insertions, 72 deletions
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index e75c2c63e..010e8482d 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -83,10 +83,10 @@ if ($priority < $max_priority) {
if ($can_activate) {
if ($active) {
$action = 'deactivate';
- $class = 'elgg-cancel-button';
+ $class = 'elgg-button-cancel';
} else {
$action = 'activate';
- $class = 'elgg-submit-button';
+ $class = 'elgg-button-submit';
}
$url = elgg_http_add_url_query_elements($actions_base . $action, array(
@@ -104,7 +104,7 @@ if ($can_activate) {
$action_button = elgg_view('output/url', array(
'text' => elgg_echo('admin:plugins:cannot_activate'),
'disabled' => 'disabled',
- 'class' => "elgg-action-button disabled"
+ 'class' => "elgg-button-action disabled"
));
}
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 05754e4c7..1bde9c8ae 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -51,7 +51,7 @@ $category_dropdown = elgg_view('input/dropdown', array(
$category_button = elgg_view('input/submit', array(
'value' => elgg_echo('filter'),
- 'class' => 'elgg-action-button'
+ 'class' => 'elgg-button-action'
));
$category_form = elgg_view('input/form', array(
@@ -63,8 +63,8 @@ if (!isset($show_category) || empty($show_category)) {
$activate_url = "{$CONFIG->url}action/admin/plugins/activate_all?__elgg_token=$token&amp;__elgg_ts=$ts";
$deactivate_url = "{$CONFIG->url}action/admin/plugins/deactivate_all?__elgg_token=$token&amp;__elgg_ts=$ts";
- $buttons = "<a class='elgg-action-button' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> ';
- $buttons .= "<a class='elgg-action-button disabled' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> ';
+ $buttons = "<a class='elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> ';
+ $buttons .= "<a class='elgg-button-action disabled' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> ';
$buttons .= "<br /><br />";
} else {
$buttons = '';
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
index e9d7d5ffb..2672aa55d 100644
--- a/views/default/admin/plugins/simple.php
+++ b/views/default/admin/plugins/simple.php
@@ -102,7 +102,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' => 'elgg-action-button disabled'));
+$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'elgg-button-action 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 9335c0dfd..feda2f047 100644
--- a/views/default/core/account/login_walled_garden.php
+++ b/views/default/core/account/login_walled_garden.php
@@ -39,7 +39,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='elgg-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-button-action disabled cancel_request' type='reset' value='Cancel'></p>";
?>
<div id="lostpassword_form" class="hidden clearfix">
@@ -58,7 +58,7 @@ $(document).ready(function() {
$('input.username').focus();
// add cancel button to inline register form
- $('#registration_form').find('input.elgg-submit-button').after("<input class='elgg-action-button disabled cancel_request' type='reset' value='Cancel'>");
+ $('#registration_form').find('input.elgg-button-submit').after("<input class='elgg-button-action disabled cancel_request' type='reset' value='Cancel'>");
function elgg_slide_hiddenform(activateLink, parentElement, toggleElement) {
$(activateLink).closest(parentElement).find(toggleElement).animate({"width": "563px", duration: 400});
diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php
index da647b0ac..2344d7d94 100644
--- a/views/default/core/friends/picker.php
+++ b/views/default/core/friends/picker.php
@@ -270,8 +270,8 @@ if ($formtarget) {
?>
<div class="clearfix"></div>
<div class="friendspicker-savebuttons">
- <input type="submit" class="elgg-submit-button" value="<?php echo elgg_echo('save'); ?>" />
- <input type="button" class="elgg-cancel-button" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
+ <input type="submit" class="elgg-button-submit" value="<?php echo elgg_echo('save'); ?>" />
+ <input type="button" class="elgg-button-cancel" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
<br /></div>
</form>
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 729c770bb..09a5bf73e 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -395,7 +395,7 @@ input {
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
-input[type="submit"], .elgg-submit-button, .elgg-action-button {
+input[type="submit"], .elgg-button-submit, .elgg-button-action {
font-size: 14px;
font-weight: bold;
color: white;
@@ -410,12 +410,12 @@ input[type="submit"], .elgg-submit-button, .elgg-action-button {
cursor: pointer;
outline: none;
}
-input[type="submit"]:hover, .elgg-submit-button:hover, .elgg-action-button:hover {
+input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover {
color: white;
background-color: #000000;
text-decoration: none;
}
-.elgg-submit-button, .elgg-action-button {
+.elgg-button-submit, .elgg-button-action {
padding: 4px 8px;
}
/* ***************************************
@@ -691,7 +691,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
.elgg-admin form#plugin_settings {
margin-top: 10px;
}
-.elgg-admin form#plugin_settings .elgg-action-button.disabled {
+.elgg-admin form#plugin_settings .elgg-button-action.disabled {
margin-top:10px;
float:right;
}
@@ -755,7 +755,7 @@ a.elgg-longtext-control {
float: right;
margin-left: 14px;
}
-.admin_area .elgg-submit-button {
+.admin_area .elgg-button-submit {
font-size: 14px;
font-weight: bold;
color: white;
@@ -775,7 +775,7 @@ a.elgg-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);
}
-.admin_area .elgg-submit-button:hover {
+.admin_area .elgg-button-submit:hover {
color: white;
border-color: #333333;
text-decoration:none;
@@ -818,7 +818,7 @@ a.elgg-longtext-control {
background-repeat: repeat-x;
background-position: left 10px;
}
-.admin_area .elgg-cancel-button {
+.admin_area .elgg-button-cancel {
font-size: 14px;
font-weight: bold;
text-decoration:none;
@@ -835,18 +835,18 @@ a.elgg-longtext-control {
margin:10px 0 10px 10px;
cursor: pointer;
}
-.admin_area .elgg-cancel-button:hover {
+.admin_area .elgg-button-cancel:hover {
background-color: #999999;
background-position: left 10px;
text-decoration:none;
color:white;
}
-.admin_area .content-header-options .elgg-action-button {
+.admin_area .content-header-options .elgg-button-action {
margin-top:0;
margin-left:10px;
}
-.admin_area input.elgg-action-button,
-.admin_area a.elgg-action-button {
+.admin_area input.elgg-button-action,
+.admin_area a.elgg-button-action {
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
background-color:#cccccc;
@@ -864,10 +864,10 @@ a.elgg-longtext-control {
-webkit-box-shadow: none;
-moz-box-shadow: none;
}
-.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 {
+.admin_area input.elgg-button-action:hover,
+.admin_area a.elgg-button-action:hover,
+.admin_area input.elgg-button-action:focus,
+.admin_area a.elgg-button-action:focus {
background-position:0 -15px;
background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
background-repeat: repeat-x;
@@ -876,33 +876,33 @@ a.elgg-longtext-control {
background-color:#cccccc;
border:1px solid #999999;
}
-.admin_area .elgg-action-button:active {
+.admin_area .elgg-button-action:active {
background-image:none;
}
-.admin_area .elgg-action-button.disabled {
+.admin_area .elgg-button-action.disabled {
color:#999999;
padding:2px 7px 2px 7px;
}
-.admin_area .elgg-action-button.disabled:hover {
+.admin_area .elgg-button-action.disabled:hover {
background-position:0 -15px;
color:#111111;
border:1px solid #999999;
}
-.admin_area .elgg-action-button.disabled:active {
+.admin_area .elgg-button-action.disabled:active {
background-image:none;
}
-.admin_area .elgg-action-button.download {
+.admin_area .elgg-button-action.download {
padding: 5px 9px 5px 6px;
}
-.admin_area .elgg-action-button.download:hover {
+.admin_area .elgg-button-action.download:hover {
}
-.admin_area .elgg-action-button.download img {
+.admin_area .elgg-button-action.download img {
margin-right:6px;
position:relative;
top:5px;
}
-.admin_area .elgg-action-button.small {
+.admin_area .elgg-button-action.small {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
width: auto;
@@ -911,7 +911,7 @@ a.elgg-longtext-control {
font-size: 0.9em;
line-height: 0.6em;
}
-.admin_area .elgg-action-button.small:hover {
+.admin_area .elgg-button-action.small:hover {
background-color: #0054A7;
background-image: none;
border-color: #0054A7;
@@ -968,7 +968,7 @@ a.elgg-longtext-control {
float: left;
width: 150px;
}
-form.admin_plugins_simpleview .elgg-submit-button {
+form.admin_plugins_simpleview .elgg-button-submit {
margin-right:20px;
}
.plugin_info {
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 1cac80b58..816accbe7 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -75,7 +75,7 @@ input[type="button"],
-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
}
input[type="submit"],
-.elgg-submit-button {
+.elgg-button-submit {
color: white;
text-shadow: 1px 1px 0px black;
text-decoration: none;
@@ -86,7 +86,7 @@ input[type="submit"],
background-position: left 10px;
}
input[type="submit"]:hover,
-.elgg-submit-button:hover {
+.elgg-button-submit:hover {
border-color: #0054a7;
text-decoration: none;
color: white;
@@ -95,7 +95,7 @@ input[type="submit"]:hover,
background-repeat: repeat-x;
background-position: left 10px;
}
-.elgg-cancel-button {
+.elgg-button-cancel {
color: #333333;
background-color: #dddddd;
background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
@@ -103,13 +103,13 @@ input[type="submit"]:hover,
background-position: left 10px;
border: 1px solid #999999;
}
-.elgg-cancel-button:hover {
+.elgg-button-cancel:hover {
color: white;
background-color: #999999;
background-position: left 10px;
text-decoration: none;
}
-.elgg-action-button {
+.elgg-button-action {
background-color:#cccccc;
background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
background-repeat: repeat-x;
@@ -127,8 +127,8 @@ input[type="submit"]:hover,
-webkit-box-shadow: none;
-moz-box-shadow: none;
}
-.elgg-action-button:hover,
-.elgg-action-button:focus {
+.elgg-button-action:hover,
+.elgg-button-action:focus {
background-position: 0 -15px;
background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
background-repeat: repeat-x;
@@ -139,22 +139,22 @@ input[type="submit"]:hover,
}
/*
<?php //@todo elgg-state-disabled? ?>
-.elgg-submit-button.disabled {
+.elgg-button-submit.disabled {
background-color:#999999;
border-color:#999999;
color:#dedede;
}
-.elgg-submit-button.disabled:hover {
+.elgg-button-submit.disabled:hover {
background-color:#999999;
border-color:#999999;
color:#dedede;
}
-.elgg-action-button {
+.elgg-button-action {
margin-left: 10px;
}
-input.elgg-action-button,
-a.elgg-action-button {
+input.elgg-button-action,
+a.elgg-button-action {
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
background-color:#cccccc;
@@ -173,10 +173,10 @@ a.elgg-action-button {
-webkit-box-shadow: none;
-moz-box-shadow: none;
}
-input.elgg-action-button:hover,
-a.elgg-action-button:hover,
-input.elgg-action-button:focus,
-a.elgg-action-button:focus {
+input.elgg-button-action:hover,
+a.elgg-button-action:hover,
+input.elgg-button-action:focus,
+a.elgg-button-action:focus {
background-position:0 -15px;
background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
background-repeat: repeat-x;
@@ -185,33 +185,33 @@ a.elgg-action-button:focus {
background-color:#cccccc;
border:1px solid #999999;
}
-.elgg-action-button:active {
+.elgg-button-action:active {
background-image:none;
}
-.elgg-action-button.disabled {
+.elgg-button-action.disabled {
color:#999999;
padding:2px 7px 2px 7px;
}
-.elgg-action-button.disabled:hover {
+.elgg-button-action.disabled:hover {
background-position:0 -15px;
color:#111111;
border:1px solid #999999;
}
-.elgg-action-button.disabled:active {
+.elgg-button-action.disabled:active {
background-image:none;
}
-.elgg-action-button.download {
+.elgg-button-action.download {
padding: 5px 9px 5px 6px;
}
-.elgg-action-button.download:hover {
+.elgg-button-action.download:hover {
}
-.elgg-action-button.download img {
+.elgg-button-action.download img {
margin-right:6px;
position:relative;
top:5px;
}
-.elgg-action-button.small {
+.elgg-button-action.small {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
width: auto;
@@ -220,7 +220,7 @@ a.elgg-action-button:focus {
font-size: 0.9em;
line-height: 0.6em;
}
-.elgg-action-button.small:hover {
+.elgg-button-action.small:hover {
background-color: #4690d6;
background-image: none;
border-color: #4690d6;
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index 92107db8c..944f72bc6 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -37,7 +37,7 @@
font-weight:normal;
font-size:100%;
}
-.loginbox .elgg-submit-button {
+.loginbox .elgg-button-submit {
margin-right: 15px;
}
#login .persistent-login {
@@ -133,7 +133,7 @@
font-weight:normal;
font-size: 100%;
}
-#login-dropdown #signin-menu .elgg-submit-button {
+#login-dropdown #signin-menu .elgg-button-submit {
margin-right:15px;
}
@@ -263,8 +263,8 @@
.friends-picker-navigation-r:hover {
background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
}
-.friendspicker-savebuttons .elgg-submit-button,
-.friendspicker-savebuttons .elgg-cancel-button {
+.friendspicker-savebuttons .elgg-button-submit,
+.friendspicker-savebuttons .elgg-button-cancel {
margin:5px 20px 5px 5px;
}
#collectionMembersTable {
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index 86ab16e24..9da325788 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' => 'elgg-action-button disabled',
+ 'class' => 'elgg-button-action disabled',
);
echo elgg_view('input/submit', $params);
diff --git a/views/default/input/button.php b/views/default/input/button.php
index db520b6ac..52a85ace6 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -10,7 +10,7 @@
$defaults = array(
'type' => 'button',
- 'class' => 'elgg-submit-button',
+ 'class' => 'elgg-button-submit',
);
$vars = array_merge($defaults, $vars);
diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php
index f3517e9ad..92456bac4 100644
--- a/views/default/layout/shells/content/header.php
+++ b/views/default/layout/shells/content/header.php
@@ -36,7 +36,7 @@ if ($context) {
$params = array(
'href' => $new_link = elgg_normalize_url($new_link),
'text' => elgg_echo("$context:add"),
- 'class' => 'elgg-action-button',
+ 'class' => 'elgg-button-action',
);
$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 51b03edbb..0304c50a0 100644
--- a/views/default/layout/shells/widgets/add_button.php
+++ b/views/default/layout/shells/widgets/add_button.php
@@ -4,7 +4,7 @@
*/
?>
<div class="elgg-widget-add-control">
- <a class="elgg-action-button elgg-toggle" id="elgg-toggler-add-widgets">
+ <a class="elgg-button-action elgg-toggle" id="elgg-toggler-add-widgets">
<?php echo elgg_echo('widgets:add'); ?>
</a>
</div>
diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php
index becf4a13a..10ba4b052 100644
--- a/views/default/page/elements/content_header.php
+++ b/views/default/page/elements/content_header.php
@@ -70,10 +70,10 @@ if (elgg_is_logged_in()) {
// @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='elgg-action-button'>" . elgg_echo('videolist:browsemenu') . '</a>';
+ $new_button = "<a href=\"{$video_link}\" class='elgg-button-action'>" . 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='elgg-action-button'>" . elgg_echo($type . ':new') . '</a>';
+ $new_button = "<a href=\"{$new_link}\" class='elgg-button-action'>" . elgg_echo($type . ':new') . '</a>';
}
$new_button = "<div class='content-header-options'>$new_button</div>";
}
diff --git a/views/installation/input/button.php b/views/installation/input/button.php
index 6704fa8c5..81a5414c4 100644
--- a/views/installation/input/button.php
+++ b/views/installation/input/button.php
@@ -17,7 +17,7 @@
$class = $vars['class'];
if (!$class) {
- $class = "elgg-submit-button";
+ $class = "elgg-button-submit";
}
if (isset($vars['type'])) {