Changeset 3f852f in indico

Timestamp:

06/15/12 13:59:50 (11 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

06b456

Parents:

83d955

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (06/13/12 15:27:36)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (06/15/12 13:59:50)

Message:

[IMP] Add connect button event display

• Closes #1041

Location:

indico

Files:

• MaKaC/plugins/Collaboration/tpls/EventDetailBanner.tpl (modified) (2 diffs)
• MaKaC/services/implementation/collaboration.py (modified) (1 diff)
• MaKaC/webinterface/pages/collaboration.py (modified) (2 diffs)
• MaKaC/webinterface/tpls/BookingDisplay.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/events/include/VideoService.tpl (modified) (1 diff)
• htdocs/js/indico/Collaboration/Collaboration.js (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/tpls/EventDetailBanner.tpl

@@ -61 +61 @@
     <!-- <span style="margin-left:20px;"></span>  -->
 
+        % if bookingInfo:
+        <span class="collaborationDisplayMoreInfo">More Info</span>
+        % endif
+
+        % if bookingInfo and launchInfo:
+        <span style="margin-left:3px;margin-right:3px;">|</span>
+        % endif
+
         % if launchInfo:
         <a target="_blank" href="${launchInfo['launchLink']}" class="bookingLaunchLink" data-id="${bookingId}">
@@ -69 +77 @@
         </script>
         % endif
-
-        % if bookingInfo and launchInfo:
+        % if (bookingInfo or launchInfo) and booking.canBeConnected() and self_._rh._getUser() and (conf.canModify(self_._rh._aw) or booking.getOwner()["id"] == self_._rh._getUser().getId()):
         <span style="margin-left:3px;margin-right:3px;">|</span>
+        <script type="text/javascript">
+        var booking${booking.getId()} = ${jsonEncode(fossilize(booking))};
+        </script>
+        <a href="#" style="font-size:12px; font-weight: bold" onClick="connectBookingRoom(booking${booking.getId()},'${conf.getId()}')">${_("Connect")} ${booking.getLinkVideoRoomLocation()}</a>
+        <span style="display:inline; vertical-align:middle" id="connectProgress${booking.getId()}"></span>
         % endif
 
-        % if bookingInfo:
-    <span class="collaborationDisplayMoreInfo">More Info</span>
-        % endif
     </span>
 

indico/MaKaC/services/implementation/collaboration.py

@@ -194 +194 @@
     """ Performs server-side actions when a booking is connected
     """
+
+    def _checkProtection(self):
+        booking = self._CSBookingManager.getBooking(self._bookingId)
+        if not hasattr(booking, "getOwnerObject") or booking.getOwnerObject() != self.getAW().getUser():
+            CollaborationBookingModifBase._checkProtection(self)
+
     def _getAnswer(self):
         return fossilize(self._CSBookingManager.connectBooking(self._bookingId),

indico/MaKaC/webinterface/pages/collaboration.py

@@ -403 +403 @@
 
     def getJSFiles(self):
-        return WPConferenceDefaultDisplayBase.getJSFiles(self) + self._includeJSPackage('Collaboration')
+        return WPConferenceDefaultDisplayBase.getJSFiles(self) + self._includeJSPackage('Display') + self._includeJSPackage('Collaboration')
 
     def _defineSectionMenu(self):
@@ -445 +445 @@
         vars["ScheduledBookings"] = scheduledBookings
         vars["Timezone"] = self._tz
+        vars["conf"] = self._conf
 
         return vars

indico/MaKaC/webinterface/tpls/BookingDisplay.tpl

@@ -93 +93 @@
         </script>
     % endif
+
+    % if displayInfo and Booking.canBeConnected() and self_._rh._getUser() and (conf.canModify(self_._rh._aw) or Booking.getOwner()["id"] == self_._rh._getUser().getId()):
+        <span style="margin-left:3px;margin-right:3px;">|</span>
+        <script type="text/javascript">
+            var booking${Booking.getId()} = ${jsonEncode(fossilize(Booking))};
+        </script>
+        <a href="#" style="font-size:12px" onClick="connectBookingRoom(booking${Booking.getId()},'${conf.getId()}')">${_("Connect")} ${Booking.getLinkVideoRoomLocation()}</a>
+        <div style="display:inline; vertical-align:middle" id="connectProgress${Booking.getId()}"></div>
+        % endif
+
     </div>
 

indico/MaKaC/webinterface/tpls/events/include/VideoService.tpl

@@ -10 +10 @@
             <!--${launchInfo['launchText']}-->
         </a>
+        % if video.canBeConnected() and self_._rh._getUser() and (conf.canModify(self_._rh._aw) or video.getOwner()["id"] == self_._rh._getUser().getId()):
+        <span style="margin-left:3px;margin-right:3px;">|</span>
+        <script type="text/javascript">
+            var booking${video.getId()} = ${jsonEncode(fossilize(video))};
+        </script>
+        <a href="#" style="font-size:12px" onClick="connectBookingRoom(booking${video.getId()},'${conf.getId()}')">${_("Connect")} ${video.getLinkVideoRoomLocation()}</a>
+        <span style="display:inline; vertical-align:middle" id="connectProgress${video.getId()}"></span>
+        % endif
+
     </span>
 </span>

indico/htdocs/js/indico/Collaboration/Collaboration.js

@@ -1906 +1906 @@
 };
 
+var connectBookingRoom = function(booking, confId) {
+    $E("connectProgress"+booking["id"]).set(progressIndicator(true,true));
+    jsonRpc(Indico.Urls.JsonRpcService, "collaboration.connectCSBooking",
+            { confId: confId,
+              bookingId: booking.id },
+            function(result, error){
+                  $E("connectProgress"+booking["id"]).set("");
+                  if (!error) {
+                      if (result.error){
+                          new WarningPopup($T("Cannot be connected"), result.userMessage).open();
+                      }
+                      else {
+                          new AlertPopup($T("Success"), $T("The room ") + booking.linkVideoRoomLocation  + $T(" has been conected to the Vidyo room.") ).open();
+                      }
+                  } else {
+                      IndicoUtil.errorReport(error);
+                  }
+    });
+};
+
 var drawBookingPopup = function (videoInformation, confId, bookingId, displayModeratorLink) {
     var divWrapper = Html.div({className:"videoServiceInlinePopup"});