Improve crl and certificate display

openxpki · Jan 30, 2015 · 7f5b057 · 7f5b057
1 parent 5161080
commit 7f5b057
Show file tree

Hide file tree

Showing 12 changed files with 218 additions and 144 deletions.
diff --git a/config/openxpki/config.d/realm/ca-one/uicontrol/Anonymous.yaml b/config/openxpki/config.d/realm/ca-one/uicontrol/Anonymous.yaml
@@ -13,7 +13,7 @@ main:
     entries: 
       - key:   information!issuer
         label: CA certificates
-      - key:   information!crl
+      - key:   crl!index
         label: Revocation lists
 
   - key:   certificate!search

diff --git a/config/openxpki/config.d/realm/ca-one/uicontrol/CA Operator.yaml b/config/openxpki/config.d/realm/ca-one/uicontrol/CA Operator.yaml
@@ -19,7 +19,7 @@ main:
     entries: 
       - key:   information!issuer
         label: CA certificates
-      - key:   information!crl
+      - key:   crl!index
         label: Revocation lists
 
 
diff --git a/config/openxpki/config.d/realm/ca-one/uicontrol/RA Operator.yaml b/config/openxpki/config.d/realm/ca-one/uicontrol/RA Operator.yaml
@@ -39,7 +39,7 @@ main:
     entries: 
       - key:   information!issuer
         label: CA certificates
-      - key:   information!crl
+      - key:   crl!index
         label: Revocation lists
 
   - key:   certificate!search

diff --git a/config/openxpki/config.d/realm/ca-one/uicontrol/_default.yaml b/config/openxpki/config.d/realm/ca-one/uicontrol/_default.yaml
@@ -24,7 +24,7 @@ main:
     entries: 
       - key:   information!issuer
         label: CA certificates
-      - key:   information!crl
+      - key:   crl!index
         label: Revocation lists
 
   - key:   certificate!search

