Changeset 94bbee in indico for indico/MaKaC/webinterface/pages/conferences.py

Timestamp:

10/19/09 13:51:20 (4 years ago)

Author:

David Martín Clavo <david.martin.clavo@…>

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:

21082a0

Parents:

63511f

git-author:

David Martín Clavo <david.martin.clavo@…> (09/14/09 17:48:26)

git-committer:

David Martín Clavo <david.martin.clavo@…> (10/19/09 13:51:20)

Message:

[IMPROVEMENT] Forthcoming webcast info on event display

-Added a line of etxt for meetings, lectures and conferences
display pages when the event is on the list of
forthcoming webcasts.

[IMPROVEMENT] Better forthcoming webcast message

-Improved message for forthcoming webcasts.
-Allowed configuration of Webcast Service URL
(used for forthcoming webcasts) in Server Admin interface.

File:

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

indico/MaKaC/webinterface/pages/conferences.py

@@ -319 +319 @@
         
         wm = webcast.HelperWebcastManager.getWebcastManagerInstance()
-        webcastURL = wm.isOnAir(self._conf)
+        onAirURL = wm.isOnAir(self._conf)
+        if onAirURL:
+            webcastURL = onAirURL
+        else:
+            webcastURL = wm.getWebcastServiceURL() 
+        forthcomingWebcast = not onAirURL and wm.getForthcomingWebcast(self._conf)
         
         frameParams = {\
@@ -329 +334 @@
             "nowHappening": drawer.getNowHappeningHTML(), \
             "simpleTextAnnouncement": drawer.getSimpleText(), \
-            "webcastURL": webcastURL }
+            "onAirURL": onAirURL,
+            "webcastURL": webcastURL,
+            "forthcomingWebcast": forthcomingWebcast }
         if self._conf.getLogo():
             frameParams["logoURL"] = urlHandlers.UHConferenceLogo.getURL( self._conf)