[Rt-commit] rt branch, 4.6/migrate-gpg-components-to-bootstrap, created. rt-4.4.4-722-gff818a9653

[Craig Kaiser]

The branch, 4.6/migrate-gpg-components-to-bootstrap has been created
        at  ff818a96538d0664d0fddc9df014ce93bb1d61a3 (commit)

- Log -----------------------------------------------------------------
commit c584db115817bb0ed1ec232fa6e81da3c63d7d5a
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 73e2f13817..1e0d661aff 100644
--- a/share/html/Elements/Crypt/SignEncryptWidget
+++ b/share/html/Elements/Crypt/SignEncryptWidget
@@ -48,17 +48,20 @@
 <div class="form-row">
   <div class="col-md-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'},
         DefaultLabel => loc( 'Sign' ),
     &>
-  </div>
 % }
+  </div>
 
   <div class="col-md-auto">
     <& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $self->{'Encrypt'}, DefaultLabel => loc( 'Encrypt' ) &>

commit ff818a96538d0664d0fddc9df014ce93bb1d61a3
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>
diff --git a/share/html/Elements/Crypt/SignEncryptWidget b/share/html/Elements/Crypt/SignEncryptWidget
index 1e0d661aff..dd5450e808 100644
--- a/share/html/Elements/Crypt/SignEncryptWidget
+++ b/share/html/Elements/Crypt/SignEncryptWidget
@@ -46,25 +46,24 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <div class="form-row">
-  <div class="col-md-auto">
 % if ( RT->Config->Get('Crypt')->{'Outgoing'} eq 'GnuPG' ) {
-    <div class="form-inline">
-      <& '/Widgets/Form/Boolean:InputOnly',
-        Name => 'Sign', CurrentValue => $self->{'Sign'},
-        DefaultLabel => loc( 'Sign using ' ),
-      &>
-      <& 'SelectKeyForSigning', User => $session{'CurrentUser'}->UserObj &>
-    </div>
+  <div class="form-inline">
+     <div class="form-group">
+       <& '/Widgets/Form/Boolean:InputOnly',
+          Name => 'Sign', CurrentValue => $self->{'Sign'},
+          DefaultLabel => loc( 'Sign using ' ),
+        &>
+        <& 'SelectKeyForSigning', User => $session{'CurrentUser'}->UserObj &>
+      </div>
 % } else {
-    <& '/Widgets/Form/Boolean:InputOnly',
+      <& '/Widgets/Form/Boolean:InputOnly',
         Name => 'Sign', CurrentValue => $self->{'Sign'},
         DefaultLabel => loc( 'Sign' ),
-    &>
+      &>
 % }
-  </div>
-
-  <div class="col-md-auto">
-    <& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $self->{'Encrypt'}, DefaultLabel => loc( 'Encrypt' ) &>
+    <div class="form-group">
+      <& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $self->{'Encrypt'}, DefaultLabel => loc( 'Encrypt' ) &>
+    </div>
   </div>
 </div>
 

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