Changeset b7daaf in indico

Timestamp:

04/09/10 18:05:02 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

b03b51

Parents:

bbf23d

git-author:

Jose Benito <jose.benito.gonzalez@…> (04/09/10 18:03:35)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/09/10 18:05:02)

Message:

[IMP] Added Timetable fullscreen mode

• also removed the 'reload' on windows resize

Location:

indico

Files:

• MaKaC/webinterface/pages/conferences.py (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfModifScheduleGraphic.tpl (modified) (2 diffs)
• htdocs/js/indico/Timetable/Base.js (modified) (4 diffs)

indico/MaKaC/webinterface/pages/conferences.py

@@ -6628 +6628 @@
             abstracts.append(abstract.getId())
         if len(abstracts) > 0 :
-            generateIcon = Config.getInstance().getSystemIconURL("excel")
+            generateExcelIcon = Config.getInstance().getSystemIconURL("excel")
             generateExcelURL = urlHandlers.UHAbstractsConfManagerDisplayExcel.getURL(self._conf)
             hiddenAbstracts=[]

indico/MaKaC/webinterface/tpls/ConfModifScheduleGraphic.tpl

@@ -17 +17 @@
 
 //Variables used to resize the timetable.
-var minWidth = 600;
+var minWidth = 900;
 var widthOffset = 300;
-var previousWidth = document.body.clientWidth - widthOffset;
-var minResize = 30;
-
 var historyBroker = new BrowserHistoryBroker();
 var timetable = new TopLevelManagementTimeTable(ttdata, eventInfo, document.body.clientWidth - widthOffset < minWidth ? minWidth : document.body.clientWidth - widthOffset,$E('timetableDiv'), false, historyBroker);
@@ -31 +28 @@
 
 });
-
-//Inefficient way of resizing a timetable
-window.onresize = function (){
-
-    //Updating only if a window was resized by certain legnth
-    if(previousWidth - document.body.clientWidth + widthOffset > minResize || previousWidth - document.body.clientWidth + widthOffset < -minResize)
-        //Updating only if a window size is greater than minimal timetable size
-        if(timetable.width > minWidth || document.body.clientWidth - widthOffset > minWidth)
-        {
-            var newWidth = document.body.clientWidth - widthOffset < minWidth ? minWidth : document.body.clientWidth - widthOffset;
-            //timetable.width = window.innerWidth - widthOffset < minWidth ? minWidth : window.innerWidth - widthOffset;
-            timetable = new TopLevelManagementTimeTable(ttdata, eventInfo, newWidth, $E('timetableDiv'), false, historyBroker);
-            $E('timetableDiv').set(timetable.draw());
-            timetable.postDraw();
-            previousWidth = newWidth;
-        }
-}
-
 </script>

indico/htdocs/js/indico/Timetable/Base.js

@@ -176 +176 @@
         var elements = translate($E(document.body).dom.childNodes, function(value) {return $E(value);});
 
-        var goBackLink = Html.a({href: '#', style: {fontSize: '17px'}}, 'Go back');
-        var printLink = Html.a({href: '#', style: {fontSize: '17px'}}, 'Print');
+        var goBackLink = Html.a({href: window.location.hash, style: {fontSize: '17px'}}, $T('Go back'));
+        var printLink = Html.a({href: window.location.hash, style: {fontSize: '17px'}}, $T('Print'));
 
         var links = Html.span({style: {cssFloat: 'right'}}, printLink, ' | ', goBackLink);
@@ -200 +200 @@
         $E(document.body).set(header, timetableDiv);
         $E(document.body).setStyle('padding', pixels(30));
+    },
+
+    fullScreen: function() {
+        var self = this;
+
+        //self.timetableDrawer.setPrintableVersion(true);
+
+        var bodyPadding = $E(document.body).dom.style.padding;
+        var elements = translate($E(document.body).dom.childNodes, function(value) {return $E(value);});
+        IndicoUI.Dialogs.Util.progress($T("Switching to full screen mode..."));
+
+        var goBackLink = Html.a({href: window.location.hash, style: {fontSize: '17px'}}, $T('Go back'));
+
+        var links = Html.span({style: {cssFloat: 'right'}}, goBackLink);
+
+        self.previousWidth = self.timetableDrawer.width;
+
+        goBackLink.observeClick(function(e) {
+            IndicoUI.Dialogs.Util.progress($T("Switching to normal mode..."));
+            // This timeout is needed in order to give time to the progress indicator to be rendered
+            setTimeout(function(){
+                self.timetableDrawer.width = self.previousWidth;
+                self.timetableDrawer.setPrintableVersion(false);
+                $E(document.body).setStyle('padding', bodyPadding);
+                $E(document.body).set(elements);
+                self.timetableDrawer.redraw(self.currentDay);
+            }, 50);
+        });
+
+     // This timeout is needed in order to give time to the progress indicator to be rendered
+        setTimeout(function(){
+            self.timetableDrawer.width = $E(document.body).dom.clientWidth - 50; // 50 is a width offset.
+
+            var headerStyle = {padding: '0px 5px 5px 5px',
+                    borderBottom: '1px solid black',
+                    textAlign: 'center',
+                    width: pixels(self.timetableDrawer.width)};
+            var header = Html.div({className: 'timetableHeader clearfix', style: headerStyle}, links,
+                Html.span({style: {cssFloat: 'left'}}, self._titleTemplate(self.timetableDrawer.day)));
+
+            self.timetableDrawer.redraw(self.currentDay);
+            var timetableElements = translate(self.timetableDrawer.canvas.dom.childNodes, function(value) {return $E(value);});
+            var timetableDiv = Html.div({style: {paddingTop: pixels(20), position: 'relative'}}, timetableElements);
+            $E(document.body).set(header, timetableDiv);
+            $E(document.body).setStyle('padding', pixels(30));
+        }, 50);
     },
 
@@ -230 +276 @@
                 self.print();
             }
-                          };
+        };
+
+        var fullScreenButton = {'btn': Html.div('buttonWhite', $T('Full screen')),
+                'onclick': function(btnContainer) {
+                    self.fullScreen();
+                }
+        };
 
         // TODO: Needs to be implemented
@@ -247 +299 @@
                 btnContainer.dom.style.background = state ? "#9F883B" : "";
             }
-                           };
+        };
 
         return [printButton,
+                fullScreenButton,
                 this.detailsButton,
                 filterButton];