[Rt-commit] [svn] r1855 - in rt/branches/PLATANO-EXPERIMENTAL-CSS: . html/Search/Elements

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Thu Nov 11 03:45:00 2004
New Revision: 1855

Modified:
   rt/branches/PLATANO-EXPERIMENTAL-CSS/   (props changed)
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/BuildFormatString
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditFormat
Log:
 r9117 at tinbook:  jesse | 2004-11-11T04:07:21.090324Z
  r6199 at tinbook:  jesse | 2004-11-07T05:30:58.330526Z
  Web UI: Refactored the logic which builds format strings to simplify code and present better human-readable names
  
 


Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/BuildFormatString	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/BuildFormatString	Thu Nov 11 03:45:00 2004
@@ -58,7 +58,7 @@
     "id",                  "Status",
     "Subject",             "ExtendedStatus",
     "Priority",            "InitialPriority",
-    "FinalPriority",       "EffectiveId",
+    "FinalPriority",       
     "Type",                "TimeWorked",
     "TimeLeft",            "TimeEstimated",
     "Requestors",          "Cc",
@@ -141,7 +141,7 @@
 	}
 	foreach my $col (@columns) {
 	    my %column = ();
-	    $column{Column} = $fields[ $col ];
+	    $column{Column} = $col;
 	    
 	    if ( $ARGS{Face} eq "Bold" ) {
 		$column{Prefix} .= "<B>";

Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditFormat
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditFormat	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditFormat	Thu Nov 11 03:45:00 2004
@@ -46,7 +46,7 @@
 <table>
 <tr>
 <td>
-<&|/l&>Available Columns</&>:
+<&|/l&>Add Columns</&>:
 </td>
 <td>
 Format:
@@ -58,14 +58,14 @@
 <tr>
 <td valign=top>
 <select size="6" name="SelectDisplayColumns" multiple>
-% my $i = 0;
-% while ($i < scalar @$AvailableColumns) {
-% my $field = $AvailableColumns->[$i];
-% if ($field) {
-<option value=<%$i%>
-><%$field%></option>
-% }
-% $i++;
+% foreach my $field ( @$AvailableColumns) {
+<option value="<%$field%>"><%
+loc($m->comp(
+                '/Elements/RT__Ticket/ColumnMap',
+                Name => $field,
+                Attr => 'title'
+              )
+              || $field) %></option>
 % }
 </select>
 </td>
@@ -73,35 +73,36 @@
 Link:
 <select name=Link>
 <option value="None">-</option>
-<option value="Display">Display</option>
-<option value="Take">Take</option>
+<option value="Display"><&|/l&>Display</&></option>
+<option value="Take"><&|/l&>Take</&></option>
 </select>
 <br>Title: <input name="Title" size=10>
 <br>Size:
 <select name=Size>
 <option value="">-</option>
-<option value="Small">Small</option>
-<option value="Large">Large</option>
+<option value="Small"><&|/l&>Small</&></option>
+<option value="Large"><&|/l&>Large</&></option>
 </select>
 <br>Face:
 <select name=Face>
 <option value="">-</option>
-<option value="Bold">Bold</option>
-<option value="Italic">Italic</option>
+<option value="Bold"><&|/l&>Bold</&></option>
+<option value="Italic"><&|/l&>Italic</&></option>
 </select>
 </td>
 <td>
 <input type=submit name="AddCol" value="->">
 </td>
 <td valign=top>
-<select size=4 name="CurrentDisplayColumns" style="width : 100%">
-% $i = 0;
-% while ($i < scalar @$CurrentFormat) {
-% my $field = $CurrentFormat->[$i];
-% if ($field) {
-<option value=<%$i%>><%$field->{Column}%></option>
-% }
-% $i++;
+<select size=4 name="CurrentDisplayColumns">
+% my $i=0;
+% foreach my $field (@$CurrentFormat) {
+<option value="<%$i++%>><%$field->{Column}%>">
+<%loc($m->comp(
+                '/Elements/RT__Ticket/ColumnMap',
+                Name => $field->{Column},
+                Attr => 'title'
+              ) || $field->{Column}) %></option>
 % }
 </select>
 <br>