Changeset f25f07 in indico for indico/MaKaC/webinterface/tpls/EventModifMainData.tpl

Timestamp:

11/13/09 19:13:41 (4 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

43cd47

Parents:

e6c54a

Message:

[FIXED] Dates - data sent to server in ISO8601

• So that everything remains consistent (we were receiving in ISO8601 and sending in %d/%m/%Y;
• Some things (i.e. collaboration...) still sending %d/%m/%Y (not using ParameterManager?) on server side;
• Added to Data.js some functions to convert between different date formats (show they be moved somewhere else?);
• Started the 'unified widget' for start/end date - still some checks to do;

File:

• indico/MaKaC/webinterface/tpls/EventModifMainData.tpl (modified) (4 diffs)

indico/MaKaC/webinterface/tpls/EventModifMainData.tpl

@@ -1 +1 @@
 <%!
 
+# maybe all of this should be moved to the W* class?
+
+from MaKaC.fossils.conference import IConferenceMinimalFossil
 import MaKaC.webinterface.webFactoryRegistry as webFactoryRegistry
 import MaKaC.webinterface.urlHandlers as urlHandlers
@@ -75 +78 @@
 <tr>
     <td class="dataCaptionTD">
-        <span class="dataCaptionFormat"><%= _("Start date")%></span>
-    </td>
-    <td class="blacktext">
-        <span id="inPlaceEditStartDate"><%=startDate %></span>
-    </td>
-</tr>
-<tr>
-    <td class="dataCaptionTD">
-        <span class="dataCaptionFormat"><%= _("End date")%></span>
-    </td>
-    <td class="blacktext">
-        <span id="inPlaceEditEndDate"><%=endDate %></span>
+        <span class="dataCaptionFormat"><%= _("Start/End date")%></span>
+    </td>
+    <td class="blacktext">
+        <span id="inPlaceEditStartEndDate"><%=startDate %> <strong>to</strong> <%= endDate %></span>
     </td>
 </tr>
@@ -234 +229 @@
 }
 
+var confFossile = <%= jsonEncode(confObj.fossilize(IConferenceMinimalFossil, tz=confObj.getTimezone())) %>;
+
 <%= macros.genericField(macros.FIELD_TEXT, 'inPlaceEditTitle', 'event.main.changeTitle', {'conference': "%s"%conferenceId}, preCache=True, rh=self._rh) %>
 
@@ -250 +247 @@
 <%= macros.genericField(macros.FIELD_SELECT, 'inPlaceEditType', 'event.main.changeType', {'conference': "%s"%conferenceId}, preCache=True, rh=self._rh, options=typeList) %>
 
-<%= macros.genericField(macros.FIELD_DATE, 'inPlaceEditStartDate', 'event.main.changeStartDate', {'conference': "%s"%conferenceId}, preCache=True, rh=self._rh) %>
-
-<%= macros.genericField(macros.FIELD_DATE, 'inPlaceEditEndDate', 'event.main.changeEndDate', {'conference': "%s"%conferenceId}, preCache=True, rh=self._rh) %>
+$E('inPlaceEditStartEndDate').set(new StartEndDateWidget('event.main.changeDates', <%= jsonEncode({'conference': "%s"%conferenceId}) %>, {'startDate': confFossile.startDate, 'endDate': confFossile.endDate}).draw());
 
 <%= macros.genericField(macros.FIELD_RICHTEXT, 'inPlaceEditDescription', 'event.main.changeDescription', {'conference': "%s"%conferenceId}, preCache=True, rh=self._rh, options=(400,200)) %>