[Rt-commit] r3867 - in rt/branches/3.5-TESTING: . html/Admin/Elements

[jesse at bestpractical.com]

Author: jesse
Date: Wed Sep 21 16:52:22 2005
New Revision: 3867

Modified:
   rt/branches/3.5-TESTING/html/Admin/Elements/AddCustomFieldValue
   rt/branches/3.5-TESTING/releng.cnf
Log:
* merge bug fix from Joe Micciche 3.5.5

Modified: rt/branches/3.5-TESTING/html/Admin/Elements/AddCustomFieldValue
==============================================================================
--- rt/branches/3.5-TESTING/html/Admin/Elements/AddCustomFieldValue	(original)
+++ rt/branches/3.5-TESTING/html/Admin/Elements/AddCustomFieldValue	Wed Sep 21 16:52:22 2005
@@ -43,34 +43,28 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<b><&|/l&>Add Value</&></b></b></b></b>
+<b><&|/l&>Add Value</&></b>
 <table BORDER="0">
-<tr><td><small>
+<tr><td>
 <&|/l&>Sort</&>:<br>
 <input size=3 name="CustomField-<%$CustomField->Id%>-Value-new-SortOrder" >
 </td>
-<td><small>
+<td>
 <&|/l&>Name</&>:<br>
 <input type="text" size=30 name="CustomField-<%$CustomField->Id%>-Value-new-Name" >
 </td>
-<td><small>
+<td>
 <&|/l&>Description</&>:<br>
 <input type="text" size=50 name="CustomField-<%$CustomField->Id%>-Value-new-Description">
-</TD>
-% if ($CustomField->Type ne 'Combobox') {
-<TD><small>
-<&|/l&>Description</&>:<br>
-<input type="text" size=50 name="CustomField-<%$CustomField->Id%>-Value-new-Description">
-</TD>
+</td>
 % if ($CustomField->Type ne 'Combobox') {
-<TD><small>
+<td>
 <&|/l&>Category</&>:<br>
 <input type="text" size=10 name="CustomField-<%$CustomField->Id%>-Value-new-Category">
-</TD>
+</td>
 % }
-</TR>
-</TABLE>
-
+</tr>
+</table>
 <%init>
 </%init>
 <%args>

Modified: rt/branches/3.5-TESTING/releng.cnf
==============================================================================
--- rt/branches/3.5-TESTING/releng.cnf	(original)
+++ rt/branches/3.5-TESTING/releng.cnf	Wed Sep 21 16:52:22 2005
@@ -1,5 +1,5 @@
 PRODUCT			        = rt
-TAG			            = 3.5.4
+TAG			            = 3.5.5
 CANONICAL_REPO		    = svn+ssh://svn.bestpractical.com/svn/bps-public/rt/
 TAGS		            = tags/
 TRUNK	                = branches/3.5-TESTING