Changeset 62a512 in indico for indico/MaKaC/webinterface/pages/conferences.py

Timestamp:

03/03/10 17:56:34 (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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

4a4662

Parents:

7e3044

git-author:

Ian Rolewicz <ian.rolewicz@…> (03/02/10 15:31:27)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/03/10 17:56:34)

Message:

[FIX] Support email improvements

• Make the caption of the support email entry editable, both asynchronously and synchronously (new widget created for the asynchronous editing).
• User can now specify more than one email address for support email. Entries of the user are parsed and put in a valid format, both for synchronous and asynchronous editing.
• Changed the html for the support and the start/end dates entries by replacing spans by a table.
• Updated the user guide (new screenshots and small explanation about how to specify more than one mail).
• fixes #226

File:

• indico/MaKaC/webinterface/pages/conferences.py (modified) (3 diffs)

indico/MaKaC/webinterface/pages/conferences.py

@@ -429 +429 @@
         if self._conf.hasSupportEmail():
             mailto = quoteattr("""mailto:%s?subject=%s"""%(self._conf.getSupportEmail(), urllib.quote( self._conf.getTitle() ) ))
-            vars["supportEmail"] = """<a href=%s class="confSupportEmail"><img src="%s" border="0" alt="email"> support</a>"""%(mailto, Config.getInstance().getSystemIconURL("smallEmail") )
+            vars["supportEmail"] = """<a href=%s class="confSupportEmail"><img src="%s" border="0" alt="email"> %s</a>"""%(mailto,
+                                                Config.getInstance().getSystemIconURL("smallEmail"),
+                                                displayMgr.ConfDisplayMgrRegistery().getDisplayMgr(self._conf).getSupportEmailCaption())
         p={"closeMenuURL": vars["closeMenuURL"], \
             "menuStatus": vars["menuStatus"], \
@@ -2737 +2739 @@
         vars["searchChairURL"]=quoteattr(str(urlHandlers.UHConfModifSelectChairs.getURL(self._conf)))
         vars["chairs"] = self._conf.getChairList()
+        vars["supportEmailCaption"] = displayMgr.ConfDisplayMgrRegistery().getDisplayMgr(self._conf).getSupportEmailCaption()
         vars["supportEmail"] = _("""--_("not set")--""")
         if self._conf.hasSupportEmail():
@@ -2998 +3001 @@
         vars["locationAddress"] = locAddress
 
+        vars["supportCaption"] = quoteattr(displayMgr.ConfDisplayMgrRegistery().getDisplayMgr(self._conf).getSupportEmailCaption())
         vars["supportEmail"] = quoteattr( self._conf.getSupportEmail() )
         vars["locator"] = self._conf.getLocator().getWebForm()