[Rt-commit] r6236 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Thu Oct 19 11:30:02 2006
New Revision: 6236

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/AddCustomFieldValue
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditCustomFieldValues

Log:
 r3976 at cubic-pc:  cubic | 2006-10-19 19:37:56 +0400
 * use <th> instead of <td> in the table
 * use the same names for columns in AddCustomFieldValue and EditCustomFieldValues
 * use <h3> for Add Value block


Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/AddCustomFieldValue
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/AddCustomFieldValue	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/AddCustomFieldValue	Thu Oct 19 11:30:02 2006
@@ -43,30 +43,30 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<b><&|/l&>Add Value</&></b>
+<h3><&|/l&>Add Value</&></h3>
+
 <table border="0">
-<tr><td>
-<&|/l&>Sort</&>:<br />
-<input size="3" name="CustomField-<%$CustomField->Id%>-Value-new-SortOrder" />
-</td>
-<td>
-<&|/l&>Name</&>:<br />
-<input type="text" size="30" name="CustomField-<%$CustomField->Id%>-Value-new-Name" />
-</td>
-<td>
-<&|/l&>Description</&>:<br />
-<input type="text" size="50" name="CustomField-<%$CustomField->Id%>-Value-new-Description" />
-</td>
-% if ($CustomField->Type ne 'Combobox') {
-<td>
-<&|/l&>Category</&>:<br />
-<input type="text" size="10" name="CustomField-<%$CustomField->Id%>-Value-new-Category" />
-</td>
+
+<tr>
+<th><&|/l&>Sort</&></th>
+<th><&|/l&>Name</&></th>
+<th><&|/l&>Description</&></th>
+% if ( $CustomField->Type ne 'Combobox' ) {
+<th><&|/l&>Category</&></th>
 % }
 </tr>
+
+% my $paramtag = "CustomField-". $CustomField->Id ."-Value-new";
+<tr>
+<td><input type="text" size="3"  name="<% $paramtag %>-SortOrder"   /></td>
+<td><input type="text" size="30" name="<% $paramtag %>-Name"        /></td>
+<td><input type="text" size="50" name="<% $paramtag %>-Description" /></td>
+% if ( $CustomField->Type ne 'Combobox' ) {
+<td><input type="text" size="10" name="<% $paramtag %>-Category"    /></td>
+% }
+</tr>
+
 </table>
-<%init>
-</%init>
 <%args>
 $CustomField => undef
 </%args>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditCustomFieldValues
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditCustomFieldValues	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditCustomFieldValues	Thu Oct 19 11:30:02 2006
@@ -43,46 +43,37 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% if (!$values->Count) {
+% unless ( $values->Count ) {
 <p><em><&|/l&>(no values)</&></em></p>
 %    return;
 % }
+
 <i><&|/l&>(Check box to delete)</&></i>
 <table>
+
 <tr>
-<td>&nbsp;</td>
-<td><&|/l&>Sort</&></td>
-<td><&|/l&>Name</&></td>
-<td><&|/l&>Description</&></td>
+<th>&nbsp;</th>
+<th><&|/l&>Sort</&></th>
+<th><&|/l&>Name</&></th>
+<th><&|/l&>Description</&></th>
 % if ($CustomField->Type ne 'Combobox') {
-<td><&|/l&>Category</&></td>
+<th><&|/l&>Category</&></th>
 % }
 </tr>
-% while (my $value = $values->Next) {
+
+% while ( my $value = $values->Next ) {
+% my $paramtag = "CustomField-". $CustomField->Id ."-Value-". $value->Id;
 <tr>
-<td>
-<input type="checkbox" class="checkbox" name="Delete-CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>" />
-</td>
-<td>
-<input size="3" name="CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>-SortOrder" value="<%$value->SortOrder%>" />
-</td>
-<td>
-<input type="text" size="30" name="CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>-Name" value="<%$value->Name%>" />
-</td>
-<td>
-<font size="-1">
-<input type="text" size="50" name="CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>-Description" value="<%$value->Description%>" />
-</font>
-</td>
-% if ($CustomField->Type ne 'Combobox') {
-<td>
-<font size="-1">
-<input type="text" size="10" name="CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>-Category" value="<%$value->Category%>" />
-</font>
-</td>
+<td><input type="checkbox" class="checkbox" name="Delete-<% $paramtag %>" /></td>
+<td><input type="text" size="3" name="<% $paramtag %>-SortOrder" value="<% $value->SortOrder %>" /></td>
+<td><input type="text" size="30" name="<% $paramtag %>-Name" value="<% $value->Name %>" /></td>
+<td><input type="text" size="50" name="<% $paramtag %>-Description" value="<% $value->Description %>" /></td>
+% if ( $CustomField->Type ne 'Combobox' ) {
+<td><input type="text" size="10" name="<% $paramtag %>-Category" value="<% $value->Category %>" /></td>
 % }
 </tr>
 % }
+
 </table>
 <%init>