[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.0alpha1-217-g5cd71e843c

[? sunnavy]

The branch, 5.0-trunk has been updated
       via  5cd71e843cad617c7043e2917f6f5d2f5eb8e22c (commit)
       via  58a3a7aa4baec618d3e52afa4e51f53a0f8a0015 (commit)
       via  5544908dd3e2ae84e8706eb95c0407e63d14dfe6 (commit)
       via  e1efbd848d5476a44709f1938b7b4d213c43fa27 (commit)
      from  d0b0fdfdd648b4b8d2235d79f32378db75dbe247 (commit)

Summary of changes:
 share/html/Elements/Crypt/SelectKeyForSigning |  2 +-
 share/html/Elements/Crypt/SignEncryptWidget   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit e1efbd848d5476a44709f1938b7b4d213c43fa27
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Tue Jan 28 18:57:59 2020 -0500

    Do not output mason component into loc
    
    This will result in the components HTML being rendered as an
    escaped string in the UI.

diff --git a/share/html/Elements/Crypt/SignEncryptWidget b/share/html/Elements/Crypt/SignEncryptWidget
index b840671c4e..c86c605562 100644
--- a/share/html/Elements/Crypt/SignEncryptWidget
+++ b/share/html/Elements/Crypt/SignEncryptWidget
@@ -48,10 +48,13 @@
 <div class="form-row">
   <div class="col-auto">
 % if ( RT->Config->Get('Crypt')->{'Outgoing'} eq 'GnuPG' ) {
-    <& '/Widgets/Form/Boolean:InputOnly',
+    <div class="form-inline">
+      <& '/Widgets/Form/Boolean:InputOnly',
         Name => 'Sign', CurrentValue => $self->{'Sign'},
-        DefaultLabel => loc( 'Sign using [_1]', $m->scomp('SelectKeyForSigning', User => $session{'CurrentUser'}->UserObj ) ),
-    &>
+        DefaultLabel => loc( 'Sign using' ),
+      &>
+       <& 'SelectKeyForSigning', User => $session{'CurrentUser'}->UserObj &>
+    </div>
 % } else {
     <& '/Widgets/Form/Boolean:InputOnly',
         Name => 'Sign', CurrentValue => $self->{'Sign'},

commit 5544908dd3e2ae84e8706eb95c0407e63d14dfe6
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Tue Jan 28 18:58:52 2020 -0500

    Migrate SelectKeyForSigning component to bootstrap

diff --git a/share/html/Elements/Crypt/SelectKeyForSigning b/share/html/Elements/Crypt/SelectKeyForSigning
index bec37bfc02..2ac03581c2 100644
--- a/share/html/Elements/Crypt/SelectKeyForSigning
+++ b/share/html/Elements/Crypt/SelectKeyForSigning
@@ -46,7 +46,7 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % if ( $user_key ) {
-<select name="<% $Name %>">
+<select class="form-control selectpicker" name="<% $Name %>">
 <option value=""><% loc("Queue's key") %></option>
 <option value="<% $user_key %>"><% $user_key %></option>
 </select>

commit 58a3a7aa4baec618d3e52afa4e51f53a0f8a0015
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue May 5 00:08:25 2020 +0800

    Fix missing closing div when outgoing crypt is GnuPG in SignEncryptWidget

diff --git a/share/html/Elements/Crypt/SignEncryptWidget b/share/html/Elements/Crypt/SignEncryptWidget
index c86c605562..f3aa35fafc 100644
--- a/share/html/Elements/Crypt/SignEncryptWidget
+++ b/share/html/Elements/Crypt/SignEncryptWidget
@@ -60,8 +60,8 @@
         Name => 'Sign', CurrentValue => $self->{'Sign'},
         DefaultLabel => loc( 'Sign' ),
     &>
-  </div>
 % }
+  </div>
 
   <div class="col-auto">
     <& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $self->{'Encrypt'}, DefaultLabel => loc( 'Encrypt' ) &>

commit 5cd71e843cad617c7043e2917f6f5d2f5eb8e22c
Merge: d0b0fdfdd6 58a3a7aa4b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue May 5 01:22:26 2020 +0800

    Merge branch '4.6/migrate-gpg-components-to-bootstrap' into 5.0-trunk


-----------------------------------------------------------------------