sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

more calendar improvements (labels etc.)

Browse source
This commit is contained in:
rolux 2011-05-25 19:32:04 +02:00
commit dc23259308
3 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/Ox.UI/css/Ox.UI.css
View file

@ -138,11 +138,17 @@ Calendar
.OxCalendar .OxEvent {
position: absolute;
height: 16px;
height: 15px;
padding-top: 1px;
text-overflow: ellipsis;
cursor: pointer;
overflow: hidden;
white-space: nowrap;
}
.OxCalendar .OxEvent .OxEventText {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
cursor: pointer;
}
.OxCalendar .OxLine > .OxEvent {
border-radius: 4px;

24
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -584,8 +584,9 @@ Ox.Calendar = function(options, self) {
function getEventElement(event, zoom) {
var left = getPosition(event.start, zoom),
width = Math.max(getPosition(event.end, zoom) - left, 1);
Ox.print(event)
paddingLeft = (event.type && left < 0 ? -left : 0),
width = Math.max(getPosition(event.end, zoom) - left, 1) - paddingLeft;
//textLeft = (left < 0 ? -left : 0);
return new Ox.Element()
.addClass('OxEvent' +
(event.type ? ' Ox' + Ox.toTitleCase(event.type) : '' ) +
@ -593,12 +594,27 @@ Ox.Calendar = function(options, self) {
)
.css({
left: left + 'px',
width: width + 'px'
width: width + 'px',
paddingLeft: paddingLeft + 'px'
})
.data({
id: event.id
})
.html('&nbsp;' + event.name);
.html('&nbsp;' + event.name + '&nbsp;')
/*
.append(
$('<div>')
.addClass('OxEventText')
.css({
position: 'absolute',
width: (width - 4) + 'px',
height: '12px',
padding: '2px',
paddingLeft: textLeft + 'px',
})
.html('&nbsp;' + event.name)
);
*/
}
function getEventElementById(id) {