[otrs-cvs] CVS: otrs/Kernel/Output/HTML/Standard AdminNotificationForm.dtl,1.10,1.10.2.1

cvs-log at otrs.org cvs-log at otrs.org
Tue May 23 20:25:52 CEST 2006 

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

Modified Files:
      Tag: rel-2_0
	AdminNotificationForm.dtl 
Log Message:
Changed description in note section for usable <OTRS*> tags in notifications (bug #1166)


Index: AdminNotificationForm.dtl
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/Standard/AdminNotificationForm.dtl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** AdminNotificationForm.dtl	18 Sep 2005 13:35:00 -0000	1.10
--- AdminNotificationForm.dtl	23 May 2006 17:25:50 -0000	1.10.2.1
***************
*** 1,5 ****
  # --
  # AdminNotificationForm.dtl - provides HTML form for AdminNotification
! # Copyright (C) 2001-2005 Martin Edenhofer <martin+code at otrs.org>
  # --
  # $Id$
--- 1,5 ----
  # --
  # AdminNotificationForm.dtl - provides HTML form for AdminNotification
! # Copyright (C) 2001-2006 Martin Edenhofer <martin+code at otrs.org>
  # --
  # $Id$
***************
*** 11,90 ****
  <!-- start form -->
  <table border="0" width="100%" cellspacing="0" cellpadding="3" cols="2">
- <tr>
-   <td colspan="2" class="mainhead">
-     $Env{"Box0"}$Text{"Notification Management"}$Env{"Box1"}
-   </td>
- </tr>
- <tr>
-   <td width="30%" class="mainbody">
- 
-   <form action="$Env{"CGIHandle"}" method="post">
-   <input type="hidden" name="Action" value="$Env{"Action"}">
-   <input type="hidden" name="Subaction" value="Change">
-   <table width="100%" cellspacing="0" cellpadding="4">
    <tr>
!     <td class="contenthead">$Text{"Change"}:</td>
!   </tr>
!   <tr>
!     <td class="contentbody">
!     $Data{"NotificationOption"}
      </td>
    </tr>
    <tr>
!     <td class="contentfooter">
!     <input class="button" type="submit" value="$Text{"Change"}">
!     </td>
!   </tr>
!   </table>
!   </form>
  
!   </td>
!   <td width="70%" class="mainbody">
  
  # --
  # check subaction
  # --
! <dtl if ($Env{"Subaction"} eq "Change") { $Data{"Botton"} = "<input class="button" type="submit" value="$Text{"Update"}">"; }>
  # --
!   <form action="$Env{"CGIHandle"}" method="post">
!   <input type="hidden" name="Action" value="$Env{"Action"}">
!   <input type="hidden" name="Subaction" value="$Env{"Subaction"}Action">
!   <input type="hidden" name="ID" value="$QData{"ID"}">
!   <input type="hidden" name="Charset" value="$Env{"Charset"}">
!   <input type="hidden" name="Language" value="$QData{"Language"}">
!   <input type="hidden" name="Type" value="$QData{"Type"}">
!   <table width="100%" cellspacing="0" cellpadding="4">
!   <tr>
!     <td class="contenthead">$Text{"Notification"}:</td>
!   </tr>
!   <tr>
!     <td class="contentbody">
!     <table border="0" cellspacing="0" cellpadding="3">
!     <tr>
!       <td class="contentkey">$Text{"Type"}: </td>
!       <td class="contentvalue"> $Data{"Language"}::$QData{"Type"}</td>
!     </tr>
!     <tr>
!       <td class="contentkey">$Text{"Subject"}: </td>
!       <td class="contentvalue"> <input type="text" name="Subject" value="$QData{"Subject"}" size="80" maxlength="120"></td>
!     </tr>
!     <tr>
!       <td class="contentkey">$Text{"Body"}: </td>
!       <td class="contentvalue"> <textarea rows="12" cols="75" name="Body" wrap="$Env{"BrowserWrap"}">$QData{"Body"}</textarea></td>
!     </tr>
!     </table>
  
      </td>
    </tr>
-   <tr>
-     <td class="contentfooter">
-     $Data{"Botton"}
-     </td>
-   </tr>
-   </table>
-   </form>
- 
-   </td>
- </tr>
  </table>
  <!-- end form -->
--- 11,90 ----
  <!-- start form -->
  <table border="0" width="100%" cellspacing="0" cellpadding="3" cols="2">
    <tr>
!     <td colspan="2" class="mainhead">
!       $Env{"Box0"}$Text{"Notification Management"}$Env{"Box1"}
      </td>
    </tr>
    <tr>
!     <td width="30%" class="mainbody">
! 
!       <form action="$Env{"CGIHandle"}" method="post">
!         <input type="hidden" name="Action" value="$Env{"Action"}">
!         <input type="hidden" name="Subaction" value="Change">
!         <table width="100%" cellspacing="0" cellpadding="4">
!           <tr>
!             <td class="contenthead">$Text{"Change"}:</td>
!           </tr>
!           <tr>
!             <td class="contentbody">
!               $Data{"NotificationOption"}
!             </td>
!           </tr>
!           <tr>
!             <td class="contentfooter">
!               <input class="button" type="submit" value="$Text{"Change"}">
!             </td>
!           </tr>
!         </table>
!       </form>
  
!     </td>
!     <td width="70%" class="mainbody">
  
  # --
  # check subaction
  # --
!       <dtl if ($Env{"Subaction"} eq "Change") { $Data{"Botton"} = "<input class="button" type="submit" value="$Text{"Update"}">"; }>
  # --
!       <form action="$Env{"CGIHandle"}" method="post">
!         <input type="hidden" name="Action" value="$Env{"Action"}">
!         <input type="hidden" name="Subaction" value="$Env{"Subaction"}Action">
!         <input type="hidden" name="ID" value="$QData{"ID"}">
!         <input type="hidden" name="Charset" value="$Env{"Charset"}">
!         <input type="hidden" name="Language" value="$QData{"Language"}">
!         <input type="hidden" name="Type" value="$QData{"Type"}">
!         <table width="100%" cellspacing="0" cellpadding="4">
!           <tr>
!             <td class="contenthead">$Text{"Notification"}:</td>
!           </tr>
!           <tr>
!             <td class="contentbody">
!               <table border="0" cellspacing="0" cellpadding="3">
!                 <tr>
!                   <td class="contentkey">$Text{"Type"}: </td>
!                   <td class="contentvalue"> $Data{"Language"}::$QData{"Type"}</td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"Subject"}: </td>
!                   <td class="contentvalue"> <input type="text" name="Subject" value="$QData{"Subject"}" size="80" maxlength="120"></td>
!                 </tr>
!                 <tr>
!                   <td class="contentkey">$Text{"Body"}: </td>
!                   <td class="contentvalue"> <textarea rows="12" cols="75" name="Body" wrap="$Env{"BrowserWrap"}">$QData{"Body"}</textarea></td>
!                 </tr>
!               </table>
! 
!             </td>
!           </tr>
!           <tr>
!             <td class="contentfooter">
!               $Data{"Botton"}
!             </td>
!           </tr>
!         </table>
!       </form>
  
      </td>
    </tr>
  </table>
  <!-- end form -->
