Meanings are now clearer for config screens.

brettryan · Sep 24, 2012 · 6b9fe9c · 6b9fe9c
1 parent a69bb8a
commit 6b9fe9c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/main/resources/templates/purge-attachments/config/configure-purge-attachments-common.vm b/src/main/resources/templates/purge-attachments/config/configure-purge-attachments-common.vm
@@ -1,10 +1,9 @@
 
 <h2>Processing Rules</h2>
 
-<div class="noteMacro">
-  <strong>NOTE</strong>: Attachment purging is currently disabled for this
-  version of the plugin. This will be enabled once confluence 4.3 becomes
-  available.
+<div class="noteMacro" style="padding: 5px; margin-bottom: 10px">
+  <strong>NOTE</strong>: Attachments will be purged where any of the selected
+  rules below match (using an OR match).
 </div>
 
 <fieldset class="group">
@@ -15,7 +14,7 @@
       />
     <label for="ageRuleEnabled">Enable</label>
     <div class="description">
-      Enable to purge attachments which are greater than a set days old limit.
+      Purges attachments which are greater than the provided limit in days.
     </div>
   </div>
   <div class="field-group">
@@ -36,7 +35,7 @@
       />
     <label for="revisionCountRuleEnabled">Enable</label>
     <div class="description">
-      Enable to purge attachments who exceed a given version limit.
+      Purges attachments who exceed the total count of prior versions.
     </div>
   </div>
   <div class="field-group">
@@ -57,7 +56,7 @@
       />
     <label for="maxSizeRuleEnabled">Enable</label>
     <div class="description">
-      Enable to purge attachments which have a size greater than a given value.
+      Purges oldest where the total size of prior versions is higher than this limit.
     </div>
   </div>
   <div class="field-group">
@@ -73,6 +72,11 @@
 
 <h2>Email Report</h2>
 
+<div class="noteMacro" style="padding: 5px; margin-bottom: 10px">
+  <strong>NOTE</strong>: If report mode is specified globally it will override
+  space level options.
+</div>
+
 <fieldset class="group">
   <div class="checkbox">
     <legend><span>Report Only</span></legend>

diff --git a/src/main/resources/templates/purge-attachments/config/configure-purge-attachments-space.vm b/src/main/resources/templates/purge-attachments/config/configure-purge-attachments-space.vm
@@ -37,7 +37,7 @@
           <input class="radio" type="radio"  name="mode" id="mode-2" value="2"
 #if ($mode == 0 || $mode == 2) checked="checked" #end
                  />
-          <label for="mode-2">Enabled using global options</label>
+          <label for="mode-2">Use global options</label>
           <div class="description">
             Use globally configured options which may be disabled.
           </div>
@@ -46,7 +46,7 @@
           <input class="radio" type="radio"  name="mode" id="mode-3" value="3"
 #if ($mode == 3) checked="checked" #end
                  />
-          <label for="mode-3">Enabled using space options</label>
+          <label for="mode-3">Use space options</label>
           <div class="description">
             Use custom settings specified here.
           </div>