Changeset d71a04 in indico

Timestamp:

01/29/10 11:08:17 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

ba2d45

Parents:

ca129b

Message:

[FIX] Registration form: missing icons

Icons are now always visible.

fixes #49

Location:

indico/MaKaC/webinterface

Files:

• pages/registrants.py (modified) (3 diffs)
• tpls/EmailToRegistrants.tpl (modified) (2 diffs)

indico/MaKaC/webinterface/pages/registrants.py

@@ -612 +612 @@
 
         if l == []:
-            vars["emailIconURL"]=""
-            vars["printIconURL"]=""
-            vars["infoIconURL"]=""
-            vars["excelIconURL"]=""
             vars ["reglist"]=""
         else:
             vars ["reglist"]=",".join(regl)
-            vars["emailIconURL"]="""<input type="image" name="email" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("envelope")))
-            vars["printIconURL"]="""<input type="image" name="pdf" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("pdf")))
-            vars["infoIconURL"]="""<input type="image" name="info" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("info")))
-            vars["excelIconURL"]="""<input type="image" name="excel" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("excel")))
+        vars["emailIconURL"]="""<input type="image" name="email" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("envelope")))
+        vars["printIconURL"]="""<input type="image" name="pdf" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("pdf")))
+        vars["infoIconURL"]="""<input type="image" name="info" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("info")))
+        vars["excelIconURL"]="""<input type="image" name="excel" src=%s border="0">"""%quoteattr(str(Config.getInstance().getSystemIconURL("excel")))
         vars ["acom"] = self._getAcomHTML()
         vars ["ses"]=self._getSessHTML()
@@ -759 +755 @@
         vars["cc"] = ""
         vars["toEmails"]= ", ".join(toEmails)
+        if vars["toEmails"] == "":
+            vars["toEmails"] = "No registrants have been selected"
         vars["toIds"]= "".join(toIds)
         vars["postURL"]=urlHandlers.UHRegistrantsSendEmail.getURL(self._conf)
@@ -1305 +1303 @@
             """)%(quoteattr(str(url)), gsf.getTitle(), self._getMiscInfoItemsHTML(gsf) ) )
         return "".join(html)
-    
+
     def _getFormSections(self):
         sects = []

indico/MaKaC/webinterface/tpls/EmailToRegistrants.tpl

@@ -1 @@
-<form action=%(postURL)s method="POST">    
+<form action=%(postURL)s method="POST">
     %(toIds)s
     <table width="80%%" align="center" border="0" style="border-left: 1px solid #777777">
@@ -7 +7 @@
         </tr>
         <tr>
+            <td><%= _("From")%>: </td>
+            <td colspan="2"><input type="text" name="from" size="50" value="%(from)s"></text></td>
+        </tr>
+        <tr>
             <td>
-                <%= _("To")%>: 
+                <%= _("To")%>:
             </td>
                 <td colspan="2" style="padding-top:5px; padding-bottom:5px">%(toEmails)s</td>
         </tr>
         <tr>
-            <td><%= _("Cc")%>: </td>
+            <td valign="top"><%= _("Cc")%>: </td>
                 <td colspan="2"><input type="text" name="cc" size="50" value="%(cc)s"></text> <font color="red"><%= _("Beware, addresses in this field will receive one mail per registrant")%></font></td>
-        </tr>
-        <tr>
-            <td><%= _("From")%>: </td>
-                <td colspan="2"><input type="text" name="from" size="50" value="%(from)s"></text></td>
         </tr>
         <tr>