Changeset 8021 for branches/2.5

Timestamp:

03/15/13 17:59:28 (11 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:

• js/helpers.js (modified) (3 diffs)
• js/init.js (modified) (1 diff)
• templates/preferences_calendar.ejs (modified) (2 diffs)

branches/2.5/prototype/modules/calendar/js/helpers.js

@@ -156 +156 @@
 function printEvents(){
         //var html = DataLayer.render( path + 'templates/attendee_permissions.ejs', {} );
-        var print = $('.fc-header-right').find('.fc-button.fc-button-agendaDay').clone();
+        var print = $('.fc-header-right').find('.fc-button.fc-button-year').clone();
 
         $('.fc-header-right').find('.fc-button-year').toggleClass('fc-corner-right');
         print.addClass('fc-corner-right');
         print.addClass('fc-button-print');
-        print.removeClass('fc-button-agendaDay');
+        print.removeClass('fc-button-year');
         print.removeClass('fc-corner-left');
+        print.removeClass('fc-state-active'); 
         print.find('.fc-button-content').html('Imprimir');
         $('.fc-header-right').append(print);
@@ -2425 +2426 @@
             $(this).addClass('fc-state-hover');
         },
+ 
         function(){
             $(this).removeClass('fc-state-hover');
@@ -2490 +2492 @@
     $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-today').remove();
     $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-basicWeek').remove();
-    $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-basicDay').remove();                      
+    $(currentView+' .events-list.events-list-win.active .fc-header .fc-button-basicDay').removeClass("fc-button-basicDay").addClass('fc-button-agendaDay');                     
                 
     //Adiciona e remove as classes para esta visualizacao

branches/2.5/prototype/modules/calendar/js/init.js

@@ -319 +319 @@
 
                 header: {
-                        left: 'prev,next today,agendaWeek,agendaDay',
+                        left: 'prev,next today,agendaWeek,' + ((User.preferences.defaultCalView == "basicDay") ? "basicDay" : "agendaDay"),
                         center: 'title',
-                        right: 'agendaDay,agendaWeek,month,year'
+                        right:  ((User.preferences.defaultCalView == "basicDay") ? "basicDay" : "agendaDay") +',agendaWeek,month,year'
                 },
                 firstHour: dateCalendar.getShortestTime(User.preferences.defaultStartHour ? User.preferences.defaultStartHour : '6'),

branches/2.5/prototype/modules/calendar/templates/preferences_calendar.ejs

@@ -36 +36 @@
                                 <label for="defaultCalView">Visualização padrão do calendário:</label>
                                 <select name="defaultCalView" >
-                                        <option value="basicDay" <%= data.preferences.defaultCalView =='basicDay' ? 'selected="selected"':'' %>>Diária</option>
+                                        <option value="agendaDay" <%= data.preferences.defaultCalView =='agendaDay' ? 'selected="selected"':'' %>>Diária com horário</option> 
+                                        <option value="basicDay" <%= data.preferences.defaultCalView =='basicDay' ? 'selected="selected"':'' %>>Diária sem horário</option> 
                                         <option value="agendaWeek" <%= data.preferences.defaultCalView =='agendaWeek' ? 'selected="selected"':'' %>>Semanal</option>
                                         <option value="month" <%= data.preferences.defaultCalView =='month' ? 'selected="selected"':'' %>>Mensal</option>
@@ -42 +43 @@
                                 </select>
                         </p>
-                        
                         <p class="input-group">
                                 <label for="weekStart">Primeiro dia da Semana:</label>