[Rt-commit] r3701 - in rt/branches/3.5-TESTING: . html
html/Admin/Elements html/Elements html/NoAuth html/Search
html/Ticket html/Ticket/Elements
trs at bestpractical.com
trs at bestpractical.com
Thu Aug 18 22:39:28 EDT 2005
Author: trs
Date: Thu Aug 18 22:39:27 2005
New Revision: 3701
Removed:
rt/branches/3.5-TESTING/html/CalPopup.html
rt/branches/3.5-TESTING/html/NoAuth/cascaded.js
rt/branches/3.5-TESTING/html/NoAuth/combobox.js
rt/branches/3.5-TESTING/html/rt.js
Modified:
rt/branches/3.5-TESTING/ (props changed)
rt/branches/3.5-TESTING/html/Admin/Elements/AddCustomFieldValue
rt/branches/3.5-TESTING/html/Admin/Elements/PickObjects
rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect
rt/branches/3.5-TESTING/html/Search/Bulk.html
rt/branches/3.5-TESTING/html/Ticket/Create.html
rt/branches/3.5-TESTING/html/Ticket/Display.html
rt/branches/3.5-TESTING/html/Ticket/Elements/ShowSummary
Log:
r6001 at wintermute: tom | 2005-08-18 22:19:32 -0400
Fixed merge bugs from r3685
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 Thu Aug 18 22:39:27 2005
@@ -59,11 +59,6 @@
</TD>
% if ($CustomField->Type ne 'Combobox') {
<TD><small>
-<&|/l&>Description</&>:<br>
-<input type="text" size=50 name="CustomField-<%$CustomField->Id%>-Value-new-Description">
-</TD>
-% if ($CustomField->Type ne 'Combobox') {
-<TD><small>
<&|/l&>Category</&>:<br>
<input type="text" size=10 name="CustomField-<%$CustomField->Id%>-Value-new-Category">
</TD>
Modified: rt/branches/3.5-TESTING/html/Admin/Elements/PickObjects
==============================================================================
--- rt/branches/3.5-TESTING/html/Admin/Elements/PickObjects (original)
+++ rt/branches/3.5-TESTING/html/Admin/Elements/PickObjects Thu Aug 18 22:39:27 2005
@@ -51,7 +51,6 @@
% foreach my $Object (@Objects) {
<tr>
% my $id = "Object-".$Object->id."-CF-".$id;
-% my $id = "Object-".$Object->id."-CF-".$id;
% if (!$ReadOnly) {
<td valign="TOP">
<input type="checkbox" class="checkbox" id="<% $id %>" name="<% $id %>" value="1" <% $Checked ? 'CHECKED' : ''%>
@@ -60,7 +59,6 @@
% }
<td valign="TOP">
<label for="<% $id %>">
- <label for="<% $id %>">
% if ($Object->Name) {
<b><%$Object->Name%></b><br>
% } else {
Modified: rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect (original)
+++ rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect Thu Aug 18 22:39:27 2005
@@ -52,7 +52,7 @@
% my $id = $NamePrefix . $CustomField->Id;
% my $out = $m->scomp('SELF:options', %ARGS, SelectedRef => \$selected, CategoryRef => \@category);
% if (@category) {
-<script type="text/javascript" src="<%$RT::WebPath%>/NoAuth/cascaded.js"></script>
+<script type="text/javascript" src="<%$RT::WebPath%>/NoAuth/js/cascaded.js"></script>
%# XXX - Hide this select from w3m?
<select onchange="filter_cascade('<% $id %>-Values', this.value)" name="<%$id%>-Category"
<option value="" <% !$selected && 'SELECTED' %>><&|/l&>-</&></option>
Modified: rt/branches/3.5-TESTING/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Bulk.html (original)
+++ rt/branches/3.5-TESTING/html/Search/Bulk.html Thu Aug 18 22:39:27 2005
@@ -166,9 +166,6 @@
% my $rows = 5;
% my @add = (NamePrefix => 'Bulk-Add-CustomField-', CustomField => $cf, Rows => $rows, Multiple => ($cf->MaxValues ==1 ? 0 : 1) , Cols => 25);
% my @del = (NamePrefix => 'Bulk-Delete-CustomField-', CustomField => $cf, Rows => $rows, Multiple => 1, Cols => 25);
-% my $rows = 5;
-% my @add = (NamePrefix => 'Bulk-Add-CustomField-', CustomField => $cf, Rows => $rows, Multiple => ($cf->MaxValues ==1 ? 0 : 1) , Cols => 25);
-% my @del = (NamePrefix => 'Bulk-Delete-CustomField-', CustomField => $cf, Rows => $rows, Multiple => 1, Cols => 25);
% if ($cf->Type eq 'Select') {
<td><& /Elements/EditCustomFieldSelect, @add &></td>
<td><& /Elements/EditCustomFieldSelect, @del &></td>
Modified: rt/branches/3.5-TESTING/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/Create.html (original)
+++ rt/branches/3.5-TESTING/html/Ticket/Create.html Thu Aug 18 22:39:27 2005
@@ -64,6 +64,7 @@
<td class="label"><&|/l&>Status</&>:
</td>
<td class="value">
+<& /Elements/SelectStatus, Name => "Status", Default => $ARGS{Status}||'new', DefaultValue => 0 &>
</td>
<td class="label">
<&|/l&>Owner</&>:
Modified: rt/branches/3.5-TESTING/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/Display.html (original)
+++ rt/branches/3.5-TESTING/html/Ticket/Display.html Thu Aug 18 22:39:27 2005
@@ -60,9 +60,6 @@
<& /Elements/Callback, _CallbackName => 'BeforeShowHistory', Ticket => $TicketObj, %ARGS &>
-
-<& /Elements/Callback, _CallbackName => 'BeforeShowHistory', Ticket => $TicketObj, %ARGS &>
-
<& /Ticket/Elements/ShowHistory ,
Ticket => $TicketObj,
Tickets => $Tickets,
Modified: rt/branches/3.5-TESTING/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/Elements/ShowSummary (original)
+++ rt/branches/3.5-TESTING/html/Ticket/Elements/ShowSummary Thu Aug 18 22:39:27 2005
@@ -64,17 +64,8 @@
class => 'ticket-info-people' &>
<& /Ticket/Elements/ShowPeople, Ticket => $Ticket &>
</&>
- <&|/Elements/TitleBox, title => loc("Reminders"),
- title_href =>"$RT::WebPath/Ticket/Reminders.html?id=".$Ticket->Id,
- title_class=> 'inverse',
- color => "#666699" &>
- <form action="<%$RT::WebPath%>/Ticket/Display.html" method="post">
- <& /Ticket/Elements/Reminders, Ticket => $Ticket, ShowCompleted => 0 &>
- <div align="right"><input type="submit" value="Save" /></div>
- </form>
- </&>
- <br />
- <& /Ticket/Elements/ShowAttachments, Ticket => $Ticket, Attachments => $Attachments &>
+
+ <& /Ticket/Elements/ShowAttachments, Ticket => $Ticket, Attachments => $Attachments &>
<& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
</td>
More information about the Rt-commit
mailing list