Changeset 4010 for branches/2.2.0.1/calendar/inc
- Timestamp:
- 04/13/11 15:39:20 (13 years ago)
- Location:
- branches/2.2.0.1/calendar/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
r4008 r4010 4934 4934 $p->set_block('day_cal','day','day'); 4935 4935 $p->set_block('new_component_tpl','new_component','new_component'); 4936 $params['period'] = 3;4936 $params['period'] = 1; 4937 4937 $result_events_json = $this->print_events_to_show_json($params); 4938 4938 $p->set_var('date',$result_events_json['date_events_json']); 4939 4939 $p->set_var('hora_final',$result_events_json['hora_final']); 4940 4940 $p->set_var('hora_inicial',$result_events_json['hora_inicial']); 4941 $p->set_var('hour_size_px',$result_events_json['hour_size_px']) ;4941 $p->set_var('hour_size_px',$result_events_json['hour_size_px']) ; 4942 4942 4943 4943 $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null'); … … 5025 5025 $hora_final = $account_prefs['calendar']['workdayends']; //18; 5026 5026 5027 $hour_size_px = $account_prefs['calendar']['interval'] ? $account_prefs['calendar']['interval'] : 42 ;5027 $hour_size_px = $account_prefs['calendar']['interval'] ? $account_prefs['calendar']['interval'] : 42 ; 5028 5028 5029 5029 $events_to_show_json = array(); … … 5135 5135 'hora_final' => $hora_final, 5136 5136 'hour_size_px' => $hour_size_px, 5137 'date_events_json' => $date_events_json ,5137 'date_events_json' => $date_events_json , 5138 5138 'events_to_show_json' => $events_to_show_json 5139 5139 ); -
branches/2.2.0.1/calendar/inc/hook_settings.inc.php
r4006 r4010 125 125 'This defines the end of your dayview. Events after this time, are shown below the dayview.'); 126 126 $intervals = array( 127 5 => '5', 128 10 => '10', 129 15 => '15', 130 20 => '20', 131 30 => '30', 132 45 => '45', 133 60 => '60' 127 84 => '15 ' . lang('minutes'), 128 42 => '30 ' . lang('minutes') 134 129 ); 135 130 create_select_box('Intervals in day view','interval',$intervals,
Note: See TracChangeset
for help on using the changeset viewer.