From fb1f9ecf9ffa615653ac0fc62c84e27851835a6d Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 13 Jan 2011 17:20:12 +0700 Subject: Certificate and Kerberos key status adjustments. The OTP field has been moved into a separate row to avoid line wrapping. The line height inside tables has been increased to avoid overlapping buttons in certificate status panel. --- install/static/certificate.js | 8 +++++++- install/static/host.js | 14 ++++++++++++-- install/static/ipa.css | 11 +++++++++++ install/static/service.js | 4 +++- 4 files changed, 33 insertions(+), 4 deletions(-) mode change 100644 => 100755 install/static/certificate.js diff --git a/install/static/certificate.js b/install/static/certificate.js old mode 100644 new mode 100755 index f8e77dd4..e81d3a78 --- a/install/static/certificate.js +++ b/install/static/certificate.js @@ -413,7 +413,9 @@ function certificate_status_widget(spec) { that.widget_create(container); - var table = $('').appendTo(container); + var table = $('
', { + 'class': 'certificate-status' + }).appendTo(container); var tr = $('').appendTo(table); @@ -434,12 +436,16 @@ function certificate_status_widget(spec) { 'value': 'Get' }).appendTo(td); + td.append(' '); + if (!that.is_selfsign()) { $('', { 'type': 'button', 'name': 'revoke', 'value': 'Revoke' }).appendTo(td); + + td.append(' '); } $('', { diff --git a/install/static/host.js b/install/static/host.js index 2e82936b..76c5943c 100644 --- a/install/static/host.js +++ b/install/static/host.js @@ -221,7 +221,9 @@ function host_provisioning_status_widget(spec) { that.widget_create(container); - var table = $('
').appendTo(container); + var table = $('
', { + 'class': 'kerberos-key-status' + }).appendTo(container); var tr = $('').appendTo(table); @@ -262,12 +264,20 @@ function host_provisioning_status_widget(spec) { td = $('').appendTo(table); + + td = $('
').appendTo(tr); + tr = $('
').appendTo(tr); + + td = $('').appendTo(tr); + $('', { 'type': 'text', 'name': 'otp', - 'size': 10 + 'class': 'otp' }).appendTo(td); + td = $('').appendTo(tr); + $('', { 'type': 'button', 'name': 'enroll', diff --git a/install/static/ipa.css b/install/static/ipa.css index 0b64203e..d94dbc75 100644 --- a/install/static/ipa.css +++ b/install/static/ipa.css @@ -233,6 +233,10 @@ dl.entryattrs input { min-width: 27.5em; } +dl.entryattrs input.otp { + min-width: 15em; + width: 98%; +} span.attrhint { font-size: 8pt; @@ -606,6 +610,13 @@ a.action-button-disabled { .strikethrough { text-decoration: line-through; } +table.certificate-status { + line-height: 2; +} + +table.kerberos-key-status { + line-height: 2; +} .status-icon { width: 0.5em; diff --git a/install/static/service.js b/install/static/service.js index ad3a2fe6..62243c22 100644 --- a/install/static/service.js +++ b/install/static/service.js @@ -274,7 +274,9 @@ function service_provisioning_status_widget(spec) { that.widget_create(container); - var table = $('').appendTo(container); + var table = $('
', { + 'class': 'kerberos-key-status' + }).appendTo(container); var tr = $('').appendTo(table); -- cgit