Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix button classes #11971

Merged
merged 1 commit into from
Sep 7, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions administrator/templates/isis/js/template.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@
{
label.closest('.btn-group').find('label').removeClass('active btn-success btn-danger btn-primary');

if (label.closest('.btn-group').hasClass('btn-group-reverse'))
if (label.closest('.btn-group').hasClass('btn-group-reversed'))
{
if (input.val() == '')
{
label.addClass('active btn-primary');
}
else if (input.val() == 0)
{
label.addClass('active btn-danger');
label.addClass('active btn-success');
}
else
{
label.addClass('active btn-success');
label.addClass('active btn-danger');
}
}
else
Expand All @@ -57,11 +57,11 @@
}
else if (input.val() == 0)
{
label.addClass('active btn-success');
label.addClass('active btn-danger');
}
else
{
label.addClass('active btn-danger');
label.addClass('active btn-success');
}

}
Expand All @@ -74,19 +74,19 @@
var $self = $(this);
var attrId = $self.attr('id');

if ($self.hasClass('btn-group-reverse'))
if ($self.parent().hasClass('btn-group-reversed'))
{
if ($self.val() == '')
{
$('label[for=' + attrId + ']').addClass('active btn-primary');
}
else if ($self.val() == 0)
{
$('label[for=' + attrId + ']').addClass('active btn-danger');
$('label[for=' + attrId + ']').addClass('active btn-success');
}
else
{
$('label[for=' + attrId + ']').addClass('active btn-success');
$('label[for=' + attrId + ']').addClass('active btn-danger');
}
}
else
Expand All @@ -97,11 +97,11 @@
}
else if ($self.val() == 0)
{
$('label[for=' + attrId + ']').addClass('active btn-success');
$('label[for=' + attrId + ']').addClass('active btn-danger');
}
else
{
$('label[for=' + attrId + ']').addClass('active btn-danger');
$('label[for=' + attrId + ']').addClass('active btn-success');
}
}
});
Expand Down