Bug 488943: Clarify the text of the "Private" checkbox for comments and attachments

Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=pyrzak, r=LpSolit, a=LpSolit

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 687cd7cbf24bae3403b202695ecbf22a955b290e..f725f1076489cf7a7ea2c7a77a52f4befd878f07 100644 (file)
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -110,10 +110,13 @@
       <tr>
         <th>Privacy:</th>
         <td>
-          <em>If the attachment is private, check the box below.</em><br>
           <input type="checkbox" name="isprivate" id="isprivate"
           value="1" onClick="updateCommentPrivacy(this)">
-        <label for="isprivate">Private</label>
+          <label for="isprivate">
+            Make attachment and comment private (visible only to members of
+            the <strong>[% Param('insidergroup') FILTER html %]</strong>
+            group)
+          </label>
         </td>
       </tr>
     [% END %]

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index db92d18d3963037fe2b24a55f23ec62f9f8cad82..1c6d22c8707d66ef9820e3af0f70f5f7a927f998 100644 (file)
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -94,10 +94,13 @@
           <input type="checkbox" id="isobsolete" name="isobsolete" value="1"
                  [%+ 'checked="checked"' IF attachment.isobsolete %]>
           <label for="isobsolete">obsolete</label>
-          [% IF (Param("insidergroup") && user.in_group(Param("insidergroup"))) %]
+          [% IF user.is_insider %]
+            <br>
             <input type="checkbox" id="isprivate" name="isprivate" value="1"
                    [% " checked" IF attachment.isprivate %]>
-            <label for="isprivate">private</label><br>
+            <label for="isprivate">private (only visible to 
+              <strong>[% Param('insidergroup') FILTER html %]</strong>)
+            </label>
           [% END %]
           <br>
         </small>

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 2cee5c91d7268712211737e8832ed9b3c1c47e83..e26e0a29ae1ec49418571ed1d868e12ee1a90ea4 100644 (file)
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -517,7 +517,7 @@ TUI_hide_default('expert_fields');
     </td>
   </tr>
 
-  [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %]
+  [% IF user.is_insider %]
     <tr class="expert_fields">
       <th>&nbsp;</th>
       <td colspan="3">
@@ -525,7 +525,8 @@ TUI_hide_default('expert_fields');
         <input type="checkbox" id="commentprivacy" name="commentprivacy"
           [% " checked=\"checked\"" IF commentprivacy %]>
         <label for="commentprivacy">
-          Initial Description is Private
+          Make description private (visible only to members of the 
+          <strong>[% Param('insidergroup') FILTER html %]</strong> group)
         </label>
       </td>
     </tr>

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index de89f1b8e7bd48ae65cb3050e645d50ebbb055a4..50cf575b246f7c07cba34b8fcdb95aed998afebc 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -240,11 +240,15 @@
         [% IF user.id %]
         <table><tr><td>
           <label for="comment" accesskey="c"><b>Additional <u>C</u>omments</b></label>:
-          [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %]
+          [% IF user.is_insider %]
             <input type="checkbox" name="commentprivacy" value="1"
                    id="newcommentprivacy"
                    onClick="updateCommentTagControl(this, form)">
-            <label for="newcommentprivacy">Private</label>
+            <label for="newcommentprivacy"> 
+              Make comment private (visible only to members of the
+              <strong>[% Param('insidergroup') FILTER html %]</strong>
+              group)
+            </label>
           [% END %]
           <br>
           [% INCLUDE global/textarea.html.tmpl

diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 46130ef6bf18b553aed9e18af231d11aba41a674..4cbc8b6e2b3d0a94b7cbceca39e1fe11725261b9 100644 (file)
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -290,7 +290,10 @@
   <input type="checkbox" name="commentprivacy" value="1"
          id="newcommentprivacy"
          onClick="updateCommentTagControl(this, form)"/>
-  <label for="newcommentprivacy">Private</label>
+   <label for="newcommentprivacy">
+     Make comment private (visible only to members of the
+     <strong>[% Param('insidergroup') FILTER html %]</strong> group)
+   </label>
 [% END %]
 <br>
 [% INCLUDE global/textarea.html.tmpl