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

Change sidebox calendar button order, change today icon to •

Browse Source
This commit is contained in:
Nathan Gray 2016-02-02 22:59:13 +00:00
parent fbb06d7228
commit 0be32cf840
4 changed files with 48 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/js/app.js
View File

@ -3217,21 +3217,15 @@ app.classes.calendar = AppJS.extend(
percent *= font_ratio;
$j('#calendar-sidebox_date .ui-datepicker-inline')
.css('font-size',(percent*100)+'%');
// Position today
var buttons = $j('#calendar-sidebox_date .ui-datepicker-header a');
if(today.length)
{
// Why doesn't this work properly?
go_button.position({my: 'center left', at: 'center right',of: buttons[0]});
go_button.css('left', buttons.first().position().left + buttons.first().width());
var max_width = buttons.last().position().left - (go_button.position().left + go_button.width());
// Position go and today
var buttons = $j('#calendar-sidebox_date .ui-datepicker-header a span');
if(today.length && go_button.length)
{
go_button.position({my: 'left+15px center', at: 'right center-1',of: $j('#calendar-sidebox_date .ui-datepicker-year')});
today.css({
'left': go_button.position().left + go_button.outerWidth(),
'top': go_button.css('top'),
'max-width': max_width,
'right': buttons.last().outerWidth(true)
'left': (buttons.first().offset().left + buttons.last().offset().left)/2 - Math.ceil(today.outerWidth(true)/2),
'top': go_button.css('top')
});
}
}).trigger('resize');

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

@ -39,47 +39,39 @@
#calendar-sidebox_date_header > button {
width: 45%;
}
#calendar-sidebox_header_go,
#calendar-sidebox_header_today {
position: absolute;
height: 1.8em;
z-index: 1;
text-indent: 125%;
overflow: hidden;
text-overflow: ellipsis;
border: none;
right: 2em;
margin: 1px;
margin-top: -5px;
background-position: center center;
background-size: contain;
background-color: transparent;
background-image: url(images/today.png);
background-repeat: no-repeat;
}
#calendar-sidebox_header_go {
position: absolute;
width: 13px;
height: 13px;
top: 0.5em;
right: 4.7em;
width: 12.0px;
height: 12.0px;
top: 28px;
z-index: 1;
overflow: hidden;
margin: 0px;
margin: 0.5em;
font-size: 10px;
line-height: 50%;
text-indent: -1px;
color: white;
background-color: #d8e7f3;
border:none;
border-radius: 100%;
}
#calendar-sidebox_header_go:hover {
background-color: #0c5da5;
#calendar-sidebox_header_today {
right: 35px;
}
#calendar-sidebox_header_go {
right: 80px;
text-indent: -1px;
}
#calendar-sidebox_header_go:hover, #calendar-sidebox_header_today:hover {
background-color: #0c5da5;
box-shadow: none;
}
#calendar-sidebox_date .ui-datepicker-header a {
top: 3px;
}
#calendar-sidebox_date .ui-datepicker-prev {
right: 5em;
right: 3em;
}
#calendar-sidebox_weekend {
/* Special css styling goes here */

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

@ -15,7 +15,7 @@ Egroupware
<template id="calendar.sidebox">
<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;"/>
<buttononly id="header_today" label="Today" icon="today" statustext="Today" onclick="
<buttononly id="header_today" label="•" icon="nope" statustext="Today" onclick="
var tempDate = new Date();
var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0);
var change = {date: today.toJSON()};

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

@ -11,7 +11,7 @@
* @package calendar
* @version $Id$
*/
/* $Id: app.css 54896 2016-02-02 09:19:31Z ralfbecker $ */
/* $Id: app.css 54904 2016-02-02 21:12:44Z nathangray $ */
/*Media print classes*/
@media print {
.th td,
@ -52,45 +52,39 @@
#calendar-sidebox_date_header > button {
width: 45%;
}
#calendar-sidebox_header_go,
#calendar-sidebox_header_today {
position: absolute;
height: 1.8em;
z-index: 1;
text-indent: 125%;
overflow: hidden;
text-overflow: ellipsis;
border: none;
right: 2em;
margin: 1px;
margin-top: -5px;
background-position: center center;
background-size: contain;
background-color: transparent;
background-image: url(images/today.png);
background-repeat: no-repeat;
}
#calendar-sidebox_header_go {
position: absolute;
width: 13px;
height: 13px;
top: 0.5em;
right: 4.7em;
width: 12.0px;
height: 12.0px;
top: 28px;
z-index: 1;
overflow: hidden;
margin: 0px;
margin: 0.5em;
font-size: 10px;
line-height: 50%;
text-indent: -1px;
color: white;
background-color: #d8e7f3;
border: none;
border-radius: 100%;
}
#calendar-sidebox_header_go:hover {
#calendar-sidebox_header_today {
right: 35px;
}
#calendar-sidebox_header_go {
right: 80px;
text-indent: -1px;
}
#calendar-sidebox_header_go:hover,
#calendar-sidebox_header_today:hover {
background-color: #0c5da5;
box-shadow: none;
}
#calendar-sidebox_date .ui-datepicker-header a {
top: 3px;
}
#calendar-sidebox_date .ui-datepicker-prev {
right: 5em;
right: 3em;
}
#calendar-sidebox_weekend {
/* Special css styling goes here */