[Rt-commit] r4910 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR html/RTIR/Elements html/RTIR/Search/Elements

[alexmv at bestpractical.com]

Author: alexmv
Date: Thu Mar 30 15:06:17 2006
New Revision: 4910

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MergeWith
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults

Log:
 r12003 at zoq-fot-pik:  chmrr | 2006-03-30 15:05:50 -0500
  * Fix <div> in wrong place
  * Make all MergeWith components have the same radio button group


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MergeWith
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MergeWith	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MergeWith	Thu Mar 30 15:06:17 2006
@@ -1,5 +1,3 @@
-<form action="<% RT->Config->Get('WebPath') %>/RTIR/Merge.html" method="post">
-<input type="hidden" name="id" value="<% $id %>" />
 <h3><% $Type %>s</h3>
 <& /RTIR/Search/Elements/ShowResults, 
     Queue       => $Queue,
@@ -13,9 +11,6 @@
     BaseURL     => "RTIR/Merge.html?id=$id",
 &>
 
-<& /Elements/Submit, Caption=> loc('Merge into selected Ticket'), Label => loc("Merge") &>
-</form>
-
 <%INIT>
 my ($Type) = $m->comp( '/RTIR/Elements/Type', Queue => $Queue );
 

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html	Thu Mar 30 15:06:17 2006
@@ -37,6 +37,9 @@
 
 <& /Elements/ListActions, actions => \@results &>
 
+<form action="<% RT->Config->Get('WebPath') %>/RTIR/Merge.html" method="post">
+<input type="hidden" name="id" value="<% $id %>" />
+
 <& /RTIR/Elements/MergeWith, %defaults, %ARGS, Queue => $Ticket->QueueObj->Name, Ticket => $Ticket &>
 
 % if ($Ticket->QueueObj->Name eq "Incident Reports") {
@@ -46,6 +49,8 @@
 % if ($Ticket->QueueObj->Name eq "Investigations") {
 <& /RTIR/Elements/MergeWith, %defaults, %ARGS, Queue => "Incident Reports", Ticket => $Ticket &>
 % }
+<& /Elements/Submit, Caption=> loc('Merge into selected Ticket'), Label => loc("Merge") &>
+</form>
 
 <%INIT>
 my $Ticket = LoadTicket($id);

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults	Thu Mar 30 15:06:17 2006
@@ -10,8 +10,8 @@
     AllowSorting => $AllowSorting,
 &>
 
-<div align="right">
 % if ( $ShowNavigation ) {
+<div align="right">
 <%PERL>
 # this would do well as a Callback
 my $QueryString = $m->comp('/Elements/QueryString',