Changeset 8050 for branches/2.5
- Timestamp:
- 03/20/13 17:53:50 (11 years ago)
- Location:
- branches/2.5/prototype/modules/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.5/prototype/modules/calendar/css/style.css
r8035 r8050 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} 52 52 .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; } 53 .new-event-win .creation-date-label{ white-space: nowrap; }53 .new-event-win .creation-date-label{ white-space: nowrap; float: right;} 54 54 55 55 .new-activity-win fieldset { border: none; margin: 0; padding: 0; } -
branches/2.5/prototype/modules/calendar/js/helpers.js
r8048 r8050 205 205 if(!isMail) 206 206 objEvent = DataLayer.encode( "schedulable:preview", objEvent ); 207 objEvent.creationDate = dateFormat(parseInt(dtstamp),"dd/mm/yyyy"); 207 if (!dtstamp) 208 var date = new Date(); 209 else 210 var date = new Date(parseInt(dtstamp)); 211 objEvent.creationDate = []; 212 objEvent.creationDate[0] = dateFormat(parseInt(dtstamp),'dd/mm/yyyy'); 213 objEvent.creationDate[1] = date.getHours(); 214 objEvent.creationDate[2] = date.getMinutes(); 208 215 209 216 if(typeof(objEvent.id) == 'undefined'){ -
branches/2.5/prototype/modules/calendar/templates/event_add.ejs
r8035 r8050 86 86 87 87 <option value="<%= data.event.calendars[i].id %>" <%= data.event.calendars[i].id == data.event.calendar ? 'selected="selected"':'' %>><%= data.event.calendars[i].name %></option> 88 89 88 <% } %> 90 89 … … 92 91 <% } %> 93 92 </select> 94 </p> 95 <p class="input-group">96 <label class="creation-date-label">Criado em <%= data.event.creationDate %></label>93 <span class="creation-date-label">Evento criado em <%= data.event.creationDate[0] %> às 94 <%= data.event.creationDate[1] %> horas e <%= data.event.creationDate[2] %> minutos. 95 </span> 97 96 </p> 97 98 98 99 99 <fieldset class="hidden">
Note: See TracChangeset
for help on using the changeset viewer.