IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Status widgets icons

Browse Source 
https://fedorahosted.org/freeipa/ticket/3904
This commit is contained in:
Petr Vobornik
2013-11-06 14:44:55 +01:00
committed by Martin Kosek
parent c4abe3a2d9
commit af26018c0d
4 changed files with 83 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
install/ui/ipa.css
View File

@@ -776,43 +776,6 @@ textarea.certificate {
height: 250px; height: 250px;
} }
table.certificate-status {
line-height: 2;
}
table.kerberos-key-status {
line-height: 2;
}
.status-icon {
vertical-align: bottom;
}
.status-valid {
background-image: url(images/check-icon.png);
border: 0.2em solid #008000;
}
.status-valid-active {
background-color: #008000;
}
.status-revoked {
border: 0.2em solid #ff0000;
}
.status-revoked-active {
background-color: #ff0000;
}
.status-missing {
border: 0.2em solid #daa520;
}
.status-missing-active {
background-color: #daa520;
}
.error-message-hinted { .error-message-hinted {
color: red; color: red;
padding-top: 0.5em; padding-top: 0.5em;
@@ -1092,6 +1055,10 @@ table.scrollable tbody {
width: 180px; width: 180px;
} }
.certificate-status {
display: inline-block;
}
/* Info and simple pages (not main app) */ /* Info and simple pages (not main app) */
body.info-page { body.info-page {

76
install/ui/src/freeipa/certificate.js
View File

@@ -823,60 +823,44 @@ IPA.cert.status_widget = function(spec) {
that.widget_create(container); that.widget_create(container);
that.status_valid = $('<div/>', { that.status_valid = that.create_status('certificate-valid',
name: 'certificate-valid', text.get('@i18n:objects.cert.valid'),
style: 'display: none;' 'fa fa-check');
}).appendTo(container); that.status_valid.appendTo(container);
$('<img/>', { that.status_revoked = that.create_status('certificate-revoked',
src: 'images/check-icon.png', text.get('@i18n:objects.cert.revoked'),
style: 'float: left;', 'fa fa-warning');
'class': 'status-icon' that.status_revoked.appendTo(container);
}).appendTo(that.status_valid);
var content_div = $('<div/>', {
style: 'float: left;'
}).appendTo(that.status_valid);
content_div.append('<b>'+text.get('@i18n:objects.cert.valid')+'</b>');
that.status_revoked = $('<div/>', {
name: 'certificate-revoked',
style: 'display: none;'
}).appendTo(container);
$('<img/>', {
src: 'images/caution-icon.png',
style: 'float: left;',
'class': 'status-icon'
}).appendTo(that.status_revoked);
content_div = $('<div/>', {
style: 'float: left;'
}).appendTo(that.status_revoked);
content_div.append('<b>'+text.get('@i18n:objects.cert.revoked')+'</b>');
content_div.append(' ');
that.revocation_reason = $('<span/>', { that.revocation_reason = $('<span/>', {
'name': 'revocation_reason' 'name': 'revocation_reason'
}).appendTo(content_div); }).appendTo(that.status_revoked);
that.status_missing = $('<div/>', { that.status_missing = that.create_status('certificate-missing',
name: 'certificate-missing', text.get('@i18n:objects.cert.missing'),
'fa fa-warning');
that.status_missing.appendTo(container);
};
that.create_status = function(name, text, icon) {
var container = $('<div>', {
name: name,
style: 'display: none;' style: 'display: none;'
});
var status = $('<label/>', {
'class': 'certificate-status'
}).appendTo(container); }).appendTo(container);
$('<img/>', { $('<i/>', {
src: 'images/caution-icon.png', 'class': icon
style: 'float: left;', }).appendTo(status);
'class': 'status-icon'
}).appendTo(that.status_missing);
content_div = $('<div/>', { status.append(" " +text);
style: 'float: left;'
}).appendTo(that.status_missing);
content_div.append('<b>'+text.get('@i18n:objects.cert.missing')+'</b>'); return container;
}; };
that.update = function(certificate) { that.update = function(certificate) {
@@ -911,7 +895,9 @@ IPA.cert.status_widget = function(spec) {
that.status_revoked.css('display', status === IPA.cert.CERTIFICATE_STATUS_REVOKED ? '' : 'none'); that.status_revoked.css('display', status === IPA.cert.CERTIFICATE_STATUS_REVOKED ? '' : 'none');
var reason = IPA.cert.CRL_REASON[revocation_reason]; var reason = IPA.cert.CRL_REASON[revocation_reason];
that.revocation_reason.html(revocation_reason === undefined || reason === null ? '' : text.get('@i18n:objects.cert.'+reason)); var reason_text = revocation_reason === undefined || reason === null ? '' : text.get('@i18n:objects.cert.'+reason);
reason_text = ' ('+reason_text+')';
that.revocation_reason.html(reason_text);
} }
}; };

72
install/ui/src/freeipa/host.js
View File

@@ -589,33 +589,31 @@ IPA.host_keytab_widget = function(spec) {
that.widget_create(container); that.widget_create(container);
that.missing_span = $('<span/>', { that.missing_el = $('<label/>', {
name: 'missing', name: 'missing',
style: 'display: none;' style: 'display: none;'
}).appendTo(container); }).appendTo(container);
$('<img/>', { $('<i/>', {
src: 'images/caution-icon.png', 'class': 'fa fa-warning'
'class': 'status-icon' }).appendTo(that.missing_el);
}).appendTo(that.missing_span);
that.missing_span.append(' '); that.missing_el.append(' ');
that.missing_span.append(text.get('@i18n:objects.host.keytab_missing')); that.missing_el.append(text.get('@i18n:objects.host.keytab_missing'));
that.present_span = $('<span/>', { that.present_el = $('<label/>', {
name: 'present', name: 'present',
style: 'display: none;' style: 'display: none;'
}).appendTo(container); }).appendTo(container);
$('<img/>', { $('<i/>', {
src: 'images/check-icon.png', 'class': 'fa fa-check'
'class': 'status-icon' }).appendTo(that.present_el);
}).appendTo(that.present_span);
that.present_span.append(' '); that.present_el.append(' ');
that.present_span.append(text.get('@i18n:objects.host.keytab_present')); that.present_el.append(text.get('@i18n:objects.host.keytab_present'));
}; };
that.update = function(values) { that.update = function(values) {
@@ -625,13 +623,13 @@ IPA.host_keytab_widget = function(spec) {
}; };
that.clear = function() { that.clear = function() {
that.present_span.css('display', 'none'); that.present_el.css('display', 'none');
that.missing_span.css('display', 'none'); that.missing_el.css('display', 'none');
}; };
function set_status(status) { function set_status(status) {
that.present_span.css('display', status == 'present' ? 'inline' : 'none'); that.present_el.css('display', status == 'present' ? '' : 'none');
that.missing_span.css('display', status == 'missing' ? 'inline' : 'none'); that.missing_el.css('display', status == 'missing' ? '' : 'none');
} }
return that; return that;
@@ -753,32 +751,30 @@ IPA.host_password_widget = function(spec) {
that.widget_create(container); that.widget_create(container);
that.missing_span = $('<span/>', { that.missing_el = $('<label/>', {
name: 'missing' name: 'missing'
}).appendTo(container); }).appendTo(container);
$('<img/>', { $('<i/>', {
src: 'images/caution-icon.png', 'class': 'fa fa-warning'
'class': 'status-icon' }).appendTo(that.missing_el);
}).appendTo(that.missing_span);
that.missing_span.append(' '); that.missing_el.append(' ');
that.missing_span.append(text.get('@i18n:objects.host.password_missing')); that.missing_el.append(text.get('@i18n:objects.host.password_missing'));
that.present_span = $('<span/>', { that.present_el = $('<label/>', {
name: 'present', name: 'present',
style: 'display: none;' style: 'display: none;'
}).appendTo(container); }).appendTo(container);
$('<img/>', { $('<i/>', {
src: 'images/check-icon.png', 'class': 'fa fa-check'
'class': 'status-icon' }).appendTo(that.present_el);
}).appendTo(that.present_span);
that.present_span.append(' '); that.present_el.append(' ');
that.present_span.append(text.get('@i18n:objects.host.password_present')); that.present_el.append(text.get('@i18n:objects.host.password_present'));
}; };
that.update = function(values) { that.update = function(values) {
@@ -788,8 +784,8 @@ IPA.host_password_widget = function(spec) {
}; };
that.clear = function() { that.clear = function() {
that.missing_span.css('display', 'none'); that.missing_el.css('display', 'none');
that.present_span.css('display', 'none'); that.present_el.css('display', 'none');
}; };
function set_status(status) { function set_status(status) {
@@ -797,11 +793,11 @@ IPA.host_password_widget = function(spec) {
that.status = status; that.status = status;
if (status == 'missing') { if (status == 'missing') {
that.missing_span.css('display', 'inline'); that.missing_el.css('display', '');
that.present_span.css('display', 'none'); that.present_el.css('display', 'none');
} else { } else {
that.missing_span.css('display', 'none'); that.missing_el.css('display', 'none');
that.present_span.css('display', 'inline'); that.present_el.css('display', '');
} }
} }

32
install/ui/src/freeipa/service.js
View File

@@ -322,37 +322,33 @@ IPA.service_provisioning_status_widget = function (spec) {
that.status_valid = $('<div/>', { that.status_valid = $('<div/>', {
name: 'kerberos-key-valid', name: 'kerberos-key-valid',
'class': 'provisioning-status',
style: 'display: none;' style: 'display: none;'
}).appendTo(container); }).appendTo(container);
$('<img/>', { var content = $('<label/>', {
src: 'images/check-icon.png',
style: 'float: left;',
'class': 'status-icon'
}).appendTo(that.status_valid); }).appendTo(that.status_valid);
var content_div = $('<div/>', { $('<i/>', {
style: 'float: left;' 'class': 'fa fa-check'
}).appendTo(that.status_valid); }).appendTo(content);
content.append(' ');
content_div.append('<b>'+text.get('@i18n:objects.service.valid')+'</b>'); content.append(text.get('@i18n:objects.service.valid'));
that.status_missing = $('<div/>', { that.status_missing = $('<div/>', {
name: 'kerberos-key-missing', name: 'kerberos-key-missing',
'class': 'provisioning-status',
style: 'display: none;' style: 'display: none;'
}).appendTo(container); }).appendTo(container);
$('<img/>', { content = $('<label/>', {
src: 'images/caution-icon.png',
style: 'float: left;',
'class': 'status-icon'
}).appendTo(that.status_missing); }).appendTo(that.status_missing);
content_div = $('<div/>', { $('<i/>', {
style: 'float: left;' 'class': 'fa fa-warning'
}).appendTo(that.status_missing); }).appendTo(content);
content.append(' ');
content_div.append('<b>'+text.get('@i18n:objects.service.missing')+'</b>'); content.append(text.get('@i18n:objects.service.missing'));
}; };
that.update = function(values) { that.update = function(values) {