Changeset 8044


Ignore:
Timestamp:
03/20/13 16:05:48 (6 years ago)
Author:
angelo
Message:

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

Location:
trunk/prototype/modules/calendar
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/prototype/modules/calendar/css/style.css

    r8031 r8044  
    5151.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} 
    5252.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;} 
    5454 
    5555.new-activity-win fieldset { border: none; margin: 0; padding: 0; } 
  • trunk/prototype/modules/calendar/js/helpers.js

    r8042 r8044  
    201201        objEvent = DataLayer.decode("schedulable:calendar", objEvent ); 
    202202 
    203         var dtstamp = objEvent.dtstamp;  
     203        var dtstamp = objEvent.dtstamp; 
    204204    if(!isMail) 
    205205                objEvent = DataLayer.encode( "schedulable:preview", objEvent ); 
    206         objEvent.creationDate = dateFormat(parseInt(dtstamp),"dd/mm/yyyy");              
     206        if (!dtstamp) 
     207                var date = new Date(); 
     208        else 
     209                var date = new Date(parseInt(dtstamp)); 
     210        objEvent.creationDate = []; 
     211        objEvent.creationDate[0] = dateFormat(parseInt(dtstamp),'dd/mm/yyyy'); 
     212        objEvent.creationDate[1] = date.getHours(); 
     213        objEvent.creationDate[2] = date.getMinutes();    
    207214     
    208215    if(typeof(objEvent.id) == 'undefined'){ 
  • trunk/prototype/modules/calendar/templates/event_add.ejs

    r8031 r8044  
    8686 
    8787                <option value="<%= data.event.calendars[i].id %>" <%= data.event.calendars[i].id == data.event.calendar ? 'selected="selected"':'' %>><%= data.event.calendars[i].name %></option> 
    88  
    8988                <% } %> 
    9089 
     
    9291                        <% } %> 
    9392                        </select> 
    94                 </p> 
    95                 <p class="input-group"> 
    96                         <label class="creation-date-label">Criado em <%= data.event.creationDate %></label> 
    97                 </p> 
     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> 
     96                </p> 
     97 
    9898 
    9999                <fieldset class="hidden"> 
Note: See TracChangeset for help on using the changeset viewer.