***************
*** 92,151 ****
  <!-- start note -->
  <table border="0" width="100%" cellspacing="0" cellpadding="3">
! <tr>
!   <td class="mainhead">
!     $Env{"Box0"}$Text{"Note"}$Env{"Box1"}
!   </td>
! </tr>
! <tr>
!   <td class="mainbody">
!   <p>
!   $Text{"Notifications are sent to an agent or a customer."}
!   </p>
!   <hr>
!   <p>
!   $Text{"Useable options"}:
!     <table>
!      <tr>
!       <td class="contentkey"><b>&lt;OTRS_CONFIG_*&gt;</b></td>
!       <td class="contentvalue">$Text{"Config options (e. g. &lt;OTRS_CONFIG_HttpType&gt;)"}</td>
!      </tr>
!      <tr>
!       <td class="contentkey"><b>&lt;OTRS_OWNER_*&gt;</b></td>
!       <td class="contentvalue">$Text{"Ticket owner options (e. g. &lt;OTRS_OWNER_USERFIRSTNAME&gt;)"}</td>
!      </tr>
!      <tr>
!       <td class="contentkey"><b>&lt;OTRS_CURRENT_*&gt;</b></td>
!       <td class="contentvalue">$Text{"Options of the current user who requested this action (e. g. &lt;OTRS_CURRENT_USERFIRSTNAME&gt;)"}</td>
!      </tr>
!      <tr>
!       <td class="contentkey"><b>&lt;OTRS_CUSTOMER_DATA_*&gt;</b></td>
!       <td class="contentvalue">$Text{"Options of the current customer user data (e. g. &lt;OTRS_CUSTOMER_DATA_USERFIRSTNAME&gt;)"}</td>
!      </tr>
!      <tr>
!       <td class="contentkey"><b>&lt;OTRS_TICKET_*&gt;</b></td>
!       <td class="contentvalue">$Text{"Options of the ticket data (e. g. &lt;OTRS_TICKET_Number&gt;, &lt;OTRS_TICKET_ID&gt;, &lt;OTRS_TICKET_Queue&gt;, &lt;OTRS_TICKET_State&gt;)"}</td>
!      </tr>
!     </table>
!    </p>
!     <p>
!     $Text{"Example"}:
!     <pre>
! Hi &lt;OTRS_CURRENT_USERFIRSTNAME&gt;,
! 
! there is a new ticket in "&lt;OTRS_QUEUE&gt;"!
! 
! &lt;OTRS_CUSTOMER_FROM&gt; wrote:
! &lt;snip&gt;
! &lt;OTRS_CUSTOMER_EMAIL[16]&gt;
! &lt;snip&gt;
! 
! &lt;OTRS_CONFIG_HttpType&gt;://&lt;OTRS_CONFIG_FQDN&gt;/&lt;OTRS_CONFIG_ScriptAlias&gt;index.pl?Action=AgentTicketZoom&TicketID=&lt;OTRS_TICKET_ID&gt;
! 
! Your OTRS Notification Master
!     </pre>
!     </p>
  
