Changeset 8050 for branches


Ignore:
Timestamp:
03/20/13 17:53:50 (6 years ago)
Author:
douglas
Message:

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

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  
    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; } 
  • branches/2.5/prototype/modules/calendar/js/helpers.js

    r8048 r8050  
    205205    if(!isMail) 
    206206                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();     
    208215      
    209216    if(typeof(objEvent.id) == 'undefined'){ 
  • branches/2.5/prototype/modules/calendar/templates/event_add.ejs

    r8035 r8050  
    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>  
     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>  
    9796                </p>  
     97  
    9898  
    9999                <fieldset class="hidden"> 
Note: See TracChangeset for help on using the changeset viewer.