From 4d9de944691aa0e837a69bedc2ea538be7f75bd9 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Fri, 6 Nov 2015 18:04:39 +0000 Subject: [PATCH] Calendar sidebox: - Resize sidebox calendar to fill the sidebox --- calendar/js/app.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/calendar/js/app.js b/calendar/js/app.js index d6f8db727c..cd7b2285f0 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -106,6 +106,10 @@ app.classes.calendar = AppJS.extend( delete window.top.app.calendar; } jQuery('body').off('.calendar'); + + var date = this.sidebox_et2.getWidgetById('date'); + debugger; + $j(window).off('resize.calendar'+date.dom_id); egw_unregisterGlobalShortcut(jQuery.ui.keyCode.PAGE_UP, false, false, false); egw_unregisterGlobalShortcut(jQuery.ui.keyCode.PAGE_DOWN, false, false, false); @@ -2722,9 +2726,23 @@ app.classes.calendar = AppJS.extend( }); var position_today = function() { var week_col = $j('#calendar-sidebox_date th.ui-datepicker-week-col'); - today_button.position({my: 'left top', at: 'left top', of: week_col,collision:'none'}); + today_button.position({my: 'left top', at: 'left top', of: week_col,collision:'none'}) + .outerHeight(week_col.outerHeight()); }; - window.setTimeout(position_today,0); + + // Dynamic resize to fill sidebox + var preferred_width = $j('#calendar-sidebox_date .ui-datepicker-inline').outerWidth(); + var temp = $j('
').appendTo(today_button); + var font_ratio = parseFloat(temp.css('font-size')) / parseFloat($j('#calendar-sidebox_date .ui-datepicker-inline').css('font-size')); + temp.remove(); + + $j(window).on('resize.calendar'+date.dom_id, function() { + var percent = 1+(($j(date.getDOMNode()).width() - preferred_width) / preferred_width); + percent *= font_ratio; + $j('#calendar-sidebox_date .ui-datepicker-inline').css('font-size',(percent*100)+'%'); + position_today(); + }).trigger('resize'); + } },