Changeset 7be1ea in indico

Timestamp:

02/22/12 17:56:17 (15 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

01912d

Parents:

70c19a

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (02/22/12 16:18:05)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/22/12 17:56:17)

Message:

[FIX] Shoe reject all conflicts out of summary

Location:

indico

Files:

• MaKaC/plugins/RoomBooking/default/room.py (modified) (1 diff)
• MaKaC/webinterface/tpls/ConferenceParticipantsPending.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ConferenceParticipantsSetup.tpl (modified) (6 diffs)
• MaKaC/webinterface/wcomponents.py (modified) (1 diff)
• htdocs/js/indico/RoomBooking/RoomBookingCalendar.js (modified) (2 diffs)

indico/MaKaC/plugins/RoomBooking/default/room.py

@@ -173 +173 @@
     def getUserRooms(cls, avatar):
         return Catalog.getIdx('user_room').get(avatar.getId())
-        #return rooms if rooms else OOSet()
 
     # Typical actions

indico/MaKaC/webinterface/tpls/ConferenceParticipantsPending.tpl

@@ -170 +170 @@
             var body = 'Dear {name},<br/><br/>' +
                         'your request to attend the \'{confTitle}\' has been declined by the event manager.<br/>';
-            var legends = {'confTitle':$T('field containing the conference title. (This field is mandatory)'),
-                           'name':$T('field containing the full name of the participant.(This field is mandatory)')};
+            var legends = {'confTitle':$T('field containing the conference title.'),
+                           'name':$T('field containing the full name of the participant.')};
             var popup = new ParticipantsEmailPopup($T("Send mail to the participants"),"${conf.getTitle()}", ${conf.getId()}, 'event.participation.rejectPendingWithEmail', participantsChecked, '${currentUser.getStraightFullName()}' ,subject, body, legends, pendingHandler);
             popup.open();

indico/MaKaC/webinterface/tpls/ConferenceParticipantsSetup.tpl

@@ -7 +7 @@
 </tr>
 <tr>
-    <td style="padding-right:15px">${ _(" When a participant is added, an email notification will be sent to him.")}</td>
+    <td style="padding-right:15px">${ _(" When a participant is added, an email notification will be sent to him")}</td>
     <td>
         <div id="inPlaceEditAddedInfo"></div>
@@ -14 +14 @@
 
 <tr>
-    <td style="padding-right:15px">${ _("The list of participants is displayed on the event page.")}</td>
+    <td style="padding-right:15px">${ _("The list of participants is displayed on the event page")}</td>
     <td class="blacktext">
         <div id="inPlaceEditDisplay"></div>
@@ -20 +20 @@
 </tr>
 <tr>
-    <td style="padding-right:15px">${ _("Users may apply to participate in this event.")}</td>
+    <td style="padding-right:15px">${ _("Users may apply to participate in this event")}</td>
     <td class="blacktext">
         <div id="inPlaceEditAllowForApply"></div>
@@ -26 +26 @@
 </tr>
 <tr>
-    <td style="padding-right:15px">${ _("Participation requests must be approved by the event managers (you).")}</td>
+    <td style="padding-right:15px">${ _("Participation requests must be approved by the event managers (you)")}</td>
     <td class="blacktext">
         <div id="inPlaceEditAutoAccept"></div>
@@ -32 +32 @@
 </tr>
 <tr>
-    <td style="padding-right:15px">${ _("Maximum number of participants.")}</td>
+    <td style="padding-right:15px">${ _("Maximum number of participants (0 means unlimited)")}</td>
     <td class="blacktext">
-        <div id="inPlaceEditNumMaxParticipants"></div>
+        <div id="inPlaceEditNumMaxParticipants" style="display:inline;"></div>
     </td>
 </tr>
@@ -50 +50 @@
             Html.img({src:imageSrc("enabledSection.png")}), Html.img({src:imageSrc("disabledSection.png")}), "event.participation.autopAccept", "event.participation.autopAccept",{confId:${confId}}).draw().dom));
     $("#inPlaceEditNumMaxParticipants").append(new InputEditWidget('event.participation.setNumMaxParticipants',
-            {confId:${confId}}, ${ jsonEncode(numMaxParticipants) }, 0, false, null, function(value){return IndicoUtil.isInteger(value);}, '${_("The value set is not a positive number")}', '${_("Please insert a positive number or 0 for unlimited")}',
+            {confId:${confId}}, ${ jsonEncode(numMaxParticipants) }, false, null, function(value){return IndicoUtil.isInteger(value);}, '${_("The value set is not a positive number")}', '${_("Please insert a positive number or 0 for unlimited")}',
             null).draw().dom);
 

indico/MaKaC/webinterface/wcomponents.py

@@ -5764 +5764 @@
         vars["title"] = self._title
         if self._onlyMy:
-            vars["noResultsMsg"] = _("You are not the owner of any room.")
+            vars["noResultsMsg"] = _("You are not the owner of any room")
         else :
-            vars["noResultsMsg"] = _("There are no rooms with this search criteria.")
+            vars["noResultsMsg"] = _("There are no rooms with this search criteria")
 
         if self._standalone:

indico/htdocs/js/indico/RoomBooking/RoomBookingCalendar.js

@@ -608 +608 @@
                 this.barsDiv = Html.div({}, this.drawBars("name"));
 
-                if (this.rejectAllLink) {
-                    var rejectAllDiv = Html.div({className:"fakeLink", style:{width:pixels(820), textAlign:"center"}},
-                            $T("Reject ALL Conflicting PRE-Bookings"));
-                    rejectAllDiv.observeClick( function(){
-                        new ConfirmPopup($T("Reject ALL Conflicting PRE-Bookings"),
-                                        Html.div({},$T('Are you sure you want to REJECT ALL conflicting PRE-bookings?')),
-                                        function(value) {
-                                            if(value)
-                                                window.location = self.rejectAllLink;
-                                        }).open();
-                    });
-                }
-                return Html.div({}, header, this.barsDiv, rejectAllDiv);
+                return Html.div({}, header, this.barsDiv);
             },
 
@@ -653 +641 @@
                     })
                     content = Html.div({});
-                    return Html.div({style:{clear:'both', marginTop: pixels(45)}},
+                    var rejectAllDiv = null;
+                    if (this.rejectAllLink) {
+                        rejectAllDiv = Html.div({className:"fakeLink", style:{width:pixels(820), textAlign:"center", paddingBottom:pixels(10)}},
+                                $T("Reject ALL Conflicting PRE-Bookings"));
+                        rejectAllDiv.observeClick( function(){
+                            new ConfirmPopup($T("Reject ALL Conflicting PRE-Bookings"),
+                                            Html.div({},$T('Are you sure you want to REJECT ALL conflicting PRE-bookings?')),
+                                            function(value) {
+                                                if(value)
+                                                    window.location = self.rejectAllLink;
+                                            }).open();
+                        });
+                    }
+                    return Html.div({style:{clear:'both', marginTop: pixels(45)}},rejectAllDiv,
                             Html.div({style:{background:"#F5F5F5", width:pixels(820), textAlign:'center', padding: pixels(10)}},toggleSummary, arrowDown), content);
                 }