aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rw-r--r--views/default/admin/components/plugin.php2
-rw-r--r--views/default/core/account/login_walled_garden.php4
-rw-r--r--views/default/css/admin.php8
-rw-r--r--views/default/css/elements/forms.php11
-rw-r--r--views/default/forms/profile/fields/reset.php2
-rw-r--r--views/default/page/shells/walled_garden.php2
6 files changed, 14 insertions, 15 deletions
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 010e8482d..203181d5e 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -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-button-action disabled"
+ 'class' => "elgg-button-action elgg-state-disabled"
));
}
diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php
index feda2f047..c6eaf4f19 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-button-action 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 elgg-state-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-button-submit').after("<input class='elgg-button-action disabled cancel_request' type='reset' value='Cancel'>");
+ $('#registration_form').find('input.elgg-button-submit').after("<input class='elgg-button-action elgg-state-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 fb48cf60e..ab4ad7dcc 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -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-button-action.disabled {
+.elgg-admin form#plugin_settings .elgg-button-action.elgg-state-disabled {
margin-top:10px;
float:right;
}
@@ -879,16 +879,16 @@ a.elgg-longtext-control {
.admin_area .elgg-button-action:active {
background-image:none;
}
-.admin_area .elgg-button-action.disabled {
+.admin_area .elgg-button-action.elgg-state-disabled {
color:#999999;
padding:2px 7px 2px 7px;
}
-.admin_area .elgg-button-action.disabled:hover {
+.admin_area .elgg-button-action.elgg-state-disabled:hover {
background-position:0 -15px;
color:#111111;
border:1px solid #999999;
}
-.admin_area .elgg-button-action.disabled:active {
+.admin_area .elgg-button-action.elgg-state-disabled:active {
background-image:none;
}
.admin_area .elgg-button-action.download {
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 816accbe7..468c524a8 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -138,13 +138,12 @@ input[type="submit"]:hover,
border: 1px solid #999999;
}
/*
-<?php //@todo elgg-state-disabled? ?>
-.elgg-button-submit.disabled {
+.elgg-button-submit.elgg-state-disabled {
background-color:#999999;
border-color:#999999;
color:#dedede;
}
-.elgg-button-submit.disabled:hover {
+.elgg-button-submit.elgg-state-disabled:hover {
background-color:#999999;
border-color:#999999;
color:#dedede;
@@ -188,16 +187,16 @@ a.elgg-button-action:focus {
.elgg-button-action:active {
background-image:none;
}
-.elgg-button-action.disabled {
+.elgg-button-action.elgg-state-disabled {
color:#999999;
padding:2px 7px 2px 7px;
}
-.elgg-button-action.disabled:hover {
+.elgg-button-action.elgg-state-disabled:hover {
background-position:0 -15px;
color:#111111;
border:1px solid #999999;
}
-.elgg-button-action.disabled:active {
+.elgg-button-action.elgg-state-disabled:active {
background-image:none;
}
.elgg-button-action.download {
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index 9da325788..deb2d48ef 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-button-action disabled',
+ 'class' => 'elgg-button-action elgg-state-disabled',
);
echo elgg_view('input/submit', $params);
diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/shells/walled_garden.php
index bdd010496..905cacdae 100644
--- a/views/default/page/shells/walled_garden.php
+++ b/views/default/page/shells/walled_garden.php
@@ -204,7 +204,7 @@ body {background: white;}
background-color:#cccccc;
border:1px solid #999999;
}
-.walledgardenlogin .action_button.disabled {
+.walledgardenlogin .action_button.elgg-state-disabled {
color:#999999;
padding:2px 7px;
}