Changeset c7307f in indico

Timestamp:

02/24/11 15:25:45 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

7d30d5

Parents:

5f7a6d

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/24/11 15:24:37)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/24/11 15:25:45)

Message:

[FIX] Missing template substitutions

Location:

indico/MaKaC/webinterface/tpls

Files:

• ConfModifEPayment.tpl (modified) (3 diffs)
• ConfModifEPaymentDataModification.tpl (modified) (2 diffs)
• ConfModifRegForm.tpl (modified) (2 diffs)
• ConfModifRegFormDataModification.tpl (modified) (3 diffs)

indico/MaKaC/webinterface/tpls/ConfModifEPayment.tpl

@@ -50 +50 @@
     <tr>
         <td class="dataCaptionTD"><span class="dataCaptionFormat"><%= _("Payment Summary Email Message")%></span></td>
-        <td bgcolor="white" width="100%%" class="blacktext">
-           <textarea rows="6" cols="60" disabled="disabled">%(receiptMsgPayment)s</textarea>
+        <td bgcolor="white" width="100%" class="blacktext">
+           <textarea rows="6" cols="60" disabled="disabled"><%= receiptMsgPayment %></textarea>
            <br/>
         </td>
@@ -58 +58 @@
     <tr>
         <td class="dataCaptionTD"><span class="dataCaptionFormat"><%= _("Success Email Message")%></span></td>
-        <td bgcolor="white" width="100%%" class="blacktext">
-           <textarea rows="6" cols="60" disabled="disabled">%(successMsgPayment)s</textarea>
+        <td bgcolor="white" width="100%" class="blacktext">
+           <textarea rows="6" cols="60" disabled="disabled"><%= successMsgPayment %></textarea>
            <br/>
         </td>
@@ -87 +87 @@
 </table>
 <br>
-

indico/MaKaC/webinterface/tpls/ConfModifEPaymentDataModification.tpl

@@ -31 +31 @@
             <td nowrap class="dataCaptionTD"><span class="titleCellFormat"><%= _("Payment Summary Email Message")%></span></td>
             <td align="left">
-                <%=_("Currently this email is")%> <strong>%(receiptMsgPaymentEnabled)s</strong> (<%=_("You can change this in the")%> <a href="%(dataModificationURL)s"><%=_("registration form setup")%></a>)<br>
-                <textarea name="receiptMsgPayment" rows="6" cols="60">%(receiptMsgPayment)s</textarea>
+                <%=_("Currently this email is")%> <strong><%= receiptMsgPaymentEnabled %></strong> (<%=_("You can change this in the")%> <a href="<%= dataModificationURL %>"><%=_("registration form setup")%></a>)<br>
+                <textarea name="receiptMsgPayment" rows="6" cols="60"><%= receiptMsgPayment %></textarea>
             </td>
         </tr>
@@ -38 +38 @@
             <td nowrap class="dataCaptionTD"><span class="titleCellFormat"><%= _("Success Email Message")%></span></td>
             <td align="left">
-                <%=_("Currently this email is")%> <strong>%(successMsgPaymentEnabled)s</strong> (<%=_("You can change this in the")%> <a href="%(dataModificationURL)s"><%=_("registration form setup")%></a>)<br>
-                <textarea name="successMsgPayment" rows="6" cols="60">%(successMsgPayment)s</textarea>
+                <%=_("Currently this email is")%> <strong><%= successMsgPaymentEnabled %></strong> (<%=_("You can change this in the")%> <a href="<%= dataModificationURL %>"><%=_("registration form setup")%></a>)<br>
+                <textarea name="successMsgPayment" rows="6" cols="60"><%= successMsgPayment %></textarea>
             </td>
         </tr>

indico/MaKaC/webinterface/tpls/ConfModifRegForm.tpl

@@ -68 +68 @@
     <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Email notification sender address")%></span></td>
     <td class="blacktext">
-      %(notificationSender)s
+      <%= notificationSender %>
     </td>
   </tr>
@@ -79 +79 @@
   <tr>
     <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Email registrant")%></span></td>
-    <td bgcolor="white" width="100%%">
+    <td bgcolor="white" width="100%">
       <% if activated: %>
       <table>
         <tr>
           <td align="right"><strong><%= _("After registration")%></strong>:</td>
-          <td>%(sendRegEmail)s</td>
+          <td><%= sendRegEmail %></td>
         </tr>
         <tr>
           <td align="right"><strong><%= _("With a payment summary")%></strong>:</td>
-          <td>%(sendReceiptEmail)s</td>
+          <td><%= sendReceiptEmail %></td>
         </tr>
         <tr>
           <td align="right"><strong><%= _("After successful payment")%></strong>:</td>
-          <td>%(sendPaidEmail)s</td>
+          <td><%= sendPaidEmail %></td>
         </tr>
       </table>

indico/MaKaC/webinterface/tpls/ConfModifRegFormDataModification.tpl

@@ -87 +87 @@
     <tr>
       <td nowrap class="titleCellTD"><span class="titleCellFormat"> <%= _("Email notification sender address")%></span></td>
-      <td bgcolor="white" width="100%%"><input type="text" size="50" name="notificationSender" value="<%= notificationSender %>"></td>
+      <td bgcolor="white" width="100%"><input type="text" size="50" name="notificationSender" value="<%= notificationSender %>"></td>
     </tr>
     <tr>
@@ -94 +94 @@
         <span class="smallLabel"><%= _("(on new registrations)")%></span>
       </td>
-      <td bgcolor="white" width="100%%">
+      <td bgcolor="white" width="100%">
         <table align="left">
         <tr>
@@ -117 +117 @@
     <tr>
       <td nowrap class="titleCellTD"><span class="titleCellFormat"> <%= _("Email registrant...")%></span></td>
-      <td bgcolor="white" width="100%%">
-        <input type="checkbox" size="50" name="sendRegEmail" id="sendRegEmail" %(sendRegEmail)s>
+      <td bgcolor="white" width="100%">
+        <input type="checkbox" size="50" name="sendRegEmail" id="sendRegEmail" <%= sendRegEmail %>>
         <label for="sendRegEmail"><strong><%= _("...after registration")%></strong></label>
         <br>
 
-        <input type="checkbox" size="50" name="sendReceiptEmail" id="sendReceiptEmail" %(sendReceiptEmail)s>
+        <input type="checkbox" size="50" name="sendReceiptEmail" id="sendReceiptEmail" <%= sendReceiptEmail %>>
         <label for="sendReceiptEmail"><strong><%= _("...with a payment summary")%></strong></label>
         <br>
 
-        <input type="checkbox" size="50" name="sendPaidEmail" id="sendPaidEmail" %(sendPaidEmail)s>
+        <input type="checkbox" size="50" name="sendPaidEmail" id="sendPaidEmail" <%= sendPaidEmail %>>
         <label for="sendPaidEmail"><strong><%= _("...after successful payment")%></strong></label>
       </td>