diff --git a/core/htdocs_source/style/oxi-grid.css b/core/htdocs_source/style/oxi-grid.css
@@ -9,7 +9,7 @@ tr.gridrow-issued > td {}
 tr.gridrow-issued:hover > td {background-color: #E7E7E7 !important;}
 tr.gridrow-expired > td {background-color:#fcf8e3 !important;}
 tr.gridrow-expired:hover > td {background-color: #E7E7E7 !important;}
-tr.gridrow-revoked > td {background-color: ##f2dede !important;}
+tr.gridrow-revoked > td {background-color: #f2dede !important;}
 tr.gridrow-revoked:hover > td {background-color: #e6c1c7 !important;}
 
 /* ca certificat/token specific classes: online, offline, upcomging */

diff --git a/core/i18n/en_GB/openxpki.po b/core/i18n/en_GB/openxpki.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: OpenXPKI 0.9\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 14:02+0200\n"
-"PO-Revision-Date: 2015-01-30 11:08+0100\n"
+"PO-Revision-Date: 2015-01-30 14:55+0100\n"
 "Last-Translator: OpenXPKI Team <i18n@openxpki.org>\n"
 "Language-Team: OpenXPKI developers list <openxpki-devel@lists.sourceforge."
 "net>\n"
@@ -131,19 +131,6 @@ msgstr ""
 msgid "I18N_OPENXPKI_BACKEND_OPENSSL_INSTANTIATE_CLI_FAILED"
 msgstr "OpenXPKI::Crypto::Backend::OpenSSL::__init_cli() failed"
 
-# Delete this!!!
-msgid "I18N_OPENXPKI_CERT_"
-msgstr "This message should never be displayed. Please delete the translation."
-
-msgid "I18N_OPENXPKI_CERT_EXPIRED"
-msgstr "Expired"
-
-msgid "I18N_OPENXPKI_CERT_ISSUED"
-msgstr "Issued"
-
-msgid "I18N_OPENXPKI_CERT_REVOKED"
-msgstr "Revoked"
-
 # Should probably be deleted. It appears only in a commented-out block of code.
 #, fuzzy
 msgid "I18N_OPENXPKI_CLIENT_CLI_INIT_AUTH_STACK_ENTER_ID"
@@ -3933,16 +3920,16 @@ msgid "I18N_OPENXPKI_UI_CERT_STATUS_CRL_PENDING"
 msgstr "revocation pending"
 
 msgid "I18N_OPENXPKI_UI_CERT_STATUS_EXPIRED"
-msgstr "expired"
+msgstr "Expired"
 
 msgid "I18N_OPENXPKI_UI_CERT_STATUS_ISSUED"
-msgstr "issued"
+msgstr "Issued"
 
 msgid "I18N_OPENXPKI_UI_CERT_STATUS_REVOKED"
-msgstr "revoked"
+msgstr "Revoked"
 
 msgid "I18N_OPENXPKI_UI_CERT_STATUS_VALID"
-msgstr "valid"
+msgstr "Valid"
 
 msgid "I18N_OPENXPKI_UI_COMMENT"
 msgstr "Comment"
@@ -3987,7 +3974,10 @@ msgid "I18N_OPENXPKI_UI_DOWNLOAD_SHORT_PEM"
 msgstr "PEM (CRT)"
 
 msgid "I18N_OPENXPKI_UI_DOWNLOAD_TXT"
-msgstr "TXT format"
+msgstr "Download text (TXT) format"
+
+msgid "I18N_OPENXPKI_UI_DOWNLOAD_SHORT_TXT"
+msgstr "Text (txt)"
 
 msgid "I18N_OPENXPKI_UI_ERROR_VALIDATOR_VALIDITY_TIME_FAILED"
 msgstr "The entered date/time could not be validated."

diff --git a/core/server/OpenXPKI/Client/UI/Certificate.pm b/core/server/OpenXPKI/Client/UI/Certificate.pm
@@ -107,7 +107,7 @@ sub init_detail {
         { label => 'Identifier', value => $cert_identifier },
         { label => 'not before', value => $cert->{BODY}->{NOTBEFORE}, format => 'timestamp'  },
         { label => 'not after', value => $cert->{BODY}->{NOTAFTER}, format => 'timestamp' },
-        { label => 'Status', value => { label => i18nGettext('I18N_OPENXPKI_CERT_'.$cert->{STATUS}) , value => $cert->{STATUS} }, format => 'certstatus' },
+        { label => 'Status', value => { label => i18nGettext('I18N_OPENXPKI_UI_CERT_STATUS_'.$cert->{STATUS}) , value => $cert->{STATUS} }, format => 'certstatus' },
         { label => 'Issuer',  format=>'link', value => { label => $cert->{BODY}->{ISSUER}, page => 'certificate!chain!identifier!'. $cert_identifier } },
     );
 
@@ -469,7 +469,7 @@ sub action_search {
     my $self = shift;
     my $args = shift;
 
-    my $query = { LIMIT => 100 }; # Safety barrier
+    my $query = { ENTITY_ONLY => 1, LIMIT => 100 }; # Safety barrier
     foreach my $key (qw(subject issuer_dn profile)) {
         my $val = $self->param($key);
         if (defined $val && $val ne '') {
@@ -531,7 +531,7 @@ sub action_search {
         push @result, [
             $item->{CERTIFICATE_SERIAL},
             $self->_escape($item->{SUBJECT}),
-            $item->{EMAIL} || '',
+            { label => i18nGettext('I18N_OPENXPKI_UI_CERT_STATUS_'.$item->{STATUS}) , value => $item->{STATUS} },
             $item->{NOTBEFORE},
             $item->{NOTAFTER},
             $self->_escape($item->{ISSUER_DN}),
@@ -567,13 +567,13 @@ sub action_search {
                 target => 'tab',
             }],
             columns => [
-                { sTitle => "serial"},
-                { sTitle => "subject" },
-                { sTitle => "email"  },
-                { sTitle => "notbefore", format => 'timestamp' },
-                { sTitle => "notafter", format => 'timestamp' },
-                { sTitle => "issuer"},
-                { sTitle => "identifier"},
+                { sTitle => "Serial"},
+                { sTitle => "Subject" },
+                { sTitle => "Status", format => 'certstatus' },
+                { sTitle => "Notbefore", format => 'timestamp' },
+                { sTitle => "Notafter", format => 'timestamp' },
+                { sTitle => "Issuer"},
+                { sTitle => "Identifier"},
                 { sTitle => "_className"},
             ],
             data => \@result