holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move today button between prev & next buttons

Browse Source
This commit is contained in:
Nathan Gray 2016-01-22 20:48:30 +00:00
parent 1804a84062
commit 52dd6cd644
5 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/js/app.js
View File

@ -3177,7 +3177,19 @@ app.classes.calendar = AppJS.extend(
$j(window).on('resize.calendar'+date.dom_id, function() { $j(window).on('resize.calendar'+date.dom_id, function() {
var percent = 1+(($j(date_widget.getDOMNode()).width() - preferred_width) / preferred_width); var percent = 1+(($j(date_widget.getDOMNode()).width() - preferred_width) / preferred_width);
percent *= font_ratio; percent *= font_ratio;
$j('#calendar-sidebox_date .ui-datepicker-inline').css('font-size',(percent*100)+'%'); $j('#calendar-sidebox_date .ui-datepicker-inline,#calendar-sidebox_header_today')
.css('font-size',(percent*100)+'%');
// Position today
var buttons = $j('#calendar-sidebox_date .ui-datepicker-header a');
var left = Infinity;
var total = 0;
buttons.each(function() {
total += $j(this).position().left;
});
// Why doesn't this work properly?
var today = $j('#calendar-sidebox_header_today')
.position({my: 'center left', at: 'center right',of: buttons});
today.css('left',(total/buttons.length)/*+(today.width()/2)*/)
}).trigger('resize'); }).trigger('resize');
} }

13
calendar/templates/default/app.css
View File

@ -36,6 +36,19 @@
#calendar-sidebox_date_header > button { #calendar-sidebox_date_header > button {
width: 45%; width: 45%;
} }
#calendar-sidebox_header_today {
position: absolute;
width: 2.4em;
height: 1.8em;
z-index: 1;
text-indent: 3em;
overflow: hidden;
border: none;
background-size: contain;
background-color: transparent;
background-image: url(images/today.png);
background-repeat: no-repeat;
}
#calendar-sidebox_weekend { #calendar-sidebox_weekend {
/* Special css styling goes here */ /* Special css styling goes here */
} }

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

@ -15,7 +15,7 @@ Egroupware
<template id="calendar.sidebox"> <template id="calendar.sidebox">
<vbox parent_node="calendar-et2_target"> <vbox parent_node="calendar-et2_target">
<textbox id="keywords" class="et2_fullWidth" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/> <textbox id="keywords" class="et2_fullWidth" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/>
<buttononly id="header_today" label="Today" onclick=" <buttononly id="header_today" label="Today" icon="today" statustext="Today" onclick="
var tempDate = new Date(); 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);
var change = {date: today.toJSON()}; var change = {date: today.toJSON()};

3
calendar/templates/pixelegg/app.css
View File

@ -1322,6 +1322,9 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
#calendar-sidebox_date .ui-widget-content .ui-state-hover { #calendar-sidebox_date .ui-widget-content .ui-state-hover {
background-color: rgba(103, 159, 210, 0.2); background-color: rgba(103, 159, 210, 0.2);
} }
#calendar-sidebox_header_today {
background-image: url(images/today.png);
}
#calendar_cat_id, #calendar_cat_id,
#calendar_filter, #calendar_filter,
#uical_select_owner, #uical_select_owner,

3
calendar/templates/pixelegg/app.less
View File

@ -1358,6 +1358,9 @@ div#calendar-container {
background-color: @color_hover_row; background-color: @color_hover_row;
} }
} }
#calendar-sidebox_header_today {
background-image: url(images/today.png);
}
// Select Fields in Sidemenu // Select Fields in Sidemenu
#calendar_cat_id, #calendar_cat_id,
#calendar_filter, #calendar_filter,