Author: nathangray
New Revision: 54905
URL: http://svn.stylite.de/viewvc/egroupware?rev=54905&view=rev
Log:
Change sidebox calendar button order, change today icon to •
Modified:
trunk/calendar/js/app.js
trunk/calendar/templates/default/app.css
trunk/calendar/templates/default/sidebox.xet
trunk/calendar/templates/pixelegg/app.css
— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Tue Feb 2 23:59:13 2016
@@ -3217,21 +3217,15 @@
percent = font_ratio;
$j(’#calendar-sidebox_date .ui-datepicker-inline’)
.css(‘font-size’,(percent100)+’%’);
-
// 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');
— trunk/calendar/templates/default/app.css (original)
+++ trunk/calendar/templates/default/app.css Tue Feb 2 23:59:13 2016
@@ -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: 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: 3em;
}
#calendar-sidebox_weekend {
/* Special css styling goes here */
— trunk/calendar/templates/default/sidebox.xet (original)
+++ trunk/calendar/templates/default/sidebox.xet Tue Feb 2 23:59:13 2016
@@ -15,7 +15,7 @@
var tempDate = new Date();
var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0);
var change = {date: today.toJSON()};
— trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Tue Feb 2 23:59:13 2016
@@ -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: 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: 3em;
}
#calendar-sidebox_weekend {
/* Special css styling goes here */
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
