[otrs-cvs] otrs/Kernel/Output/HTML/Standard AgentTicketBulk.dtl, 1.12, 1.13

[CVS commits notifications of OTRS.org]

Comments:
Update of /home/cvs/otrs/Kernel/Output/HTML/Standard
In directory lancelot:/tmp/cvs-serv20233/Kernel/Output/HTML/Standard

Modified Files:
	AgentTicketBulk.dtl 
Log Message:
Improved merge feature.

Author: martin

Index: AgentTicketBulk.dtl
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/Standard/AgentTicketBulk.dtl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AgentTicketBulk.dtl	4 Nov 2008 14:31:23 -0000	1.12
--- AgentTicketBulk.dtl	5 Nov 2008 07:54:22 -0000	1.13
***************
*** 117,126 ****
                  </tr>
                  <tr>
!                   <td class="contentkey">$Text{"Merge to"}:</td>
!                   <td class="contentvalue"><input type="text" size="30" name="MergeTo" value="$QData{"MergeTo"}"/> $Text{"Merge to oldest"} <input type="checkbox" name="MergeToOldest" value="1"/>. </td>
                  </tr>
                  <tr>
                    <td class="contentkey">$Text{"Link together"}:</td>
!                   <td class="contentvalue">$Data{"LinkTogetherYesNoOption"}, $Text{"define Parent"} <input type="text" size="30" name="LinkTogetherParent" value="$QData{"LinkTogetherParent"}"/>.</td>
                  </tr>
                  <tr>
--- 117,130 ----
                  </tr>
                  <tr>
!                   <td class="contentkey">$Text{"Merge"}:</td>
!                   <td class="contentvalue"> <input type="radio" name="MergeToSelection" value="MergeTo"/> $Text{"Merge to"} <input type="text" size="30" name="MergeTo" value="$QData{"MergeTo"}"/> / <input type="radio" name="MergeToSelection" value="MergeToOldest"/> $Text{"Merge to oldest"} </td>
                  </tr>
                  <tr>
                    <td class="contentkey">$Text{"Link together"}:</td>
!                   <td class="contentvalue">$Data{"LinkTogetherYesNoOption"}</td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"Link to Parent"}:</td>
!                   <td class="contentvalue"><input type="text" size="30" name="LinkTogetherParent" value="$QData{"LinkTogetherParent"}"/></td>
                  </tr>
                  <tr>