Changeset 8021 for branches


Ignore:
Timestamp:
03/15/13 17:59:28 (6 years ago)
Author:
douglas
Message:

Ticket #3392 - Preferencia para que a visualizacao diaria fique sem as horas

Location:
branches/2.5/prototype/modules/calendar
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/prototype/modules/calendar/js/helpers.js

    r7994 r8021  
    156156function printEvents(){ 
    157157        //var html = DataLayer.render( path + 'templates/attendee_permissions.ejs', {} ); 
    158         var print = $('.fc-header-right').find('.fc-button.fc-button-agendaDay').clone(); 
     158        var print = $('.fc-header-right').find('.fc-button.fc-button-year').clone(); 
    159159 
    160160        $('.fc-header-right').find('.fc-button-year').toggleClass('fc-corner-right'); 
    161161        print.addClass('fc-corner-right'); 
    162162        print.addClass('fc-button-print'); 
    163         print.removeClass('fc-button-agendaDay'); 
     163        print.removeClass('fc-button-year'); 
    164164        print.removeClass('fc-corner-left'); 
     165        print.removeClass('fc-state-active');  
    165166        print.find('.fc-button-content').html('Imprimir'); 
    166167        $('.fc-header-right').append(print); 
     
    24252426            $(this).addClass('fc-state-hover'); 
    24262427        }, 
     2428  
    24272429        function(){ 
    24282430            $(this).removeClass('fc-state-hover'); 
     
    24902492    $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-today').remove(); 
    24912493    $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-basicWeek').remove(); 
    2492     $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-basicDay').remove();                       
     2494    $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-basicDay').removeClass("fc-button-basicDay").addClass('fc-button-agendaDay');                      
    24932495                 
    24942496    //Adiciona e remove as classes para esta visualizacao 
  • branches/2.5/prototype/modules/calendar/js/init.js

    r8006 r8021  
    319319 
    320320                header: { 
    321                         left: 'prev,next today,agendaWeek,agendaDay', 
     321                        left: 'prev,next today,agendaWeek,' + ((User.preferences.defaultCalView == "basicDay") ? "basicDay" : "agendaDay"), 
    322322                        center: 'title', 
    323                         right: 'agendaDay,agendaWeek,month,year' 
     323                        right:  ((User.preferences.defaultCalView == "basicDay") ? "basicDay" : "agendaDay") +',agendaWeek,month,year' 
    324324                }, 
    325325                firstHour: dateCalendar.getShortestTime(User.preferences.defaultStartHour ? User.preferences.defaultStartHour : '6'), 
  • branches/2.5/prototype/modules/calendar/templates/preferences_calendar.ejs

    r7982 r8021  
    3636                                <label for="defaultCalView">Visualização padrão do calendário:</label> 
    3737                                <select name="defaultCalView" > 
    38                                         <option value="basicDay" <%= data.preferences.defaultCalView =='basicDay' ? 'selected="selected"':'' %>>Diária</option> 
     38                                        <option value="agendaDay" <%= data.preferences.defaultCalView =='agendaDay' ? 'selected="selected"':'' %>>Diária com horário</option>  
     39                                        <option value="basicDay" <%= data.preferences.defaultCalView =='basicDay' ? 'selected="selected"':'' %>>Diária sem horário</option>  
    3940                                        <option value="agendaWeek" <%= data.preferences.defaultCalView =='agendaWeek' ? 'selected="selected"':'' %>>Semanal</option> 
    4041                                        <option value="month" <%= data.preferences.defaultCalView =='month' ? 'selected="selected"':'' %>>Mensal</option> 
     
    4243                                </select> 
    4344                        </p> 
    44                          
    4545                        <p class="input-group"> 
    4646                                <label for="weekStart">Primeiro dia da Semana:</label> 
Note: See TracChangeset for help on using the changeset viewer.