Changeset 4550 for branches/2.2.0.1
- Timestamp:
- 05/31/11 13:52:33 (13 years ago)
- Location:
- branches/2.2.0.1/calendar
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
r4549 r4550 5163 5163 ) 5164 5164 ); 5165 5165 $this->bo->read_holidays($params['year']); 5166 5166 $next = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day + 7,$this->bo->year); 5167 5167 $prev = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day - 7,$this->bo->year); … … 5186 5186 'new_week' => $tpl, 5187 5187 ); 5188 5188 $feriados_do_ano = Array(); 5189 foreach ($this->bo->cached_holidays as $key => $value) 5190 { 5191 $feriados_do_ano[$key] = utf8_encode($this->bo->cached_holidays[$key][0]['name']); 5192 } 5189 5193 $p->set_file($templates); 5190 5194 $p->set_block('new_week','day','day'); … … 5200 5204 $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)); 5201 5205 $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null'); 5206 $p->set_var('holidays_json',json_encode($feriados_do_ano)?json_encode($feriados_do_ano):null); 5202 5207 return $p->fp('out','day'); 5203 5208 … … 5208 5213 $p = CreateObject('phpgwapi.Template',$this->template_dir); 5209 5214 $p->set_unknowns('keep'); 5210 5211 5215 $tpl = 'new_month.tpl'; 5212 5216 … … 5255 5259 ) 5256 5260 ); 5257 5261 $this->bo->read_holidays($params['year']); 5258 5262 $print = '<a href="javascript:void(0)" id="printFriendly">['.lang('Printer Friendly').']</a>'; 5259 5263 … … 5275 5279 } 5276 5280 5281 $feriados_do_ano = Array(); 5282 foreach ($this->bo->cached_holidays as $key => $value) 5283 { 5284 $feriados_do_ano[$key] = utf8_encode($this->bo->cached_holidays[$key][0]['name']); 5285 } 5277 5286 $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year); 5278 5287 $p->set_file($templates); … … 5291 5300 $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)); 5292 5301 $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null'); 5302 $p->set_var('holidays_json',json_encode($feriados_do_ano)?json_encode($feriados_do_ano):null); 5293 5303 return $p->fp('out','day'); 5294 5304 } -
branches/2.2.0.1/calendar/js/dhtmlx/codebase/dhtmlxscheduler.css
r4001 r4550 11 11 12 12 } 13 14 .dhx_holiday .dhx_month_head{background-color:#c68686;} 15 .dhx_holiday .dhx_month_body{background-color:#dab0b0;} 16 17 .dhx_now_holiday .dhx_month_head{background-color:#c68686;} 18 .dhx_now_holiday .dhx_month_body{background-color:#E2EDFF;} 19 -
branches/2.2.0.1/calendar/js/dhtmlx/sources/ext/ext_new_week.js
r4098 r4550 120 120 html+="<td"; 121 121 var cls = ""; 122 var clstitle = ""; 122 123 if (sd.valueOf()==cd.valueOf()) 123 124 cls='dhx_now'; 125 var aaaa = sd.getFullYear(); 126 var mm = sd.getMonth()+1; 127 var dd = sd.getDate(); 128 aaaa = aaaa.toString(); 129 mm = mm.toString(); 130 dd = dd.toString(); 131 if(mm.length < 2) mm = '0' + mm; 132 if(dd.length < 2) dd = '0' + dd; 133 var aaaammdd = aaaa + mm + dd; 134 if (holidayTab[aaaammdd]) 135 { 136 cls = 'dhx_holiday'; 137 clstitle = holidayTab[aaaammdd]; 138 } 139 140 if (sd.valueOf()==cd.valueOf() && holidayTab[aaaammdd]) 141 { 142 cls = 'dhx_now_holiday'; 143 clstitle = holidayTab[aaaammdd]; 144 } 145 124 146 html+=" class='"+cls+" "+this.templates.month_date_class(sd,cd)+"' "; 125 html+="><div class='dhx_month_head' >"+this.templates.week_scale_date(sd)+"</div><div class='dhx_month_body' "+tdcss[j]+"></div></td>"147 html+="><div class='dhx_month_head' title='" + clstitle + "'> "+this.templates.week_scale_date(sd)+"</div><div class='dhx_month_body' "+tdcss[j]+"></div></td>" 126 148 sd=this.date.add(sd,1,"day"); 127 149 if(i==3) -
branches/2.2.0.1/calendar/templates/default/new_month.tpl
r4125 r4550 5 5 <script src="calendar/js/dhtmlx/sources/ext/ext_pdf.js"></script> 6 6 <script src="calendar/js/dhtmlx/sources/locale_pt.js"></script> 7 <script src="calendar/js/dhtmlx/sources/ext/ext_new_month.js"></script> 7 8 <script> 8 9 … … 68 69 69 70 <script> 70 71 var holidayTab = {holidays_json}; 71 72 function printMode(printType) 72 73 { … … 150 151 scheduler.parse({events_json},"json"); 151 152 153 154 152 155 } 153 156 -
branches/2.2.0.1/calendar/templates/default/new_week.tpl
r4125 r4550 7 7 <script src="calendar/js/dhtmlx/sources/ext/ext_new_week.js"></script> 8 8 <script> 9 9 var holidayTab = {holidays_json}; 10 10 resize = function(){ 11 11
Note: See TracChangeset
for help on using the changeset viewer.