[Rt-commit] rt branch, 4.0/apply-scrips-to-multiple-queues, updated. rt-4.0.4-242-g30c06fb

[Thomas Sibley]

The branch, 4.0/apply-scrips-to-multiple-queues has been updated
       via  30c06fbc11cd0f12c464b2add08e0ad94e865c99 (commit)
      from  8dff551c9f2ac000d0f25d8715713e55328e47a7 (commit)

Summary of changes:
 share/html/Admin/Elements/EditScrips          | 4 +---
 share/html/Admin/Elements/SelectStageForAdded | 4 ++++
 share/html/Admin/Scrips/Objects.html          | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 share/html/Admin/Elements/SelectStageForAdded

- Log -----------------------------------------------------------------
commit 30c06fbc11cd0f12c464b2add08e0ad94e865c99
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 5 22:56:44 2012 -0800

    Standardize stage selector text and location when applying scrips

diff --git a/share/html/Admin/Elements/EditScrips b/share/html/Admin/Elements/EditScrips
index 0fc3a45..d435b1d 100755
--- a/share/html/Admin/Elements/EditScrips
+++ b/share/html/Admin/Elements/EditScrips
@@ -88,9 +88,7 @@
 <p><i><&|/l&>(No scrips)</&></i></p>
 % }
 
-<div style="text-align:right">
-<% loc('Select stage for scrips you add') %>: <& SelectStage &>
-</div>
+<& SelectStageForAdded &>
 
 <& /Elements/Submit,
     Name => 'AddScrips',
diff --git a/share/html/Admin/Elements/SelectStageForAdded b/share/html/Admin/Elements/SelectStageForAdded
new file mode 100644
index 0000000..edd4364
--- /dev/null
+++ b/share/html/Admin/Elements/SelectStageForAdded
@@ -0,0 +1,4 @@
+<div style="text-align:right">
+<% loc('Select scrip stage for newly added queues:') %>
+<& SelectStage, %ARGS &>
+</div>
diff --git a/share/html/Admin/Scrips/Objects.html b/share/html/Admin/Scrips/Objects.html
index 2f8c333..c73dfba 100644
--- a/share/html/Admin/Scrips/Objects.html
+++ b/share/html/Admin/Scrips/Objects.html
@@ -59,9 +59,6 @@
 <&|/l&>check this box to remove this scrip from all objects and be able to choose specific objects.</&>
 </label>
 % } else {
-<h2><% loc('Stage') %></h2>
-<& /Admin/Elements/SelectStage, Default => $Stage &>
-
 <h2><&|/l&>Apply globally</&></h2>
 
 <label>
@@ -104,6 +101,8 @@
 
 % }
 
+<& /Admin/Elements/SelectStageForAdded, Default => $Stage &>
+
 <& /Elements/Submit, Name => 'Update' &>
 </form>
 

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