Changeset 8044 for trunk

Timestamp:

03/20/13 16:05:48 (11 years ago)

Author:

angelo

Message:

Ticket #3398 - Melhoria na exibicao de dados dos eventos criados na agenda

Location:

trunk/prototype/modules/calendar

Files:

• css/style.css (modified) (1 diff)
• js/helpers.js (modified) (1 diff)
• templates/event_add.ejs (modified) (2 diffs)

trunk/prototype/modules/calendar/css/style.css

@@ -51 +51 @@
 .new-event-win fieldset#calendar_addevent_details5 .button-files-upload, .new-task-win fieldset#calendar_addevent_details5 .button-files-upload{margin: 15px 0 0 0}
 .new-event-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset, .new-task-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset { padding: 5px 0; }
-.new-event-win .creation-date-label{ white-space: nowrap; }
+.new-event-win .creation-date-label{ white-space: nowrap; float: right;}
 
 .new-activity-win fieldset { border: none; margin: 0; padding: 0; }

trunk/prototype/modules/calendar/js/helpers.js

@@ -201 +201 @@
         objEvent = DataLayer.decode("schedulable:calendar", objEvent );
 
-        var dtstamp = objEvent.dtstamp; 
+        var dtstamp = objEvent.dtstamp;
     if(!isMail)
                 objEvent = DataLayer.encode( "schedulable:preview", objEvent );
-        objEvent.creationDate = dateFormat(parseInt(dtstamp),"dd/mm/yyyy");             
+        if (!dtstamp)
+                var date = new Date();
+        else
+                var date = new Date(parseInt(dtstamp));
+        objEvent.creationDate = [];
+        objEvent.creationDate[0] = dateFormat(parseInt(dtstamp),'dd/mm/yyyy');
+        objEvent.creationDate[1] = date.getHours();
+        objEvent.creationDate[2] = date.getMinutes();   
     
     if(typeof(objEvent.id) == 'undefined'){

trunk/prototype/modules/calendar/templates/event_add.ejs

@@ -86 +86 @@
 
                 <option value="<%= data.event.calendars[i].id %>" <%= data.event.calendars[i].id == data.event.calendar ? 'selected="selected"':'' %>><%= data.event.calendars[i].name %></option>
-
                 <% } %>
 
@@ -92 +91 @@
                         <% } %>
                         </select>
-                </p>
-                <p class="input-group">
-                        <label class="creation-date-label">Criado em <%= data.event.creationDate %></label>
-                </p>
+                                <span class="creation-date-label">Evento criado em <%= data.event.creationDate[0] %> às
+                                        <%= data.event.creationDate[1] %> horas e <%= data.event.creationDate[2] %> minutos.
+                                </span>
+                </p>
+
 
                 <fieldset class="hidden">