0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

only draw half of the calendar background stripes

Browse source
This commit is contained in:
rolux 2011-05-27 09:58:03 +02:00
parent 457e175455
commit 1950b514b5
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
demos/calendar/js/calendar.js
View file

@ -119,6 +119,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Che Guevara', start: '1928-06-14', end: '1967-10-09', type: 'person'},
{name: 'Andy Warhol', start: '1928-08-06', end: '1987-02-22', type: 'person'},
{name: 'Félix Guattari', start: '1930-04-30', end: '1992-08-29', type: 'person'},
//{name: 'Jean-Luc Godard', start: '1930-12-03', end: '', type: 'person'},
{name: 'Guy Debord', start: '1931-12-28', end: '1994-11-30', type: 'person'},
{name: 'Saddam Hussein', start: '1937-04-28', end: '2006-12-30', type: 'person'},
{name: 'John Lennon', start: '1940-10-09', end: '1980-12-08', type: 'person'},
@ -139,6 +140,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'World Trade Center', start: '1973-04-04', end: '2001-09-11', type: 'place'},
{name: 'Middle Ages', start: '500', end: '1400', type: 'other'},
{name: 'Battle of Hastings', start: '1066-10-14', end: '1066-10-15', type: 'other'},
{name: 'Renaissance', start: '1300', end: '1700', type: 'other'},
{name: 'Spanish Inquisition', start: '1480-09-27', end: '1834-07-15', type: 'other'},
@ -201,6 +203,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: '1972 Summer Olympics', start: '1972-08-26', end: '1972-09-10', type: 'other'},
{name: 'Apollo 17', start: '1972-12-07', end: '1972-12-19', type: 'other'},
{name: 'Iran-Iraq War', start: '1980-09-22', end: '1988-08-20', type: 'other'},
{name: 'Reagan Administration', start: '1981-01-20', end: '1989-01-20', type: 'other'},
{name: 'Tschernobyl', start: '1986-04-26', end: '1986-04-27', type: 'other'},
{name: 'Fall of the Berlin Wall', start: '1989-11-09', end: '1989-11-10', type: 'other'},
{name: 'Gulf War', start: '1990-08-02', end: '1991-02-28', type: 'other'},

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

@ -640,16 +640,18 @@ Ox.Calendar = function(options, self) {
width = unit.seconds * getPixelsPerSecond(zoom),
n = Math.ceil(self.options.width * 1.5/* * 16*/ / width);
Ox.loop(-n, n + 1, function(i) {
$elements.push(
new Ox.Element()
.addClass(
u == 0 ? 'line' : Ox.mod(value + i, 2) == 0 ? 'even' : 'odd'
)
.css({
left: getPosition(unit.date(value + i), zoom) + 'px',
width: (u == 0 ? 1 : width) + 'px'
})
);
if (u == 0 || Ox.mod(value + i, 2)) {
$elements.push(
new Ox.Element()
.addClass(
u == 0 ? 'line' : ''
)
.css({
left: getPosition(unit.date(value + i), zoom) + 'px',
width: (u == 0 ? 1 : width) + 'px'
})
);
}
});
});
return $elements;

5
source/Ox.UI/themes/modern/css/modern.css
View file

@ -47,10 +47,7 @@ Calendar
background: -webkit-gradient(linear, left top, left bottom, from(rgb(48, 48, 48)), to(rgb(16, 16, 16)));
}
.OxThemeModern .OxCalendar .OxBackground > div.even {
background: rgb(16, 16, 16);
}
.OxThemeModern .OxCalendar .OxBackground > div.odd {
.OxThemeModern .OxCalendar .OxBackground > div {
//background: rgb(20, 20, 20);
background: rgb(24, 24, 24);
}