!   </td>
! </tr>
  </table>
  <!-- end note -->
--- 92,151 ----
  <!-- start note -->
  <table border="0" width="100%" cellspacing="0" cellpadding="3">
!   <tr>
!     <td class="mainhead">
!       $Env{"Box0"}$Text{"Note"}$Env{"Box1"}
!     </td>
!   </tr>
!   <tr>
!     <td class="mainbody">
!       <p>
!         $Text{"Notifications are sent to an agent or a customer."}
!       </p>
!       <hr>
!       <p>
!         $Text{"Useable options"}:
!         <table>
!           <tr>
!             <td class="contentkey"><b>&lt;OTRS_CONFIG_*&gt;</b></td>
!             <td class="contentvalue">$Text{"Config options (e. g. &lt;OTRS_CONFIG_HttpType&gt;)"}</td>
!           </tr>
!           <tr>
!             <td class="contentkey"><b>&lt;OTRS_OWNER_*&gt;</b></td>
!             <td class="contentvalue">$Text{"Ticket owner options (e. g. &lt;OTRS_OWNER_USERFIRSTNAME&gt;)"}</td>
!           </tr>
!           <tr>
!             <td class="contentkey"><b>&lt;OTRS_CURRENT_*&gt;</b></td>
!             <td class="contentvalue">$Text{"Options of the current user who requested this action (e. g. &lt;OTRS_CURRENT_USERFIRSTNAME&gt;)"}</td>
!           </tr>
!           <tr>
!             <td class="contentkey"><b>&lt;OTRS_CUSTOMER_DATA_*&gt;</b></td>
!             <td class="contentvalue">$Text{"Options of the current customer user data (e. g. &lt;OTRS_CUSTOMER_DATA_USERFIRSTNAME&gt;)"}</td>
!           </tr>
!           <tr>
!             <td class="contentkey"><b>&lt;OTRS_TICKET_*&gt;</b></td>
!             <td class="contentvalue">$Text{"Options of the ticket data (e. g. &lt;OTRS_TICKET_TicketNumber&gt;, &lt;OTRS_TICKET_ID&gt;, &lt;OTRS_TICKET_Queue&gt;, &lt;OTRS_TICKET_State&gt;)"}</td>
!           </tr>
!         </table>
!       </p>
!       <p>
!         $Text{"Example"}:
!         <pre>
!           Hi &lt;OTRS_CURRENT_USERFIRSTNAME&gt;,
! 
!           there is a new ticket in "&lt;OTRS_QUEUE&gt;"!
! 
!           &lt;OTRS_CUSTOMER_FROM&gt; wrote:
!           &lt;snip&gt;
!           &lt;OTRS_CUSTOMER_EMAIL[16]&gt;
!           &lt;snip&gt;
! 
!           &lt;OTRS_CONFIG_HttpType&gt;://&lt;OTRS_CONFIG_FQDN&gt;/&lt;OTRS_CONFIG_ScriptAlias&gt;index.pl?Action=AgentTicketZoom&TicketID=&lt;OTRS_TICKET_ID&gt;
! 
!           Your OTRS Notification Master
!         </pre>
!       </p>
  
!     </td>
!   </tr>
  </table>
  <!-- end note -->

More information about the cvs-log mailing list