From 5643b6315eec738163155729461bad15af26fb7b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 24 Aug 2018 11:10:15 +0200
Subject: [PATCH] Small improvements

---
 plugins/enigma/enigma.php | 21 ++++++++-------------
 program/js/app.js         |  4 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php
index cab792676..5a5bbc03d 100644
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@@ -442,15 +442,14 @@ class enigma extends rcube_plugin
             // find private keys for this identity
             if ($p['record']['email']) {
                 $listing = array();
-                $engine = $this->load_engine();
-                $keys = (array)$engine->list_keys($p['record']['email']);
+                $engine  = $this->load_engine();
+                $keys    = (array)$engine->list_keys($p['record']['email']);
 
                 foreach ($keys as $key) {
                     if ($key->get_type() === enigma_key::TYPE_KEYPAIR) {
                         $listing[] = html::tag('li', null,
-                            html::tag('span', 'identity', html::quote($key->name)) .
-                            ' ' .
                             html::tag('strong', 'uid', html::quote($key->id))
+                            . ' ' . html::tag('span', 'identity', html::quote($key->name))
                         );
                     }
                 }
@@ -464,16 +463,12 @@ class enigma extends rcube_plugin
             }
 
             // add button linking to enigma key management
-            $content .= html::p(
-                null,
-                html::a(
-                    array(
-                        'class' => 'button',
-                        'href' => $this->rc->url(array('action' => 'plugin.enigmakeys')),
-                        'target' => '_parent',
-                    ),
-                    $this->gettext('managekeys'))
+            $button_attr = array(
+                'class'  => 'button',
+                'href'   => $this->rc->url(array('action' => 'plugin.enigmakeys')),
+                'target' => '_parent',
             );
+            $content .= html::p(null, html::a($button_attr, $this->gettext('managekeys')));
 
             // rename class to avoid Mailvelope key management to kick in
             $p['form']['encryption']['attrs'] = array('class' => 'enigma-identity-encryption');
diff --git a/program/js/app.js b/program/js/app.js
index 74caa935e..8b97bbc31 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4109,8 +4109,8 @@ function rcube_webmail()
           var ul = $('<ul>').addClass('keylist').appendTo(content);
           $.each(private_keys, function(i, key) {
             $('<li>').appendTo(ul)
-              .append($('<span>').addClass('identity').text('<' + identity_email + '> '))
-              .append($('<strong>').addClass('fingerprint').text(String(key.fingerprint).toUpperCase()));
+              .append($('<strong>').addClass('fingerprint').text(String(key.fingerprint).toUpperCase()))
+              .append($('<span>').addClass('identity').text('<' + identity_email + '> '));
           });
         } else {
           $('<p>').text(ref.get_label('encryptionnoprivkeysinmailvelope')).appendTo(content);