[Rt-commit] [svn] r1096 - rt/branches/rt-3.1/html/Admin/Elements

[leira at pallas.eruditorum.org]

Author: leira
Date: Thu Jun 17 09:36:47 2004
New Revision: 1096

Modified:
   rt/branches/rt-3.1/html/Admin/Elements/EditScrip
Log:
RT-Ticket: 2583
RT-Status: resolved
RT-Action: comment

I moved the Fields for user-defined conditions and actions down, as recommended.  This creates new strings for the message catalog, but doesn't change any old ones.

I also made some more of the labels CSS classes.


Modified: rt/branches/rt-3.1/html/Admin/Elements/EditScrip
==============================================================================
--- rt/branches/rt-3.1/html/Admin/Elements/EditScrip	(original)
+++ rt/branches/rt-3.1/html/Admin/Elements/EditScrip	Thu Jun 17 09:36:47 2004
@@ -27,6 +27,7 @@
 <FORM METHOD=POST ACTION="Scrip.html">
 <input type="hidden" name="id" value="<%$id%>">
 <input type="hidden" name="Queue" value="<%$Queue%>">
+<& /Elements/TitleBoxStart, title => loc('Scrip Fields') &>
 <TABLE>
 <TR>
 <TD ALIGN=RIGHT>
@@ -45,54 +46,69 @@
 </TR>
 <TR>
 <TD ALIGN=RIGHT>
-<&|/l&>Custom condition</&>:
+<&|/l&>Action</&>:
 </TD>
 <TD>
-<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomIsApplicableCode"><%$scrip->CustomIsApplicableCode%></TEXTAREA>
+<& /Admin/Elements/SelectScripAction, Name => "Scrip-$id-ScripAction", Default => $scrip->ActionObj->Id &>
 </TD>
 </TR>
 <TR>
 <TD ALIGN=RIGHT>
-<&|/l&>Action</&>:
+<&|/l&>Template</&>: 
 </TD>
 <TD>
-<& /Admin/Elements/SelectScripAction, Name => "Scrip-$id-ScripAction", Default => $scrip->ActionObj->Id &>
+<& /Admin/Elements/SelectTemplate, Name => "Scrip-$id-Template", Default => $scrip->TemplateObj->Id, Queue => $Queue &>
 </TD>
 </TR>
 <TR>
 <TD ALIGN=RIGHT>
-<&|/l&>Custom action preparation code</&>:
+<&|/l&>Stage</&>: 
 </TD>
 <TD>
-<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomPrepareCode"><%$scrip->CustomPrepareCode%></TEXTAREA>
+<& /Admin/Elements/SelectStage, Name => "Scrip-$id-Stage", Default => $scrip->Stage &>
 </TD>
 </TR>
+</table>
+<& /Elements/TitleBoxEnd &>
+<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+
+<br>
+<& /Elements/TitleBoxStart, title => loc('User Defined conditions and actions') &>
+<table>
 <TR>
-<TD ALIGN=RIGHT>
-<&|/l&>Custom action cleanup code</&>:
+<TD colspan=2>
+<i><&|/l&>(Use these fields when you choose 'User Defined' for a condition or action)</&></i>
+</TD>
+</TR>
+<TR>
+<TD class=labeltop>
+<&|/l&>Custom condition</&>:
 </TD>
 <TD>
-<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomCommitCode"><%$scrip->CustomCommitCode%></TEXTAREA>
+<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomIsApplicableCode"><%$scrip->CustomIsApplicableCode%></TEXTAREA>
 </TD>
 </TR>
 <TR>
-<TD ALIGN=RIGHT>
-<&|/l&>Stage</&>: 
+<TD class=labeltop>
+<&|/l&>Custom action preparation code</&>:
 </TD>
 <TD>
-<& /Admin/Elements/SelectStage, Name => "Scrip-$id-Stage", Default => $scrip->Stage &>
+<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomPrepareCode"><%$scrip->CustomPrepareCode%></TEXTAREA>
 </TD>
 </TR>
 <TR>
-<TD ALIGN=RIGHT>
-<&|/l&>Template</&>: 
+<TD class=labeltop>
+<&|/l&>Custom action cleanup code</&>:
 </TD>
 <TD>
-<& /Admin/Elements/SelectTemplate, Name => "Scrip-$id-Template", Default => $scrip->TemplateObj->Id, Queue => $Queue &>
+<TEXTAREA COLS=80 ROWS=5 NAME="Scrip-<%$id%>-CustomCommitCode"><%$scrip->CustomCommitCode%></TEXTAREA>
 </TD>
 </TR>
+</table>
+<& /Elements/TitleBoxEnd &>
 
 <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+
 </FORM>
 <%init>
 my (@actions);