Changeset d8de92 in indico

Timestamp:

12/01/11 13:38:14 (19 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, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

7b4e91

Parents:

ebdd5f

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (07/11/11 10:51:38)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (12/01/11 13:38:14)

Message:

[FIX] Fix importer dialog

File:

• indico/ext/importer/htdocs/js/importer.js (modified) (8 diffs)

indico/ext/importer/htdocs/js/importer.js

@@ -255 +255 @@
                  */
                 var _observeInsertButton =  function(){
-                    if(self.importerList.getSelectedList().getLength() > 0 &&
-                           self.timetableList.getSelection() )
-                        self.insertButton.enable();
+                    if(self.importerList.getSelectedList().getLength() > 0 && self.timetableList.getSelection() )
+                        self.insertButton.disabledButtonWithTooltip('enable');
                     else
-                        self.insertButton.disable();
+                        self.insertButton.disabledButtonWithTooltip('disable');
+
                 };
                 this.importerList = new ImporterList([],
@@ -271 +271 @@
                         this.emptySearchDiv.draw(), this.importerList.draw(), this.timetableList.draw());
             },
-            /**
-             * Draws buttons at the bottom of the dialog.
-             */
-            drawButtons: function(){
-                var self = this;
-                this.insertButton = new DisabledButton(Html.input('button',{disabled:true}, $T('Proceed...')));
-                var insertButtonTooltip;
-                this.insertButton.observeEvent('mouseover', function(event){
-                    if (!self.insertButton.isEnabled()) {
-                       insertButtonTooltip = IndicoUI.Widgets.Generic.errorTooltip(event.clientX, event.clientY, $T("Please select contributions to be added and their destination."), "tooltipError");
-                    }
-                });
-                this.insertButton.observeEvent('mouseout', function(event){
-                    Dom.List.remove(document.body, insertButtonTooltip);
-                });
-                this.insertButton.observeClick(function() {
+            _getButtons: function() {
+                var self = this;
+                return [
+                    [$T('Proceed...'), function() {
                         var destination = self.timetableList.getSelection();
                         var entries = self.importerList.getSelectedList();
                         var importer = self.importerList.getLastImporter();
-                        new ImporterDurationDialog(entries, destination,  self.confId, self.timetable, importer, function(redirect){
-                            if( !redirect ) {
+                        new ImporterDurationDialog(entries, destination,  self.confId, self.timetable, importer, function(redirect) {
+                            if(!redirect) {
                                 self._hideLists();
                                 self.timetableList.clearSelection();
                                 self.importerList.clearSelection();
                                 self.emptySearchDiv.showAfterSearch();
-                            } else
+                            } else {
                                 self.close();
+                            }
                         });
-                 });
-                return Html.div({}, this.insertButton.draw());
-            },
-            /**
-             * Overloaded method. Sets height and width of the dialog.
-             */
-            _adjustContentWrapper: function() {
-                this.ExclusivePopupWithButtons.prototype._adjustContentWrapper.call(this);
-                this.contentWrapper.setStyle("height", this.height);
-                this.contentWrapper.setStyle("width", this.width);
+                    }],
+                    [$T('Close'), function() {
+                        self.close();
+                    }]
+                ];
             },
             draw: function(){
-                return this.ExclusivePopupWithButtons.prototype.draw.call(this, this.drawContent(), this.drawButtons());
+                this.insertButton = this.buttons.eq(0);
+                this.insertButton.disabledButtonWithTooltip({
+                    tooltip: $T('Please select contributions to be added and their destination.'),
+                    disabled: true
+                });
+                return this.ExclusivePopupWithButtons.prototype.draw.call(this, this.drawContent());
             }
         },
@@ -325 +314 @@
         function(timetable){
             var self = this;
-            this.ExclusivePopupWithButtons(Html.div({style:{textAlign:"center"}},$T("Import Entries")));
+            this.ExclusivePopupWithButtons($T("Import Entries"));
             this.timetable = timetable?timetable:window.timetable;
             this.timetable = this.timetable.parentTimetable?this.timetable.parentTimetable:this.timetable
@@ -463 +452 @@
             },
 
-            drawButtons: function(){
-                var self = this;
-                var insertButton = Html.input("button",{},$T("Insert"));
-                var entriesLength = self.entries.getLength();
-
-                insertButton.observeClick(function(){
-                    if( self.parameterManager.check() ) {
+            _getButtons: function() {
+                var self = this;
+                return [
+                    [$T('Insert'), function() {
+                        if(!self.parameterManager.check()) {
+                            return;
+                        }
                         //Converts string containing contribution's start date(HH:MM) into a number of minutes.
                         //Using parseFloat because parseInt('08') = 0.
@@ -476 +465 @@
                         var method = self._extractMethod();
                         //If last contribution finishes before 24:00
-                        if( time + duration * entriesLength <= 1440) {
+                        if( time + duration * self.entries.getLength() <= 1440) {
                             var killProgress = IndicoUI.Dialogs.Util.progress();
                             var date = self.destination.startDate.date.replace(/-/g,'/');
@@ -509 +498 @@
                                 if(self.successFunction)
                                     self.successFunction(self.info.get('redirect'));
-                                if( self.info.get('redirect') )
+                                if(self.info.get('redirect'))
                                     window.location = self._extractRedirectUrl();
                                 self.close();
@@ -516 +505 @@
                             ImporterUtils.multipleIndicoRequest(args, successCallback , null, finalCallback);
                         }
-                        else
+                        else {
                             new WarningPopup("Warning", "Some contributions will end after 24:00. Please modify start time and duration.").open();
-                    }
-                });
-                return Html.div({}, insertButton);
+                        }
+                    }],
+                    [$T('Cancel'), function() {
+                        self.close();
+                    }]
+                ];
+
             },
             draw: function(){
-                return this.ExclusivePopupWithButtons.prototype.draw.call(this, this.drawContent(), this.drawButtons());
+                return this.ExclusivePopupWithButtons.prototype.draw.call(this, this.drawContent());
             }
         },
@@ -537 +530 @@
         function(entries, destination, confId, timetable, importer, successFunction){
             var self = this;
-            this.ExclusivePopupWithButtons(Html.div({style:{textAlign:"center"}},$T("Adjust entries")));
+            this.ExclusivePopupWithButtons($T('Adjust entries'));
             this.confId = confId;
             this.entries = entries;