Changeset 36e3ed in indico


Ignore:
Timestamp:
06/15/12 17:26:16 (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, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
a9daf0
Parents:
06b456
Message:

[IMP] Removing onClick attributes

Location:
indico
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r3f852f r36e3ed  
    77## Move this into js folder 
    88var videoServiceLaunchInfo = {}; 
     9var bookings = ${dict((b['id'], b) for b in fossilize(bookings))|n,j}; 
    910 
    1011</script> 
    … …  
    8081        <span style="margin-left:3px;margin-right:3px;">|</span> 
    8182        <script type="text/javascript"> 
    82         var booking${booking.getId()} = ${jsonEncode(fossilize(booking))}; 
     83          var booking${booking.getId()} = bookings[${pos}]; 
    8384        </script> 
    84         <a href="#" style="font-size:12px; font-weight: bold" onClick="connectBookingRoom(booking${booking.getId()},'${conf.getId()}')">${_("Connect")} ${booking.getLinkVideoRoomLocation()}</a> 
    85         <span style="display:inline; vertical-align:middle" id="connectProgress${booking.getId()}"></span> 
     85        <a href="#" style="font-size:12px; font-weight: bold" class="connect_room" data-booking-id="${booking.getId()}" data-event="${conf.getId()}">${_("Connect")} ${booking.getLinkVideoRoomLocation()}</a> 
     86        <span style="display:inline; vertical-align:middle" class="progress"></span> 
    8687        % endif 
    8788 

  • indico/MaKaC/webinterface/pages/collaboration.py

    r3f852f r36e3ed  
    444444        vars["OngoingBookings"] = ongoingBookings 
    445445        vars["ScheduledBookings"] = scheduledBookings 
     446        vars["all_bookings"] = fossilize(bookings) 
    446447        vars["Timezone"] = self._tz 
    447448        vars["conf"] = self._conf 

  • indico/MaKaC/webinterface/tpls/BookingDisplay.tpl

    r3f852f r36e3ed  
    9797        <span style="margin-left:3px;margin-right:3px;">|</span> 
    9898        <script type="text/javascript"> 
    99             var booking${Booking.getId()} = ${jsonEncode(fossilize(Booking))}; 
     99          var booking${Booking.getId()} = bookings[${Booking.getId()|n,j}]; 
    100100        </script> 
    101         <a href="#" style="font-size:12px" onClick="connectBookingRoom(booking${Booking.getId()},'${conf.getId()}')">${_("Connect")} ${Booking.getLinkVideoRoomLocation()}</a> 
    102         <div style="display:inline; vertical-align:middle" id="connectProgress${Booking.getId()}"></div> 
     101 
     102        <a href="#" style="font-size:12px" data-booking-id="${Booking.getId()}" data-event="${conf.getId()}" class="connect_room">${_("Connect")} ${Booking.getLinkVideoRoomLocation()}</a> 
     103        <div style="display:inline; vertical-align:middle" class="progress"></div> 
    103104        % endif 
    104105 

  • indico/MaKaC/webinterface/tpls/CollaborationDisplay.tpl

    rc0de5a r36e3ed  
    1616% endif 
    1717 
     18<script type="text/javascript"> 
     19  var bookings = ${dict((b['id'], b) for b in all_bookings)|n,j}; 
     20</script> 
     21 
    1822% for date, bookings in ScheduledBookings: 
    1923    <div class="collaborationDisplayDateGroup"> 

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

    r3f852f r36e3ed  
    1515            var booking${video.getId()} = ${jsonEncode(fossilize(video))}; 
    1616        </script> 
    17         <a href="#" style="font-size:12px" onClick="connectBookingRoom(booking${video.getId()},'${conf.getId()}')">${_("Connect")} ${video.getLinkVideoRoomLocation()}</a> 
    18         <span style="display:inline; vertical-align:middle" id="connectProgress${video.getId()}"></span> 
     17        <a href="#" style="font-size:12px" class="connect_room" data-booking-id=${video.getId()|n,j} data-event="${conf.getId()}">${_("Connect")} ${video.getLinkVideoRoomLocation()}</a> 
     18        <span style="display:inline; vertical-align:middle" class="progress"></span> 
    1919        % endif 
    2020 

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

    r06b456 r36e3ed  
    19071907 
    19081908var connectBookingRoom = function(booking, confId) { 
    1909     $("#connectProgress" + booking["id"]).html(progressIndicator(true, true).dom); 
     1909    var $this = $(this); 
     1910 
     1911    $this.siblings(".progress").html(progressIndicator(true, true).dom); 
    19101912    jsonRpc(Indico.Urls.JsonRpcService, "collaboration.connectCSBooking", 
    19111913            { 
    … …  
    19141916            }, 
    19151917            function(result, error){ 
    1916                 $("#connectProgress" + booking["id"]).html(""); 
     1918                $this.siblings(".progress").html(""); 
    19171919                if (!error) { 
    19181920                    if (result.error){ 
    … …  
    20122014    popup.open(); 
    20132015}; 
     2016 
     2017 
     2018$(function() { 
     2019    $('.connect_room').click(function() { 
     2020        connectBookingRoom.call(this, bookings[$(this).attr('data-booking-id')], $(this).attr('data-event')); 
     2021        return false; 
     2022    }); 
     2023}); 
Note: See TracChangeset for help on using the changeset viewer.