← All changes | sh4/conf/html/admin/view/datetime.php +3 -30 4.9.95 → 4.9.66 View file →

		@@ -29,9 +29,9 @@
29	29	$pnames = array(
30	30	'datetime_date_format', 'datetime_time_format', 'datetime_week_starts', 'full_day_count_as',
31	31	'skip_weekdays', 'datetime_timezone',
32	32	'datetime_min_time', 'datetime_max_time', 'datetime_step',
33		- 'datetime_days_in_week', 'datetime_minimalistic_week', 'datetime_hide_schedule_reports', 'datetime_summary_by_calendar', 'datetime_hide_bottom_date_navigation', 'datetime_month_slim_view', 'datetime_compact_shift_label',
	33	+ 'datetime_hide_schedule_reports', 'datetime_hide_bottom_date_navigation', 'datetime_month_slim_view', 'datetime_compact_shift_label',
34	34	'default_schedule_view', 'default_schedule_groupby', 'datetime_n_weeks',
35	35	'pref_csv_separator'
36	36	);
37	37	foreach( $pnames as $pname ){
		@@ -123,9 +123,9 @@
123	123	$values['datetime_max_time'],
124	124	'nolimit'
125	125	);
126	126
127		- $stepOptions = array( 1*60 => 1, 5*60 => 5, 10*60 => 10, 15*60 => 15, 20*60 => 20, 30*60 => 30, 60*60 => 60 );
	127	+ $stepOptions = array( 5*60 => 5, 10*60 => 10, 15*60 => 15, 20*60 => 20, 30*60 => 30, 60*60 => 60 );
128	128	$moreInputs2[] = $this->ui->makeInputSelect(
129	129	'datetime_step',
130	130	'__Time Increment__' . ' (' . '__Minutes__' . ')',
131	131	$stepOptions,
		@@ -172,12 +172,8 @@
172	172	// hide schedule reports
173	173	$hideScheduleReports = $this->ui->makeInputCheckbox( 'datetime_hide_schedule_reports', '__Hide Hours Reports In Schedule View__', 1, $values['datetime_hide_schedule_reports'] );
174	174	$moreInputs[] = $hideScheduleReports;
175	175
176		- // hide schedule reports
177		- $showSummaryByCalendar = $this->ui->makeInputCheckbox( 'datetime_summary_by_calendar', '__If the schedule view is grouped by employee, also show totals by calendar at the bottom__', 1, $values['datetime_summary_by_calendar'] );
178		- $moreInputs[] = $showSummaryByCalendar;
179		-
180	176	// hide bottom date navigation
181	177	$hideBottomDateNavigation = $this->ui->makeInputCheckbox( 'datetime_hide_bottom_date_navigation', '__Hide Bottom Date Navigation In Schedule View__', 1, $values['datetime_hide_bottom_date_navigation'] );
182	178	$moreInputs[] = $hideBottomDateNavigation;
183	179
		@@ -183,33 +179,10 @@
183	179
184	180	// month slim view
185	181	$moreInputs[] = $this->ui->makeInputCheckbox( 'datetime_month_slim_view', '__Slim Month Schedule Grouped View__', 1, $values['datetime_month_slim_view'] );
186	182
187		- $thisValue = $this->settings->get( 'repeat_default_weeks' );
188		- if( $thisValue ){
189		- $thisOptions = range( 2, 20 );
190		- $thisOptions = array_combine( $thisOptions, $thisOptions );
191		- $moreInputs[] = $this->ui->makeInputSelect( 'repeat_default_weeks', '__Initial number of weeks for the repeat shift form__', $thisOptions, $thisValue );
192		- }
193		-
194		- $thisOptions = array( 'abbr' => '__Abbreviation of calendar title__', 'abbr2' => '__Abbreviation of shift time title__', 'none' => '__Space__' );
	183	+ $thisOptions = array( 'abbr' => '__Abbreviation__', 'none' => '__Space__' );
195	184	$moreInputs[] = $this->ui->makeInputSelect( 'datetime_compact_shift_label', '__Shift Label In Compact View__', $thisOptions, $values['datetime_compact_shift_label'] );
196		-
197		- $moreInputs[] = $this->ui->makeInputCheckbox(
198		- 'datetime_minimalistic_week',
199		- '__Minimalistic Shift Widget In Week View__',
200		- 1,
201		- $values['datetime_minimalistic_week']
202		- );
203		-
204		- $thisOptions = range( 2, 21 );
205		- $thisOptions = array_combine( $thisOptions, $thisOptions );
206		- $moreInputs[] = $this->ui->makeInputSelect(
207		- 'datetime_days_in_week',
208		- '__In Month View How Many Days Display In One Row__',
209		- $thisOptions,
210		- $values['datetime_days_in_week']
211		- );
212	185
213	186	// default schedule view
214	187	$moreInputs3 = array();
215	188	// $defaultView = $this->ui->makeInputCheckbox( 'datetime_hide_schedule_reports', '__Hide Hours Reports In Schedule View__', 1, $values['datetime_hide_schedule_reports'] );