extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - Add preference to update calendar view immediately when navigation calendar in sidebox is changed

Browse Source
This commit is contained in:
nathangray 2018-06-05 12:57:01 -06:00
parent 430368eab9
commit 3444126629
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.calendar_hooks.inc.php
View File

@ -362,6 +362,13 @@ class calendar_hooks
'admin' => False, 'admin' => False,
'default' => ['weekN', 'month'], 'default' => ['weekN', 'month'],
), ),
'auto_update_on_sidebox_change' => array(
'type' => 'check',
'label' => 'Update calendar view immediately when navigation calendar in sidebox is changed',
'name' => 'auto_update_on_sidebox_change',
'help' => 'When changing the month',
'default'=> false
),
'link_title' => array( 'link_title' => array(
'type' => 'multiselect', 'type' => 'multiselect',
'label' => 'Link title for events to show', 'label' => 'Link title for events to show',

18
calendar/js/app.js
View File

@ -3353,6 +3353,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
// Dynamic resize of sidebox calendar to fill sidebox // Dynamic resize of sidebox calendar to fill sidebox
var preferred_width = jQuery('#calendar-sidebox_date .ui-datepicker-inline').outerWidth(); var preferred_width = jQuery('#calendar-sidebox_date .ui-datepicker-inline').outerWidth();
var font_ratio = 12 / parseFloat(jQuery('#calendar-sidebox_date .ui-datepicker-inline').css('font-size')); var font_ratio = 12 / parseFloat(jQuery('#calendar-sidebox_date .ui-datepicker-inline').css('font-size'));
var go_button_widget = date_widget.getRoot().getWidgetById('header_go');
var auto_update = this.egw.preference('auto_update_on_sidebox_change', 'calendar') === '1';
var calendar_resize = function() { var calendar_resize = function() {
try { try {
var percent = 1+((jQuery(date_widget.getDOMNode()).width() - preferred_width) / preferred_width); var percent = 1+((jQuery(date_widget.getDOMNode()).width() - preferred_width) / preferred_width);
@ -3361,6 +3363,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
.css('font-size',(percent*100)+'%'); .css('font-size',(percent*100)+'%');
// Position go and today // Position go and today
go_button_widget.set_disabled(false);
var buttons = jQuery('#calendar-sidebox_date .ui-datepicker-header a span'); var buttons = jQuery('#calendar-sidebox_date .ui-datepicker-header a span');
if(today.length && go_button.length) if(today.length && go_button.length)
{ {
@ -3372,6 +3375,10 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
buttons.position({my: 'center', at: 'center', of: go_button}) buttons.position({my: 'center', at: 'center', of: go_button})
.css('left', ''); .css('left', '');
} }
if(auto_update)
{
go_button_widget.set_disabled(true);
}
} catch (e){ } catch (e){
// Resize didn't work // Resize didn't work
} }
@ -3382,16 +3389,19 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
onChangeMonthYear: function(year, month, inst) onChangeMonthYear: function(year, month, inst)
{ {
// Update month button label // Update month button label
var go_button = date_widget.getRoot().getWidgetById('header_go'); if(go_button_widget)
if(go_button)
{ {
var temp_date = new Date(year, month-1, 1,0,0,0); var temp_date = new Date(year, month-1, 1,0,0,0);
//temp_date.setUTCMinutes(temp_date.getUTCMinutes() + temp_date.getTimezoneOffset()); //temp_date.setUTCMinutes(temp_date.getUTCMinutes() + temp_date.getTimezoneOffset());
go_button.btn.attr('title',egw.lang(date('F',temp_date))); go_button_widget.btn.attr('title',egw.lang(date('F',temp_date)));
// Store current _displayed_ date in date button for clicking // Store current _displayed_ date in date button for clicking
temp_date.setUTCMinutes(temp_date.getUTCMinutes() - temp_date.getTimezoneOffset()); temp_date.setUTCMinutes(temp_date.getUTCMinutes() - temp_date.getTimezoneOffset());
go_button.btn.attr('data-date', temp_date.toJSON()); go_button_widget.btn.attr('data-date', temp_date.toJSON());
}
if(auto_update)
{
go_button_widget.click();
} }
window.setTimeout(calendar_resize,0); window.setTimeout(calendar_resize,0);
}, },

1
calendar/lang/egw_de.lang
View File

@ -588,6 +588,7 @@ two weeks calendar de zwei Wochen
type of planner calendar de Planer Typ type of planner calendar de Planer Typ
unable to save calendar de Speichern nicht möglich unable to save calendar de Speichern nicht möglich
uninvited calendar de Ausgeladen uninvited calendar de Ausgeladen
update calendar view immediately when navigation calendar in sidebox is changed calendar de Kalenderansicht sofort aktualisieren, wenn der Navigationskalender in der Sidebox geändert wird.
update timezones common de Zeitzonen aktualisieren update timezones common de Zeitzonen aktualisieren
updated calendar de Aktualisiert updated calendar de Aktualisiert
use end date calendar de Enddatum benutzen use end date calendar de Enddatum benutzen

1
calendar/lang/egw_en.lang
View File

@ -588,6 +588,7 @@ tue calendar en Tue
two weeks calendar en Two weeks two weeks calendar en Two weeks
type of planner calendar en Type of planner type of planner calendar en Type of planner
unable to save calendar en Unable to save unable to save calendar en Unable to save
update calendar view immediately when navigation calendar in sidebox is changed calendar en Update calendar view immediately when navigation calendar in sidebox is changed
update timezones common en Update time zones update timezones common en Update time zones
updated calendar en Updated updated calendar en Updated
use end date calendar en Use end date use end date calendar en Use end date