Changeset 0682b3 in indico

Timestamp:

02/11/11 16:11:16 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

1ab5eb

Parents:

33f434

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (02/10/11 10:32:03)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/11/11 16:11:16)

Message:

[IMP] Display timezone in edit session dialog

Location:

indico

Files:

• MaKaC/fossils/conference.py (modified) (1 diff)
• htdocs/js/indico/Legacy/Dialogs.js (modified) (1 diff)
• htdocs/js/indico/Legacy/Widgets.js (modified) (2 diffs)

indico/MaKaC/fossils/conference.py

@@ -67 +67 @@
         """ End Date """
     getEndDate.convert = Conversion.datetime
+
+    def getTimezone(self):
+        """ Time zone """
 
     def getSupportEmail(self):

indico/htdocs/js/indico/Legacy/Dialogs.js

@@ -445 +445 @@
                            });
 
-                           var startEndTimeField = IndicoUI.Widgets.Generic.dateStartEndTimeField(info.get('startDateTime').substr(11,5), info.get('endDateTime').substr(11,5));
+                           var timezoneMsg = ' (' + $T('Timezone') + ': ' + params.conference.timezone + ')';
+                           var startEndTimeField = IndicoUI.Widgets.Generic.dateStartEndTimeField(info.get('startDateTime').substr(11,5), info.get('endDateTime').substr(11,5), timezoneMsg);
                            var startEndTimeComponent;
                            var timeTranslation = {

indico/htdocs/js/indico/Legacy/Widgets.js

@@ -1013 +1013 @@
         },
 
-        dateStartEndTimeField: function(defaultStartTime, defaultEndTime) {
+        dateStartEndTimeField: function(defaultStartTime, defaultEndTime, additional) {
 
             var obj = new WatchObject();
@@ -1033 +1033 @@
             var element = Widget.block([
                 $B(startTimeField, obj.accessor('startTime')), dash,
-                $B(endTimeField, obj.accessor('endTime'))
+                $B(endTimeField, obj.accessor('endTime')),
+                additional || ''
             ]);