extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sidebox calendar changes

Browse Source 
- Fix month button only worked once.
This commit is contained in:
Nathan Gray 2015-12-02 15:36:11 +00:00
parent b9c1ed72ce
commit a71ab3b066
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/js/app.js
View File

@ -2747,9 +2747,13 @@ app.classes.calendar = AppJS.extend(
var month_button = date_widget.getRoot().getWidgetById('header_month'); var month_button = date_widget.getRoot().getWidgetById('header_month');
if(month_button) if(month_button)
{ {
var temp_date = new Date(year, month-1, 1); 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());
month_button.set_label(egw.lang(date('F',temp_date))); month_button.set_label(egw.lang(date('F',temp_date)));
// Store current _displayed_ date in date button for clicking
temp_date.setUTCMinutes(temp_date.getUTCMinutes() - temp_date.getTimezoneOffset());
month_button.btn.attr('data-date', temp_date.toJSON());
} }
}, },
// Mark holidays // Mark holidays

2
calendar/templates/default/sidebox.xet
View File

@ -43,7 +43,7 @@ Egroupware
<buttononly id="header_today" label="Today" onclick="var tempDate = new Date(); <buttononly id="header_today" label="Today" onclick="var tempDate = new Date();
var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0); var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0);
app.calendar.update_state({date: today.toJSON()});return false;"/> app.calendar.update_state({date: today.toJSON()});return false;"/>
<buttononly id="header_month" label="Month" onclick="app.calendar.update_state({view:'month'});" /> <buttononly id="header_month" label="Month" onclick="app.calendar.update_state({date: widget.btn.data('date'), view:'month'});" />
</hbox> </hbox>
<date id="date" class="et2_fullWidth" inline="true" onchange="var view_change = app.calendar.sidebox_changes_views.indexOf(app.calendar.state.view); <date id="date" class="et2_fullWidth" inline="true" onchange="var view_change = app.calendar.sidebox_changes_views.indexOf(app.calendar.state.view);
var update = {date:widget.getValue()}; var update = {date:widget.getValue()};