Changeset 7022
- Timestamp:
- 08/15/12 12:07:23 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 3 added
- 1 deleted
- 12 edited
-
css/calendar_print.css (deleted)
-
css/print.css (modified) (6 diffs)
-
img/big-activity.png (added)
-
img/mini-activity.png (added)
-
img/mini-event.png (modified) (previous)
-
img/mini-task.png (modified) (previous)
-
img/navbar.png (added)
-
js/calendar.codecs.js (modified) (4 diffs)
-
js/helpers.js (modified) (7 diffs)
-
js/init.js (modified) (1 diff)
-
templates/calendar_day_print.ejs (modified) (2 diffs)
-
templates/calendar_list_print.ejs (modified) (1 diff)
-
templates/calendar_month_print.ejs (modified) (1 diff)
-
templates/calendar_week_print.ejs (modified) (3 diffs)
-
templates/calendar_year_print.ejs (modified) (1 diff)
-
templates/event_list.ejs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/css/print.css
r6996 r7022 1 body { 2 font: 12px arial; 3 } 4 1 5 .title_print { 2 6 font: 20px arial; … … 58 62 body.detail{ 59 63 margin-top: 30px; 64 margin-left:10px; 60 65 } 61 66 .details-event-list { … … 71 76 .week .event-on-day{ 72 77 font: 10px arial; 73 margin: 5px 0;74 78 word-wrap: break-word; 75 79 } … … 77 81 min-width: 600px; 78 82 min-height: 400px; 79 text-align: center;80 83 float: left; 81 84 } 82 .week .name-month {83 font: 20px arial;84 color: #8EB2FF;85 margin: 0 0 15px 0;86 }87 .week .name-month img {88 margin: 3px 0 0 0;89 width: 20px;90 height: 20px;91 }92 85 .week span { 93 font: 14px arial;94 86 display: block; 95 87 } … … 106 98 .week .all-day-line{ 107 99 border: 0; 100 text-align:center; 101 } 102 .day-name{ 103 text-align:center; 108 104 } 109 105 .week .event-all-day{ 110 margin: 3px 0;111 106 font: 10px arial; 107 margin-left: 3px; 108 } 109 .week .event-on-day{ 110 font: 10px arial; 111 margin-left: 3px; 112 } 113 .week .event-all-day img{ 114 margin-right: 3px; 115 } 116 .week .event-on-day img{ 117 margin-right: 3px; 112 118 } 113 119 .week .all-day-line .write{ 114 margin: -3px 0 0 0;120 margin: 1px 0 0 0; 115 121 font-weight: bold; 116 122 border-left: 1px solid; … … 131 137 text-align: center 132 138 } 139 .header-paginator{ 140 margin-top: 0px; 141 } -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r7008 r7022 132 132 return returns; 133 133 }; 134 135 134 var res = $.map(evtObj, function( objEvent ){ 136 135 return { … … 1502 1501 1503 1502 for(var i = 0; i < evtObj.length; i++){ 1504 res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ? 'preview' : 'task'), evtObj[i]));1503 res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ? 'preview' : ( !!evtObj[i].taskToActivity ? 'activity': 'task')) , evtObj[i])); 1505 1504 } 1506 1505 … … 1517 1516 1518 1517 for (var i=0; i < res.length; i++) { 1518 res[i].type = (res[i].type == '2' && !!res[i].tasks) ? '3' : res[i].type; 1519 1519 1520 var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat ); 1520 1521 var endDate = Date.parseExact( res[i]['endDate'], User.preferences.dateFormat ); … … 1559 1560 var next = start; 1560 1561 var response = []; 1561 1562 1562 while (next){ 1563 1563 var index = dateCalendar.dayNames[new Date(next).getDay()] +' '+ new Date(next).toString('dd/MM'); -
trunk/prototype/modules/calendar/js/helpers.js
r7017 r7022 102 102 103 103 function printNow(){ 104 104 if($("#calendar").fullCalendar('getView').name == "agendaWeek" || $("#calendar").fullCalendar('getView').name == "basicWeek" || $("#calendar").fullCalendar('getView').name == "year") 105 alert('A tela de impressão será melhor visualizada com a preferência "Paisagem" do seu browser selecionada.'); 106 105 107 var window_print = window.open('','ExpressoCalendar','width=800,height=600,scrollbars=yes'); 106 108 window_print.document.open(); … … 118 120 } )); 119 121 } 120 if($("#calendar").fullCalendar('getView').name == "agendaDay" ){122 if($("#calendar").fullCalendar('getView').name == "agendaDay" || $("#calendar").fullCalendar('getView').name == "basicDay"){ 121 123 window_print.document.write(DataLayer.render('templates/calendar_day_print.ejs', { 122 124 'InfoPage' : $("#calendar").fullCalendar('getView').title, … … 124 126 } )); 125 127 } 126 if($("#calendar").fullCalendar('getView').name == "agendaWeek" ){128 if($("#calendar").fullCalendar('getView').name == "agendaWeek" || $("#calendar").fullCalendar('getView').name == "basicWeek"){ 127 129 window_print.document.write(DataLayer.render('templates/calendar_week_print.ejs', { 128 130 'InfoPage' : $("#calendar").fullCalendar('getView').title, … … 149 151 } 150 152 window_print.document.close(); 151 setTimeout(window_print.print(), 300);153 window_print.print(); 152 154 } 153 155 … … 164 166 $('.fc-header-right').append(print); 165 167 $('.fc-button-print').click(function(){ 166 alert('A tela de impressão será melhor visualizada com a preferência "Paisagem" do seu browser selecionada.');167 168 printNow(); 168 169 }); … … 2419 2420 listEvents.find('.fc-button').remove(); 2420 2421 listEvents.find('.details-event-list').remove(); 2421 listEvents.find('.list-events-paginator'). attr( "align" , "center");2422 listEvents.find('.list-events-paginator').remove(); 2422 2423 listEvents = listEvents.html(); 2423 2424 type = $(this).parents('.ui-tabs-panel').attr("id").split("_")[1]; 2425 2424 2426 var data = { 2425 2427 type : type == "tasks" ? "task-list" : ( type == "events" ? "event-list" : "search"), 2426 html : listEvents 2428 html : listEvents, 2429 InfoPage : $(this).parents('table.header-paginator').find( '.fc-header-title' ).text() 2427 2430 } 2428 2431 window_print.document.open(); … … 2618 2621 var html = $(this).parents("td:first").clone(); 2619 2622 html.find(".menu-container.footer-container").remove(); 2623 html.find(".fc-header-title").remove(); 2620 2624 var html = html.html(); 2621 2625 var data = { 2622 2626 type : $(this).parents('.details-event-list').hasClass("details-event") ? "event-detail" : "task-detail", 2623 html : html 2627 html : html, 2628 InfoPage : 'Detalhes: '+$(this).parents('tr.start-date').find('td span a').text() 2624 2629 } 2625 2630 window_print.document.open(); -
trunk/prototype/modules/calendar/js/init.js
r7006 r7022 358 358 img_icon = "mini-task.png"; 359 359 if(event.type == 3) 360 img_icon = " activity_icon.jpg";360 img_icon = "mini-activity.png"; 361 361 362 362 -
trunk/prototype/modules/calendar/templates/calendar_day_print.ejs
r6996 r7022 22 22 var title_type = ""; 23 23 if(data.days.events[0][jj].events[ii].type == '1'){ 24 img_type = "../prototype/modules/calendar/img/ event.png";24 img_type = "../prototype/modules/calendar/img/mini-event.png"; 25 25 title_type = "Evento"; 26 26 }if(data.days.events[0][jj].events[ii].type == '2'){ 27 img_type = "../prototype/modules/calendar/img/ task.png";27 img_type = "../prototype/modules/calendar/img/mini-task.png"; 28 28 title_type = "Tarefa"; 29 29 }if(data.days.events[0][jj].events[ii].type == '3'){ 30 img_type = "../prototype/modules/calendar/img/ activity_icon.jpg";30 img_type = "../prototype/modules/calendar/img/mini-activity.png"; 31 31 title_type = "Atividade"; 32 32 } … … 52 52 title_type = "Tarefa"; 53 53 }if(data.days.events[0][jj].events[ii].type == '3'){ 54 img_type = "../prototype/modules/calendar/img/ activity_icon.jpg";54 img_type = "../prototype/modules/calendar/img/mini-activity.png"; 55 55 title_type = "Atividade"; 56 56 } -
trunk/prototype/modules/calendar/templates/calendar_list_print.ejs
r6996 r7022 37 37 </head> 38 38 <body class="<%= valid.class %>"> 39 <div class="title_print"> <img src="../prototype/modules/calendar/img/navbar.png"> <%= data.InfoPage %> </div> 39 40 <%= data.html %> 40 41 </body> -
trunk/prototype/modules/calendar/templates/calendar_month_print.ejs
r6996 r7022 35 35 title_type = "Tarefa"; 36 36 }if(data.days.events[i][jj].events[ii].type == '3'){ 37 img_type = "../prototype/modules/calendar/img/ activity_icon.jpg";37 img_type = "../prototype/modules/calendar/img/mini-activity.png"; 38 38 title_type = "Atividade"; 39 39 } -
trunk/prototype/modules/calendar/templates/calendar_week_print.ejs
r6996 r7022 8 8 9 9 <div class="week"> 10 <div class=" name-month"> <img src="../prototype/modules/calendar/img/navbar.png"> <%= data.InfoPage %></div>10 <div class="title_print"> <img src="../prototype/modules/calendar/img/navbar.png"> <%= data.InfoPage %></div> 11 11 <% if(data.days){ 12 12 delete data.days.events[7]; %> … … 36 36 if(data.days.events[i][eachInd].events){ 37 37 for(var ii=0; ii<data.days.events[i][eachInd].events.length; ii++){ 38 var img_type = ""; 39 var title_type = ""; 40 if(data.days.events[i][eachInd].events[ii].type == '1'){ 41 img_type = "../prototype/modules/calendar/img/mini-event.png"; 42 title_type = "Evento"; 43 }if(data.days.events[i][eachInd].events[ii].type == '2'){ 44 img_type = "../prototype/modules/calendar/img/mini-task.png"; 45 title_type = "Tarefa"; 46 }if(data.days.events[i][eachInd].events[ii].type == '3'){ 47 img_type = "../prototype/modules/calendar/img/mini-activity.png"; 48 title_type = "Atividade"; 49 } 38 50 if(data.days.events[i][eachInd].events[ii].allDay == true){ 39 51 aux = true; 40 52 %> 41 53 <!-- Aqui dia todo --> 42 <div class="event-all-day"> <%= data.days.events[i][eachInd].events[ii].summary %></div>54 <div class="event-all-day"><img title="<%= title_type %>" src="<%= img_type %>"><%= data.days.events[i][eachInd].events[ii].summary %></div> 43 55 <% 44 56 } … … 57 69 <% 58 70 59 if(data.days.events[i][eachInd].events){ 60 for(var ii=0; ii<data.days.events[i][eachInd].events.length; ii++){ 61 62 if(data.days.events[i][eachInd].events[ii].allDay == false){ 63 var startHour = data.days.events[i][eachInd].events[ii].startHour; 64 var endHour = data.days.events[i][eachInd].events[ii].endHour; 71 if(data.days.events[i][eachInd].events){ 72 for(var ii=0; ii<data.days.events[i][eachInd].events.length; ii++){ 73 74 var img_type = ""; 75 var title_type = ""; 76 if(data.days.events[i][eachInd].events[ii].type == '1'){ 77 img_type = "../prototype/modules/calendar/img/mini-event.png"; 78 title_type = "Evento"; 79 }if(data.days.events[i][eachInd].events[ii].type == '2'){ 80 img_type = "../prototype/modules/calendar/img/mini-task.png"; 81 title_type = "Tarefa"; 82 }if(data.days.events[i][eachInd].events[ii].type == '3'){ 83 img_type = "../prototype/modules/calendar/img/mini-activity.png"; 84 title_type = "Atividade"; 85 } 86 87 if(data.days.events[i][eachInd].events[ii].allDay == false){ 88 var startHour = data.days.events[i][eachInd].events[ii].startHour; 89 var endHour = data.days.events[i][eachInd].events[ii].endHour; 65 90 %> 66 <!-- Aqui o restante -->91 <!-- Aqui o restante --> 67 92 68 <div class="event-on-day"><%= data.days.events[i][eachInd].events[ii].summary %> | <%= startHour %> - <%= endHour %></div>93 <div class="event-on-day"><img title="<%= title_type %>" src="<%= img_type %>"><%= startHour %> - <%= endHour %> | <%= data.days.events[i][eachInd].events[ii].summary %></div> 69 94 <% 70 }71 95 } 72 96 } 97 } 73 98 %> 74 99 </div> -
trunk/prototype/modules/calendar/templates/calendar_year_print.ejs
r6996 r7022 8 8 <body> 9 9 <div class="year_print"> 10 <div class=" year_print_header"><h2><%= data.header %></h2></div>10 <div class="title_print"><img src="../prototype/modules/calendar/img/navbar.png"> <%= data.header %></div> 11 11 <div class="year_print_content"> 12 12 <%= data.html %> -
trunk/prototype/modules/calendar/templates/event_list.ejs
r6996 r7022 59 59 title_type = "Tarefa"; 60 60 }if(_event.type == '3'){ 61 img_type = "../prototype/modules/calendar/img/ activity_icon.jpg";61 img_type = "../prototype/modules/calendar/img/big-activity.png"; 62 62 title_type = "Atividade"; 63 63 }
Note: See TracChangeset
for help on using the changeset viewer.
