Putting 4.2.0 on top of 4.0.17

[usit-rt.git] / share / html / Admin / Queues / Modify.html

diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 49736a45a2680acdbf98573ca193b61084be9cea..5e20e275deaf76ff008135d69d11550d31b99b0f 100644 (file)
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -106,36 +106,34 @@
 <tr valign="top"><td align="right">
 <% loc($CF->Name) %>:
 </td><td>
-<& /Elements/EditCustomField, CustomField => $CF, 
-                              Object => $QueueObj, 
-                              ($Create ? (NamePrefix => 'Object-RT::Queue--CustomField-') 
-                                       : () )&>
+<& /Elements/EditCustomField, CustomField => $CF,
+                              Object => $QueueObj, &>
 </td></tr>
 % }
 
-% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
-<tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
-<td><&|/l&>Sign by default</&></td>
-<td align="right"><input type="checkbox" class="checkbox" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
-<td><&|/l&>Encrypt by default</&></td>
+% if ( RT->Config->Get('Crypt')->{'Enable'} ) {
+<tr><td align="right"><input type="checkbox" class="checkbox" id="Sign" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
+<td><label for="Sign"><&|/l&>Sign by default</&></label></td>
+<td align="right"><input type="checkbox" class="checkbox" id="Encrypt" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
+<td><label for="Encrypt"><&|/l&>Encrypt by default</&></label></td>
 </tr>
 <tr><td align="right"><input type="checkbox" class="checkbox" name="SignAuto" value="1" <% $QueueObj->SignAuto? 'checked="checked"': '' |n%> /></td>
 <td colspan="3"><&|/l_unsafe, "<b>","</b>","<i>","</i>"&>Sign all auto-generated mail.  [_1]Caution[_2]: Enabling this option alters the signature from providing [_3]authentication[_4] to providing [_3]integrity[_4].</&></td></tr>
 % }
 
-<tr><td align="right"><input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
-<td colspan="3"><&|/l&>Enabled (Unchecking this box disables this queue)</&><br />
+<tr><td align="right"><input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
+<td colspan="3"><label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this queue)</&></label><br />
 % $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
 </td></tr>
 
-% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
+% if ( RT->Config->Get('Crypt')->{'Enable'} ) {
 <tr><td colspan="4">
 % if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) {
 <& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
 % } else {
-<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &>
-<i><&|/l&>You have enabled GnuPG support but have not set a correspondence address for this queue.</&>
-<&|/l&>You must set a correspondence address for this queue in order to configure a GnuPG private key.</&></i>
+<&|/Widgets/TitleBox, title => loc( 'Private keys') &>
+<i><&|/l&>You have enabled encryption support but have not set a correspondence address for this queue.</&>
+<&|/l&>You must set a correspondence address for this queue in order to configure a private key.</&></i>
 </&>
 % }
 </td></tr>
@@ -143,9 +141,9 @@
 % if ( my $email = $QueueObj->CommentAddress || RT->Config->Get('CommentAddress') ) {
 <& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
 % } else {
-<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &>
-<i><&|/l&>You have enabled GnuPG support but have not set a comment address for this queue.</&>
-<&|/l&>You must set a comment address for this queue in order to configure a GnuPG private key.</&></i>
+<&|/Widgets/TitleBox, title => loc( 'Private keys') &>
+<i><&|/l&>You have enabled encryption support but have not set a comment address for this queue.</&>
+<&|/l&>You must set a comment address for this queue in order to configure a private key.</&></i>
 </&>
 %}
 </td></tr>