Changeset 07a40b in indico

Timestamp:

09/01/09 12:41:47 (4 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:

c53245

Parents:

64c827

Message:

[REFACTOR] Timetable code refactoring

Location:

indico/MaKaC/webinterface

Files:

• pages/sessions.py (modified) (3 diffs)
• rh/conferenceModif.py (modified) (1 diff)
• tpls/ConfModifScheduleGraphic.tpl (modified) (2 diffs)

indico/MaKaC/webinterface/pages/sessions.py

@@ -643 +643 @@
         self._tabMain = self._tabCtrl.newTab( "main", _("Main"), \
                 urlHandlers.UHSessionModification.getURL( self._session ) )
+        self._tabContribs=self._tabCtrl.newTab( "contribs", _("Contributions"), \
+                urlHandlers.UHSessionModContribList.getURL(self._session) )
+        self._tabTimetable=self._tabCtrl.newTab( "sessionTimetable", _("Session timetable"), \
+                urlHandlers.UHSessionModifSchedule.getURL(self._session) )
+        self._tabComm = self._tabCtrl.newTab( "comment", _("Comment"), \
+                urlHandlers.UHSessionModifComm.getURL( self._session ) )
         self._tabMaterials = self._tabCtrl.newTab( "materials", _("Files"), \
                 urlHandlers.UHSessionModifMaterials.getURL( self._session ) )
-        self._tabContribs=self._tabCtrl.newTab( "contribs", _("Contributions"), \
-                urlHandlers.UHSessionModContribList.getURL(self._session) )
         self._tabAC = self._tabCtrl.newTab( "ac", _("Protection"), \
                 urlHandlers.UHSessionModifAC.getURL( self._session ) )
@@ -655 +659 @@
                 urlHandlers.UHSessionModifTools.getURL( self._session ) )
         self._tabTools.setEnabled(canModify)
-        self._tabComm = self._tabCtrl.newTab( "comment", _("Comment"), \
-                urlHandlers.UHSessionModifComm.getURL( self._session ) )
         self._setActiveTab()
         self._setupTabCtrl()
@@ -1447 +1449 @@
         self._session = session        
     
-    def _setActiveTab( self ):
-        self._tabSchedule.setActive()
+    def _setActiveTab(self):
+        self._tabTimetable.setActive()
     
     def _generateSessionTimetable(self):
         
         tz = self._conf.getTimezone()
-        timeTable = timetable.TimeTable(self._conf.getSchedule(), tz)
+        timeTable = timetable.TimeTable(self._session.getSchedule(), tz)
         sDate,eDate=self._session.getAdjustedStartDate(tz),self._session.getAdjustedEndDate(tz) 
         timeTable.setStartDate(sDate)

indico/MaKaC/webinterface/rh/conferenceModif.py

@@ -605 +605 @@
         else:
             
-            session = self._target.getSessionById(params['sessions'][0])            
+            session = self._target.getSessionById(params['sessions'][0])
             
             p = sessions.WPSessionModifSchedule( self, session )

indico/MaKaC/webinterface/tpls/ConfModifScheduleGraphic.tpl

@@ -1 @@
-<%!
-declareTemplate(newTemplateStyle=True)
-location = self._conf.getLocation()
-room = self._conf.getRoom()
-
-if location:
-    locationName = location.getName()
-    address = self._conf.getLocation().getAddress().replace('\r\n','\\n').replace('\n','\\n')
-else:
-    locationName = 'None'
-    address = ''
-
-if room:
-    roomName = room.name
-else:
-    roomName = 'None'
-
-%>
+<% declareTemplate(newTemplateStyle=True)%>
 
 
 <div class="groupTitleNoBorder"><%= _("Timetable")%> <em>(<%=_("from")+" "%> <%= start_date %> <%=" "+_("to")+" "%> <%= end_date %> <a href=<%= editURL %>>[<%=_("edit")%>]</a> <%=_("Timezone")%>: <%= timezone %>)</em></div>
