[otrs-cvs] CVS: otrs/Kernel/Output/HTML/Standard AgentTicketMerge.dtl,1.3,1.3.2.1

cvs-log at otrs.org cvs-log at otrs.org
Mon Jul 10 15:50:15 CEST 2006


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

Modified Files:
      Tag: rel-2_0
	AgentTicketMerge.dtl 
Log Message:
change TicketHook to Ticket::Hook

Index: AgentTicketMerge.dtl
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/Standard/AgentTicketMerge.dtl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** AgentTicketMerge.dtl	16 May 2005 13:36:33 -0000	1.3
--- AgentTicketMerge.dtl	10 Jul 2006 12:50:13 -0000	1.3.2.1
***************
*** 1,5 ****
  # --
! # AgentTicketMerge.dtl - provides HTML form for ticket merge mask 
! # Copyright (C) 2001-2005 Martin Edenhofer <martin+code at otrs.org>
  # --
  # $Id$
--- 1,5 ----
  # --
! # AgentTicketMerge.dtl - provides HTML form for ticket merge mask
! # Copyright (C) 2001-2006 Martin Edenhofer <martin+code at otrs.org>
  # --
  # $Id$
***************
*** 27,82 ****
  
  <table border="0" width="100%" cellspacing="0" cellpadding="3" cols="2">
! <tr>
!   <td class="mainhead">
!     $Env{"Box0"}$Text{"Ticket Merge"}: $QData{"TicketNumber"}$Env{"Box1"}
!   </td>
! </tr>
! <tr>
!   <td class="menu">
!     <a href="$Env{"Baselink"}$Env{"LastScreenView"}" onmouseover="window.status='$Text{"Back"}'; return true;" onmouseout="window.status='';" class="menuitem">$Text{"Back"}</a>
!   </td>
! </tr>
! <tr>
!   <td class="mainbody">
! 
! 
!   <br>
! 
!   <form action="$Env{"CGIHandle"}" method="post" enctype="multipart/form-data" name="compose">
!     <input type="hidden" name="Action" value="AgentTicketMerge">
!     <input type="hidden" name="Subaction" value="Merge">
!     <input type="hidden" name="TicketID" value="$Data{"TicketID"}">
!     <table border="0" width="700" align="center" cellspacing="0" cellpadding="4">
!       <tr>
!        <td colspan="2" class="contenthead">$Text{"Options"}</td>
!       </tr>
!       <tr>
!         <td class="contentbody">
! 
!           <table border="0">
!             <tr>
!               <td class="contentkey">$Text{"Merge to"} $Config{"TicketHook"}:</td>
!               <td class="contentvalue"><input type="text" name="MainTicketNumber" value="$QData{"MainTicketNumber"}" size="30"></td>
!            </tr>
!            <tr>
!              <td class="contentkey">$Text{"Inform sender"}:</td>
!              <td class="contentvalue"><input type="checkbox" name="InformSender" value="1"></td>
!            </tr>
!            <tr>
!              <td class="contentkey">$Text{"From"}:</td>
!              <td class="contentvalue">$QData{"QueueFrom"}<input type="hidden" name="From" value="$QData{"QueueFrom"}" size="60"></td>
!            </tr>
!            <tr>
!              <td class="contentkey">$Text{"To"}:</td>
!              <td class="contentvalue"><input type="text" name="To" value="$QData{"From"}" size="60"></td>
!            </tr>
!            <tr>
!              <td class="contentkey">$Text{"Subject"}:</td>
!              <td class="contentvalue"><input type="text" name="Subject" value="$QData{"Subject"}" size="60"></td>
!            </tr>
!            <tr>
!              <td class="contentkey">$Text{"Text"}:</td>
!              <td class="contentvalue">
!              <textarea name="Body" rows="15" cols="$Config{"Ticket::Frontend::TextAreaEmail"}" wrap="$Env{"BrowserWrap"}">
  $Data{"Salutation"}
  
--- 27,82 ----
  
  <table border="0" width="100%" cellspacing="0" cellpadding="3" cols="2">
!   <tr>
!     <td class="mainhead">
!       $Env{"Box0"}$Text{"Ticket Merge"}: $QData{"TicketNumber"}$Env{"Box1"}
!     </td>
!   </tr>
!   <tr>
!     <td class="menu">
!       <a href="$Env{"Baselink"}$Env{"LastScreenView"}" onmouseover="window.status='$Text{"Back"}'; return true;" onmouseout="window.status='';" class="menuitem">$Text{"Back"}</a>
!     </td>
!   </tr>
!   <tr>
!     <td class="mainbody">
! 
! 
!       <br>
! 
!       <form action="$Env{"CGIHandle"}" method="post" enctype="multipart/form-data" name="compose">
!         <input type="hidden" name="Action" value="AgentTicketMerge">
!         <input type="hidden" name="Subaction" value="Merge">
!         <input type="hidden" name="TicketID" value="$Data{"TicketID"}">
!         <table border="0" width="700" align="center" cellspacing="0" cellpadding="4">
!           <tr>
!             <td colspan="2" class="contenthead">$Text{"Options"}</td>
!           </tr>
!           <tr>
!             <td class="contentbody">
! 
!               <table border="0">
!                 <tr>
!                   <td class="contentkey">$Text{"Merge to"} $Config{"Ticket::Hook"}:</td>
!                   <td class="contentvalue"><input type="text" name="MainTicketNumber" value="$QData{"MainTicketNumber"}" size="30"></td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"Inform sender"}:</td>
!                   <td class="contentvalue"><input type="checkbox" name="InformSender" value="1"></td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"From"}:</td>
!                   <td class="contentvalue">$QData{"QueueFrom"}<input type="hidden" name="From" value="$QData{"QueueFrom"}" size="60"></td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"To"}:</td>
!                   <td class="contentvalue"><input type="text" name="To" value="$QData{"From"}" size="60"></td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"Subject"}:</td>
!                   <td class="contentvalue"><input type="text" name="Subject" value="$QData{"Subject"}" size="60"></td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"Text"}:</td>
!                   <td class="contentvalue">
!                     <textarea name="Body" rows="15" cols="$Config{"Ticket::Frontend::TextAreaEmail"}" wrap="$Env{"BrowserWrap"}">
  $Data{"Salutation"}
  
***************
*** 85,106 ****
  $Data{"Signature"}
  
! </textarea>
!              </td>
!            </tr>
!          </table>
!         </td>
!       </tr>
!       <tr>
!         <td class="contentfooter">
!          <input class="button" accesskey="g" type="submit" value="$Text{"submit"}" onclick="return submit_compose();">
!         </td>
!       </tr>
!     </table>
!   </form>
  
!   <br>
  
!   </td>
! </tr>
  </table>
  <!-- end form -->
--- 85,106 ----
  $Data{"Signature"}
  
!                     </textarea>
!                   </td>
!                 </tr>
!               </table>
!             </td>
!           </tr>
!           <tr>
!             <td class="contentfooter">
!               <input class="button" accesskey="g" type="submit" value="$Text{"submit"}" onclick="return submit_compose();">
!             </td>
!           </tr>
!         </table>
!       </form>
  
!       <br>
  
!     </td>
!   </tr>
  </table>
  <!-- end form -->



More information about the cvs-log mailing list