Changeset e68565 in indico

Timestamp:

05/26/10 19:07:30 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

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:

229db0

Parents:

36827b

git-author:

Ian Rolewicz <ian.rolewicz@…> (05/05/10 16:26:25)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/26/10 19:07:30)

Message:

[FIX] Make RoomBookingWidget? work when RB inactive

• fixes #36
• When the room booking module is inactive, the html select for specifying a room is replaced by an html text input

Location:

indico/htdocs

Files:

• css/Default.css (modified) (1 diff)
• js/indico/Management/RoomBooking.js (modified) (3 diffs)

indico/htdocs/css/Default.css

@@ -5803 +5803 @@
 }
 
-div.flexibleSelect {
+div.flexibleSelect, input.roomTextField {
     border: 1px solid #AAAAAA;
     position: relative;

indico/htdocs/js/indico/Management/RoomBooking.js

@@ -39 +39 @@
          draw: function() {
 
-             this.inheritText = this.parentInfo?Html.span({},
-                                                          $T('Inherit from parent: '),
-                                                          Html.span({},
-                                                                    this.parentInfo.get('room') + " (" +
-                                                                    this.parentInfo.get('location') + ")")):'';
-             return Html.table('roomWidget',
-                               Html.tbody({},
-                                          Html.tr({}, Html.th({}, Html.div('roomWidgetTitle', $T("Location"))),
-                                                  Html.th({}, Html.div('roomWidgetTitle', $T("Room")))),
-                                          Html.tr({},
-                                                  Html.td({style:{'verticalAlign': 'top'}},
-                                                              Html.div({style: {paddingRight: '20px'}}, this.locationChooser.draw())),
-                                                  Html.td({style:{'verticalAlign': 'top'}},
-                                                          Html.div({style: {paddingRight: '20px'}}, this.roomChooser.draw()))),
-                                          Html.tr({},
-                                                  Html.td({colspan: 2}, this.parentInfo?this.inheritCheckbox:'', this.inheritText)),
-                                          Html.tr({style:{height: '6px'}}),
-                                          Html.tr({},
-                                                  Html.th({colspan: 2}, Html.div({className: 'roomWidgetTitle', style: {width: '210px'}}, $T('Address')))),
-                                          Html.tr({},
-                                                  Html.td({colspan: 2}, this.addressArea.draw())
-                                                 )));
+             var rbActive = Indico.Settings.RoomBookingModuleActive
+
+             this.inheritText = this.parentInfo?Html.span(
+                 {},
+                 $T('Inherit from parent: '),
+                 Html.span({},
+                           this.parentInfo.get('room') + " (" +
+                           this.parentInfo.get('location') + ")")):'';
+             return Html.table(
+                 'roomWidget',
+                 Html.tbody(
+                     {},
+                     Html.tr({},
+                             Html.th({}, Html.div('roomWidgetTitle', $T("Location"))),
+                             Html.th({}, Html.div('roomWidgetTitle', $T("Room")))),
+                     Html.tr({},
+                             Html.td({style:{'verticalAlign': 'top'}},
+                                     Html.div({style: {paddingRight: '20px'}}, this.locationChooser.draw())),
+                             Html.td({style:{'verticalAlign': 'top'}},
+                                     Html.div({style: {paddingRight: '20px'}},
+                                              rbActive ?
+                                              this.roomChooser.draw() :
+                                              this.roomChooser))),
+                     Html.tr({},
+                             Html.td({colspan: 2}, this.parentInfo?this.inheritCheckbox:'', this.inheritText)),
+                     Html.tr({style:{height: '6px'}}),
+                     Html.tr({},
+                             Html.th({colspan: 2}, Html.div({className: 'roomWidgetTitle', style: {width: '210px'}}, $T('Address')))),
+                     Html.tr({},
+                             Html.td({colspan: 2}, this.addressArea.draw())
+                            )));
 
 
@@ -122 +131 @@
      function(locations, info, parent, inheritDefault, eventFavorites, defaultLocation) {
          var self = this;
+         var rbActive = Indico.Settings.RoomBookingModuleActive
 
          this.defaultLocation = defaultLocation;
          this.locationChooser = new FlexibleSelect(locations, 177);
-         this.roomChooser = new FlexibleSelect({},
-                                               177,
-                                               function(e1, e2){
-                                                     return self._favoriteSort(self.roomChooser.list.get(e1), self.roomChooser.list.get(e2));
-                                               },
-                                               function(key, elem){ return self._favoriteDecorator(key, elem); });
+
+         if ( rbActive ) {
+             this.roomChooser = new FlexibleSelect(
+                 {}, 177,
+                 function(e1, e2){
+                     return self._favoriteSort(
+                         self.roomChooser.list.get(e1),
+                         self.roomChooser.list.get(e2));
+                 },
+                 function(key, elem){
+                     return self._favoriteDecorator(key, elem);
+                 });
+         }
+         else {
+             this.roomChooser = Html.input('text', {className: "roomTextField"});
+         }
+
          this.addressArea = new RealtimeTextArea({});
          this.inheritCheckbox = Html.checkbox({});
@@ -175 +196 @@
 
          this.locationChooser.observe(function(value){
-             if (value !== '' && locations !== null) {
+             if (rbActive && value !== '' && locations !== null) {
                  if (locations[value]) {
                      self.roomChooser.setLoading(true);