-<div class="shit" style="display: none;">
-      <%= content %>
-</div>
-
-
-    <div style="overflow: auto; display: none; padding: 10px; auto; margin-right: auto; margin-left: auto; margin-bottom: 10px; margin-top: 15px;">
-
-      <% if self.addControlsEnabled(): %>
-        <a href="#" style="margin-left: 15px; margin-right: 8px;" id="addLink" class="dropDownMenu highlight">add</a> <span style="color: #AAAAAA;">|</span>
-        <a href="<%= urlHandlers.UHConfModifReschedule.getURL(self._conf, targetDay=dayDate.strftime("%Y-%m-%d")) %>" style="margin-left: 8px;">reschedule</a>
-
-      <% end %>
-      <% else: %>
-
-      <a href="<%= urlHandlers.UHConfModifSchedule.getURL(self._conf, day = days) %>" style="margin-left: 20px;"><%= _("go to timetable")%></a>
-      <% end %>
-
-    </div>
-
-
-
 <div id="timetableDiv" style="position: relative;">
 
@@ -62 +24 @@
 });
 </script>
-
-
-
-
-
-<script type="text/javascript">
-
-var parentEventRoomData = $O(<%= jsonEncode(roomInfo(self._rh._target)) %>);
-
-
-
-var addSession = curry(IndicoUI.Dialogs.addSession,
-    'schedule.event.addSession',
-    'schedule.event.getDayEndDate',
-    <%= jsonEncode({'conference': self._conf.id }) %>,
-    <%= jsonEncode({'location': locationName,
-    'room': roomName,
-    'address': address }) %>,
-    parentEventRoomData,
-    '<%= dayDate.strftime("%d/%m/%Y") %>',
-    <%= jsBoolean(rbActive) %>,
-    timetable
-    );
-
-var addContribution = function() {
-    var dialog = new AddContributionDialog(<%= map(lambda x: x.getDate().strftime("%d/%m/%Y"), dayList) %>,
-                                           <%= map(lambda x: x.getDate().strftime("%d/%m/%Y"), self._dayList) %>,
-                                           'schedule.event.addContribution',
-                                           'schedule.event.getDayEndDate',
-                                           <%= jsonEncode({'conference': self._conf.id }) %>,
-                                           <%= jsonEncode({'location': locationName,
-                                           'room': roomName,
-                                           'address': address }) %>,
-                                           parentEventRoomData,
-                                           '<%= self._conf.getStartDate().strftime("%d/%m/%Y %H:%M") %>',
-                                           '<%= dayDate.strftime("%d/%m/%Y") %>',
-                                           <%= jsBoolean(rbActive) %>,
-                                           <%= jsBoolean(self._conf.getType() != 'meeting') %>,
-                                           timetable);
-
-    dialog.execute();
-};
-
-var addBreak = curry(IndicoUI.Dialogs.addBreak,
-    'schedule.event.addBreak',
-    'schedule.event.getDayEndDate',
-    <%= jsonEncode({'conference': self._conf.id }) %>,
-    <%= jsonEncode({'location': locationName,
-    'room': roomName,
-    'address': address }) %>,
-    parentEventRoomData,
-    '<%= self._conf.getStartDate().strftime("%d/%m/%Y %H:%M") %>',
-    '<%= dayDate.strftime("%d/%m/%Y") %>',
-    <%= jsBoolean(rbActive) %>,
-    timetable);
-
-<% if self.addControlsEnabled(): %>
-var addLink = $E('addLink');
-var manageMenu = null;
-addLink.observeClick(function(e) {
-    // Close the menu if clicking the link when menu is open
-    if (manageMenu != null && manageMenu.isOpen()) {
-        manageMenu.close();
-        manageMenu = null;
-        return;
-    }
-    var menuItems = {};
-    <% if self._conf.getEnableSessions(): %>
-      menuItems['<%= _("Session") %>'] = addSession;
-    <% end %>
-    menuItems['<%= _("Contribution") %>'] = addContribution;
-    menuItems['<%= _("Break") %>'] = addBreak;
-
-    manageMenu = new PopupMenu(menuItems, [addLink], 'categoryDisplayPopupList');
-    var pos = addLink.getAbsolutePosition();
-    manageMenu.open(pos.x - 5, pos.y + addLink.dom.offsetHeight + 2);
-    return false;
-});
-<% end %>
-
-var breakMenu = function(link, editURL, deleteURL, relocateURL) {
-
-    var manageBreakMenu = null;
-    // Close the menu if clicking the link when menu is open
-    if (manageBreakMenu && manageBreakMenu.isOpen()) {
-        manageBreakMenu.close();
-        manageBreakMenu = null;
-        return;
-    }
-    var menuItems = {};
-    menuItems['<%= _("Edit") %>'] = editURL;
-    menuItems['<%= _("Delete") %>'] = function() {
-                                          if (confirm("<%= _("Are you sure you want to delete this break?") %>")) {
-                                            window.location = deleteURL;
-                                          }
-                                          return false;
-                                      };
-    menuItems['<%= _("Relocate") %>'] = relocateURL;
-
-    manageBreakMenu = new PopupMenu(menuItems, [link], 'categoryDisplayPopupList', true, true);
-    var pos = link.getAbsolutePosition();
-
-    manageBreakMenu.open(pos.x + 15, pos.y + link.dom.offsetHeight + 2);
-    return false;
-    }
-
-var contributionMenu = function(link, editURL, contributionId, conferenceId, deleteURL, relocateURL) {
-
-    var manageContribMenu = null;
-    // Close the menu if clicking the link when menu is open
-    if (manageContribMenu && manageContribMenu.isOpen()) {
-        manageContribMenu.close();
-        manageContribMenu = null;
-        return;
-    }
-    var menuItems = {};
-    menuItems['<%= _("Edit") %>'] = editURL;
-    menuItems['<%= _("Add Subcontribution") %>'] = function() {
-                        IndicoUI.Dialogs.addSubContribution(contributionId, conferenceId);
-                        return false;
-                        }
-    menuItems['<%= _("Delete") %>'] = function() {
-                                         if (confirm('<%= _("Are you sure you want to delete this contribution")%> ?')) {
-                                         window.location = deleteURL;
-                                  }
-    };
-    menuItems['<%= _("Relocate") %>'] = relocateURL;
-
-    manageContribMenu = new PopupMenu(menuItems, [link], 'categoryDisplayPopupList', true, true);
-    var pos = link.getAbsolutePosition();
-
-    manageContribMenu.open(pos.x + 15, pos.y + link.dom.offsetHeight + 2);
-    return false;
-    }
-
-var sessionMenu = function(link, editURL, confId, sessionId, timetableURL) {
-
-    var manageSessionMenu = null;
-    // Close the menu if clicking the link when menu is open
-    if (manageSessionMenu && manageSessionMenu.isOpen()) {
-        manageSessionMenu.close();
-        manageSessionMenu = null;
-        return;
-    }
-    var menuItems = {};
-    menuItems['<%= _("Edit") %>'] = editURL;
-    menuItems['<%= _("Delete") %>'] = function() {
-                                         if (confirm('<%= _("Are you sure you want to delete this session?")%> ?')) {
-                                         IndicoUI.Services.deleteSession(confId, sessionId);
-                                  }
-    };
-    menuItems['<%= _("View timetable") %>'] = timetableURL;
-
-    manageSessionMenu = new PopupMenu(menuItems, [link], 'categoryDisplayPopupList', true, true);
-    var pos = link.getAbsolutePosition();
-
-    manageSessionMenu.open(pos.x + 15, pos.y + link.dom.offsetHeight + 2);
-    return false;
-    }
-
-function validClick(element, event)
-/* Checks if the button area was clicked */
-{
-      return !($E(element).getElementsByClassName('nonLinked')[0].ancestorOf($E(eventTarget(event))));
-}
-
-// Add highlight effect
-
-each($E(document).getElementsByClassName('ttSessionManagementBlock'),
-     function(elem) {
-        highlightWithMouse(elem, elem);
-     });
-
-</script>
-
-
-
-
-