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

add more data to calendar demo

Browse source
This commit is contained in:
rolux 2011-05-27 18:03:05 +02:00
parent 3d7607b78a
commit 8ed96c83ca
2 changed files with 201 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
demos/calendar/js/calendar.js
View file

@ -49,6 +49,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Homer', start: '-900', end: '-800', type: 'person'},
{name: 'Buddha', start: '-600', end: '-500', type: 'person'},
{name: 'Socrates', start: '-469', end: '-399', type: 'person'},
{name: 'Plato', start: '-428', end: '-348', type: 'person'},
{name: 'Aristotle', start: '-384', end: '-322', type: 'person'},
@ -59,104 +60,286 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Cleopatra', start: '-69', end: '-30-08-12', type: 'person'},
{name: 'Augustus', start: '-63-09-23', end: '14-08-19', type: 'person'},
{name: 'Jesus Christ', start: '-5', end: '33', type: 'person'},
{name: 'Muhammad', start: '570', end: '632-06-08', type: 'person'},
{name: 'Charlemagne', start: '742-04-02', end: '814-01-28', type: 'person'},
{name: 'Barbarossa', start: '1122', end: '1190-06-10', type: 'person'},
{name: 'Genghis Khan', start: '1162-05-31', end: '1227-08-25', type: 'person'},
{name: 'Marco Polo', start: '1254', end: '1324-01-08', type: 'person'},
{name: 'Jeanne d\'Arc', start: '1412', end: '1431-05-30', type: 'person'},
{name: 'Christopher Columbus', start: '1451-08-22', end: '1506-05-20', type: 'person'},
{name: 'Leonardo da Vinci', start: '1452-04-15', end: '1519-05-02', type: 'person'},
{name: 'Vasco da Gama', start: '1460', end: '1524-12-24', type: 'person'},
{name: 'Francisco Pizarro', start: '1471', end: '1541-06-26', type: 'person'},
{name: 'Albrecht Dürer', start: '1471-05-21', end: '1528-04-06', type: 'person'},
{name: 'Nicolaus Copernicus', start: '1473-02-19', end: '1543-05-24', type: 'person'},
{name: 'Michelangelo', start: '1475-03-06', end: '1564-02-18', type: 'person'},
{name: 'Raphael', start: '1483-03-28', end: '1520-04-06', type: 'person'},
{name: 'Martin Luther', start: '1483-11-10', end: '1546-02-18', type: 'person'},
{name: 'Hernán Cortés', start: '1485', end: '1547-12-02', type: 'person'},
{name: 'Niccolò Machiavelli', start: '1469-05-03', end: '1527-06-21', type: 'person'},
{name: 'Nostradamus', start: '1503-12-14', end: '1566-07-02', type: 'person'},
{name: 'Tintoretto', start: '1518-09-29', end: '1594-05-31', type: 'person'},
{name: 'Pieter Bruegel', start: '1525', end: '1569-09-09', type: 'person'},
{name: 'Ivan the Terrible', start: '1530-08-25', end: '1584-03-28', type: 'person'},
{name: 'El Greco', start: '1541', end: '1614-04-07', type: 'person'},
{name: 'Francis Drake', start: '1544', end: '1596-01-27', type: 'person'},
{name: 'Miguel de Cervantes', start: '1547-10-09', end: '1616-04-23', type: 'person'},
{name: 'Giordano Bruno', start: '1548', end: '1600-02-17', type: 'person'},
{name: 'Francis Bacon', start: '1561-01-22', end: '1626-04-09', type: 'person'},
{name: 'Galileo Galilei', start: '1564-02-15', end: '1642-01-08', type: 'person'},
{name: 'William Shakespeare', start: '1564-04-26', end: '1616-04-23', type: 'person'},
{name: 'Caravaggio', start: '1571-09-29', end: '1610-07-18', type: 'person'},
{name: 'Johannes Kepler', start: '1571-12-27', end: '1630-11-15', type: 'person'},
{name: 'Thomas Hobbes', start: '1588-04-05', end: '1679-12-04', type: 'person'},
{name: 'René Descartes', start: '1596-03-31', end: '1650-02-11', type: 'person'},
{name: 'Oliver Cromwell', start: '1599-04-25', end: '1658-09-03', type: 'person'},
{name: 'Diego Velázquez', start: '1599-06-06', end: '1660-08-06', type: 'person'},
{name: 'Pierre de Fermat', start: '1601-08-20', end: '1665-01-12', type: 'person'},
{name: 'Rembrandt', start: '1606-07-15', end: '1669-10-04', type: 'person'},
{name: 'Molière', start: '1622-01-15', end: '1673-02-17', type: 'person'},
{name: 'John Locke', start: '1632-08-29', end: '1704-10-28', type: 'person'},
{name: 'Johannes Vermeer', start: '1632-10-31', end: '1675-12-15', type: 'person'},
{name: 'Baruch Spinoza', start: '1632-11-24', end: '1677-02-21', type: 'person'},
{name: 'Louix XIV', start: '1638-09-05', end: '1715-09-01', type: 'person'},
{name: 'Isaac Newton', start: '1643-01-04', end: '1727-03-31', type: 'person'},
{name: 'Gottfried Leibniz', start: '1646-07-01', end: '1716-11-14', type: 'person'},
{name: 'Daniel Defoe', start: '1659', end: '1731-04-24', type: 'person'},
{name: 'Peter the Great', start: '1672-06-09', end: '1725-02-08', type: 'person'},
{name: 'Antonio Vivaldi', start: '1678-03-04', end: '1741-07-28', type: 'person'},
{name: 'Blackbeard', start: '1680', end: '1718-11-22', type: 'person'},
{name: 'Georg Friedrich Händel', start: '1685-02-23', end: '1759-04-14', type: 'person'},
{name: 'Johann Sebastian Bach', start: '1685-03-21', end: '1750-07-28', type: 'person'},
{name: 'Voltaire', start: '1694-11-21', end: '1778-05-30', type: 'person'},
{name: 'Leonhard Euler', start: '1707-04-15', end: '1783-09-18', type: 'person'},
{name: 'Louis XV', start: '1710-02-15', end: '1774-05-10', type: 'person'},
{name: 'David Hume', start: '1711-05-07', end: '1776-08-25', type: 'person'},
{name: 'Frederick the Great', start: '1712-01-24', end: '1786-08-17', type: 'person'},
{name: 'Jean-Jacques Rousseau', start: '1712-06-28', end: '1778-07-02', type: 'person'},
{name: 'Denis Diderot', start: '1713-10-05', end: '1784-07-31', type: 'person'},
{name: 'Adam Smith', start: '1723-06-05', end: '1790-07-17', type: 'person'},
{name: 'Immanuel Kant', start: '1724-04-22', end: '1804-02-12', type: 'person'},
{name: 'James Cook', start: '1728-11-07', end: '1779-02-14', type: 'person'},
{name: 'Gotthold Ephraim Lessing', start: '1729-01-22', end: '1781-02-15', type: 'person'},
{name: 'George Washington', start: '1732-02-22', end: '1799-12-14', type: 'person'},
{name: 'Joseph Haydn', start: '1732-03-31', end: '1809-05-31', type: 'person'},
{name: 'Marquis de Sade', start: '1740-06-02', end: '1814-12-02', type: 'person'},
{name: 'Thomas Jefferson', start: '1743-04-13', end: '1826-07-04', type: 'person'},
{name: 'Adam Weishaupt', start: '1748-02-06', end: '1830-11-18', type: 'person'},
{name: 'Johann Wolfgang von Goethe', start: '1749-08-28', end: '1832-03-22', type: 'person'},
{name: 'Antonio Salieri', start: '1750-08-18', end: '1825-05-07', type: 'person'},
{name: 'Louis XVI', start: '1754-08-23', end: '1793-01-21', type: 'person'},
{name: 'Marie Antoinette', start: '1755-11-01', end: '1793-10-16', type: 'person'},
{name: 'Wolfgang Amadeus Mozart', start: '1756-01-27', end: '1791-12-05', type: 'person'},
{name: 'Maximilien Robespierre', start: '1758-05-06', end: '1794-07-28', type: 'person'},
{name: 'Friedrich Schiller', start: '1759-11-10', end: '1805-05-09', type: 'person'},
{name: 'Napoleon', start: '1769-08-15', end: '1821-05-05', type: 'person'},
{name: 'Georg Wilhelm Friedrich Hegel', start: '1770-08-27', end: '1831-11-14', type: 'person'},
{name: 'Ludwig van Beethoven', start: '1770-12-17', end: '1827-03-26', type: 'person'},
{name: 'Caspar David Friedrich', start: '1774-09-05', end: '1840-05-07', type: 'person'},
{name: 'Jane Austen', start: '1775-12-16', end: '1817-07-18', type: 'person'},
{name: 'Carl Friedrich Gauss', start: '1777-04-30', end: '1855-02-23', type: 'person'},
{name: 'Shaka', start: '1787', end: '1828-09-22', type: 'person'},
{name: 'Arthur Schopenhauer', start: '1788-02-22', end: '1860-09-21', type: 'person'},
{name: 'Franz Schubert', start: '1797-01-31', end: '1828-11-19', type: 'person'},
{name: 'Heinrich Heine', start: '1797-12-13', end: '1856-02-17', type: 'person'},
{name: 'Eugéne Delacroix', start: '1798-04-26', end: '1863-08-13', type: 'person'},
{name: 'Pierre-Joseph Proudhon', start: '1809-01-15', end: '1865-01-19', type: 'person'},
{name: 'Edgar Allan Poe', start: '1809-01-19', end: '1849-10-07', type: 'person'},
{name: 'Abraham Lincoln', start: '1809-02-12', end: '1865-04-15', type: 'person'},
{name: 'Charles Darwin', start: '1809-02-12', end: '1882-04-19', type: 'person'},
{name: 'Frédéric Chopin', start: '1810-03-01', end: '1849-10-17', type: 'person'},
{name: 'Robert Schumann', start: '1810-06-08', end: '1856-07-29', type: 'person'},
{name: 'Charles Dickens', start: '1812-02-07', end: '1870-06-09', type: 'person'},
{name: 'Søren Kierkegaard', start: '1813-05-05', end: '1855-11-11', type: 'person'},
{name: 'Richard Wagner', start: '1813-05-22', end: '1883-02-13', type: 'person'},
{name: 'Guiseppe Verdi', start: '1813-10-10', end: '1901-01-27', type: 'person'},
{name: 'Mikhail Bakunin', start: '1814-05-30', end: '1876-07-01', type: 'person'},
{name: 'Otto von Bismarck', start: '1815-04-01', end: '1898-07-30', type: 'person'},
{name: 'Ada Lovelace', start: '1815-12-10', end: '1852-11-27', type: 'person'},
{name: 'Karl Marx', start: '1818-05-05', end: '1883-03-14', type: 'person'},
///*
{name: 'Herman Melville', start: '1818-08-01', end: '1891-09-28', type: 'person'},
{name: 'Friedrich Engels', start: '1820-11-28', end: '1895-08-05', type: 'person'},
{name: 'Lola Montez', start: '1821-02-17', end: '1861-01-17', type: 'person'},
{name: 'Charles Baudelaire', start: '1821-04-09', end: '1867-08-31', type: 'person'},
{name: 'Gustave Flaubert', start: '1821-12-12', end: '1880-05-08', type: 'person'},
{name: 'Louis Pasteur', start: '1822-12-27', end: '1895-09-28', type: 'person'},
{name: 'Jules Verne', start: '1828-02-08', end: '1905-03-24', type: 'person'},
{name: 'Leo Tolstoy', start: '1828-09-09', end: '1910-11-20', type: 'person'},
{name: 'Camille Pissarro', start: '1830-07-10', end: '1903-11-13', type: 'person'},
{name: 'Sitting Bull', start: '1831', end: '1890-12-15', type: 'person'},
{name: 'Édouard Manet', start: '1832-01-23', end: '1883-04-30', type: 'person'},
{name: 'Johannes Brahms', start: '1833-05-07', end: '1897-04-03', type: 'person'},
{name: 'Alfred Nobel', start: '1833-10-21', end: '1896-12-10', type: 'person'},
{name: 'Edgar Degas', start: '1834-07-19', end: '1917-09-27', type: 'person'},
{name: 'Mark Twain', start: '1835-11-30', end: '1910-04-21', type: 'person'},
{name: 'Leopold von Sacher-Masoch', start: '1836-01-27', end: '1895-03-09', type: 'person'},
{name: 'Paul Cézanne', start: '1839-01-19', end: '1906-10-22', type: 'person'},
{name: 'Modest Mussorgsky', start: '1839-03-21', end: '1881-03-28', type: 'person'},
{name: 'John D. Rockefeller', start: '1839-07-08', end: '1937-05-23', type: 'person'},
{name: 'Crazy Horse', start: '1840', end: '1877-09-05', type: 'person'},
{name: 'Émile Zola', start: '1840-04-02', end: '1902-09-29', type: 'person'},
{name: 'Auguste Rodin', start: '1840-11-12', end: '1917-11-17', type: 'person'},
{name: 'Claude Monet', start: '1840-11-14', end: '1926-12-05', type: 'person'},
{name: 'Pierre-Auguste Renoir', start: '1841-02-25', end: '1919-12-03', type: 'person'},
{name: 'Paul Verlaine', start: '1844-03-30', end: '1896-01-08', type: 'person'},
{name: 'Friedrich Wilhelm Nietzsche', start: '1844-10-15', end: '1900-08-25', type: 'person'},
{name: 'Thomas Edison', start: '1847-02-11', end: '1931-10-18', type: 'person'},
{name: 'Paul Gaugin', start: '1848-06-07', end: '1903-05-08', type: 'person'},
{name: 'Vincent van Gogh', start: '1853-03-30', end: '1890-07-29', type: 'person'},
{name: 'Cecil Rhodes', start: '1853-07-05', end: '1902-03-26', type: 'person'},
{name: 'Oscar Wilde', start: '1854-10-16', end: '1900-11-30', type: 'person'},
{name: 'Arthur Rimbaud', start: '1854-10-20', end: '1891-11-10', type: 'person'},
{name: 'Sigmund Freud', start: '1856-05-06', end: '1939-09-23', type: 'person'},
{name: 'Nikola Tesla', start: '1856-07-10', end: '1943-01-07', type: 'person'},
{name: 'Joseph Conrad', start: '1857-12-03', end: '1924-08-03', type: 'person'},
{name: 'Max Planck', start: '1858-04-23', end: '1947-10-04', type: 'person'},
{name: 'Arthur Conan Doyle', start: '1859-05-22', end: '1930-07-07', type: 'person'},
{name: 'Henri Bergson', start: '1859-10-18', end: '1941-01-04', type: 'person'},
{name: 'Georges Seurat', start: '1859-12-02', end: '1891-03-29', type: 'person'},
{name: 'Georges Méliès', start: '1861-12-08', end: '1938-01-21', type: 'person'},
{name: 'Claude Debussy', start: '1862-08-22', end: '1918-03-25', type: 'person'},
{name: 'Lumière Brothers', start: '1862-10-19', end: '1954-04-10', type: 'person'},
{name: 'Henry Ford', start: '1863-07-30', end: '1947-04-07', type: 'person'},
{name: 'Edvard Munch', start: '1863-12-12', end: '1944-01-23', type: 'person'},
{name: 'Henri de Toulouse-Lautrec', start: '1864-11-24', end: '1901-09-09', type: 'person'},
{name: 'Wassily Kandinsky', start: '1866-12-16', end: '1944-12-13', type: 'person'},
{name: 'Marie Curie', start: '1867-11-07', end: '1934-07-04', type: 'person'},
{name: 'Mahatma Gandhi', start: '1869-10-02', end: '1948-01-30', type: 'person'},
{name: 'Henri Matisse', start: '1869-12-31', end: '1954-11-03', type: 'person'},
{name: 'Vladimir Lenin', start: '1870-04-22', end: '1924-01-21', type: 'person'},
{name: 'Rosa Luxemburg', start: '1871-03-05', end: '1919-01-15', type: 'person'},
{name: 'Marcel Proust', start: '1871-07-10', end: '1922-11-18', type: 'person'},
{name: 'Karl Liebknecht', start: '1871-08-13', end: '1919-01-15', type: 'person'},
{name: 'Arnold Schoenberg', start: '1874-09-13', end: '1951-07-13', type: 'person'},
{name: 'Winston Churchill', start: '1874-11-30', end: '1965-01-24', type: 'person'},
{name: 'Mata Hari', start: '1876-08-07', end: '1917-10-15', type: 'person'},
{name: 'Lise Meitner', start: '1878-11-07', end: '1968-10-27', type: 'person'},
{name: 'Josef Stalin', start: '1878-12-18', end: '1953-03-05', type: 'person'},
{name: 'Kazimir Malevich', start: '1879-02-23', end: '1935-05-15', type: 'person'},
{name: 'Albert Einstein', start: '1879-03-14', end: '1955-04-18', type: 'person'},
{name: 'Franz Marc', start: '1880-02-08', end: '1916-03-04', type: 'person'},
{name: 'Robert Musil', start: '1880-11-06', end: '1942-04-15', type: 'person'},
{name: 'Pablo Picasso', start: '1881-10-25', end: '1973-04-08', type: 'person'},
{name: 'Theodor Roosevelt', start: '1882-01-30', end: '1945-04-12', type: 'person'},
{name: 'Theodore Roosevelt', start: '1882-01-30', end: '1945-04-12', type: 'person'},
{name: 'James Joyce', start: '1882-02-02', end: '1941-01-13', type: 'person'},
{name: 'Emmy Noether', start: '1882-03-23', end: '1935-04-14', type: 'person'},
{name: 'Franz Kafka', start: '1883-07-03', end: '1924-06-03', type: 'person'},
{name: 'Marc Chagall', start: '1887-06-24', end: '1985-03-28', type: 'person'},
{name: 'Marcel Duchamp', start: '1887-07-28', end: '1968-10-02', type: 'person'},
{name: 'Friedrich Wilhelm Murnau', start: '1888-12-28', end: '1931-03-11', type: 'person'},
{name: 'Adolf Hitler', start: '1889-04-20', end: '1945-04-30', type: 'person'},
{name: 'Jean Cocteau', start: '1889-06-05', end: '1963-10-11', type: 'person'},
{name: 'Dwight D. Eisenhower', start: '1890-10-14', end: '1969-03-28', type: 'person'},
{name: 'Charles de Gaulle', start: '1890-11-22', end: '1970-11-09', type: 'person'},
{name: 'Fritz Lang', start: '1890-12-05', end: '1976-08-02', type: 'person'},
{name: 'Walter Benjamin', start: '1892-07-15', end: '1940-09-26', type: 'person'},
{name: 'Hermann Göring', start: '1893-01-12', end: '1946-10-15', type: 'person'},
{name: 'Mao Zedong', start: '1893-12-26', end: '1976-09-09', type: 'person'},
{name: 'Aldous Huxley', start: '1894-07-26', end: '1963-11-22', type: 'person'},
{name: 'Antonin Artaud', start: '1896-09-04', end: '1948-03-04', type: 'person'},
{name: 'Tristan Tzara', start: '1896-16-04', end: '1963-12-25', type: 'person'},
{name: 'Joseph Goebbels', start: '1897-10-29', end: '1945-05-01', type: 'person'},
{name: 'Bertolt Brecht', start: '1898-02-10', end: '1956-08-14', type: 'person'},
{name: 'Al Capone', start: '1899-01-17', end: '1947-01-25', type: 'person'},
{name: 'Charlie Chaplin', start: '1899-04-16', end: '1977-12-25', type: 'person'},
{name: 'Vladimir Nabokov', start: '1899-04-22', end: '1977-07-02', type: 'person'},
{name: 'Ernest Hemingway', start: '1899-07-21', end: '1961-07-02', type: 'person'},
{name: 'Alfred Hitchcock', start: '1899-08-13', end: '1980-04-29', type: 'person'},
{name: 'Jorge Luis Borges', start: '1899-08-24', end: '1986-06-14', type: 'person'},
{name: 'Luis Bunuel', start: '1900-02-22', end: '1983-07-29', type: 'person'},
{name: 'Jacques Lacan', start: '1901-04-13', end: '1981-09-09', type: 'person'},
{name: 'André Malraux', start: '1901-12-05', end: '1976-11-23', type: 'person'},
{name: 'Marlene Dietrich', start: '1901-12-27', end: '1992-05-06', type: 'person'},
{name: 'Werner Heisenberg', start: '1901-12-05', end: '1976-02-01', type: 'person'},
{name: 'George Orwell', start: '1903-06-25', end: '1950-01-21', type: 'person'},
{name: 'Theodor W. Adorno', start: '1903-09-11', end: '1969-08-06', type: 'person'},
{name: 'Salvador Dalí', start: '1904-05-11', end: '1989-01-23', type: 'person'},
{name: 'Jean-Paul Sartre', start: '1905-06-21', end: '1980-04-15', type: 'person'},
{name: 'Pierre Klossowski', start: '1905-08-09', end: '2001-08-12', type: 'person'},
{name: 'Adolf Eichmann', start: '1906-03-19', end: '1962-05-31', type: 'person'},
{name: 'Samuel Beckett', start: '1906-04-13', end: '1989-12-22', type: 'person'},
{name: 'Kurt Gödel', start: '1906-04-28', end: '1978-01-14', type: 'person'},
{name: 'Grace Hopper', start: '1906-12-09', end: '1992-01-01', type: 'person'},
{name: 'Frida Kahlo', start: '1907-07-06', end: '1954-07-13', type: 'person'},
{name: 'Maurice Blanchot', start: '1907-09-22', end: '2003-02-20', type: 'person'},
{name: 'Simone de Beauvoir', start: '1908-01-09', end: '1986-04-14', type: 'person'},
{name: 'Salvador Allende', start: '1908-06-26', end: '1973-09-11', type: 'person'},
{name: 'Josef Mengele', start: '1911-03-16', end: '1979-02-07', type: 'person'},
{name: 'Alan Turing', start: '1912-06-23', end: '1954-06-07', type: 'person'},
{name: 'Richard Nixon', start: '1913-01-09', end: '1994-04-22', type: 'person'},
{name: 'Albert Camus', start: '1913-11-07', end: '1960-01-04', type: 'person'},
{name: 'William S. Burroughs', start: '1914-02-05', end: '1997-08-02', type: 'person'},
{name: 'Henri Langlois', start: '1914-11-13', end: '1977-01-13', type: 'person'},
{name: 'Orson Welles', start: '1915-05-06', end: '1985-10-10', type: 'person'},
{name: 'Roland Barthes', start: '1915-11-12', end: '1980-03-25', type: 'person'},
{name: 'François Mitterrand', start: '1916-10-26', end: '1996-01-08', type: 'person'},
{name: 'John F. Kennedy', start: '1917-05-29', end: '1963-11-22', type: 'person'},
{name: 'Indira Gandhi', start: '1917-11-19', end: '1984-10-32', type: 'person'},
{name: 'Timothy Leary', start: '1920-10-22', end: '1996-05-31', type: 'person'},
{name: 'Marlon Brando', start: '1924-04-03', end: '2004-07-01', type: 'person'},
{name: 'Jean-François Lyotard', start: '1924-08-10', end: '1998-04-21', type: 'person'},
{name: 'Gilles Deleuze', start: '1925-01-18', end: '1995-11-04', type: 'person'},
{name: 'Isidore Isou', start: '1925-01-31', end: '2007-07-28', type: 'person'},
{name: 'Pol Pot', start: '1925-05-19', end: '1998-04-15', type: 'person'},
{name: 'Marylin Monroe', start: '1926-06-01', end: '1962-08-05', type: 'person'},
{name: 'Michel Foucault', start: '1926-10-15', end: '1984-06-25', type: 'person'},
{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: 'Martin Luther King', start: '1929-01-15', end: '1968-04-04', type: 'person'},
{name: 'Jean Baudrillard', start: '1929-07-27', end: '2007-03-06', 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: 'Jacques Derrida', start: '1930-07-15', end: '2004-10-08', type: 'person'},
{name: 'James Dean', start: '1931-02-08', end: '1955-09-30', type: 'person'},
{name: 'Guy Debord', start: '1931-12-28', end: '1994-11-30', type: 'person'},
{name: 'Elizabeth Taylor', start: '1932-02-27', end: '2011-03-23', type: 'person'},
{name: 'Ivan Chtcheglov', start: '1933-01-16', end: '1998-04-21', type: 'person'},
{name: 'Ulrike Meinhof', start: '1934-10-07', end: '1976-05-09', type: 'person'},
{name: 'Saddam Hussein', start: '1937-04-28', end: '2006-12-30', type: 'person'},
{name: 'Romy Schneider', start: '1938-09-23', end: '1982-05-29', type: 'person'},
{name: 'Jean Seberg', start: '1938-11-13', end: '1979-08-30', type: 'person'},
{name: 'Gudrun Ensslin', start: '1940-08-15', end: '1977-10-18', type: 'person'},
{name: 'John Lennon', start: '1940-10-09', end: '1980-12-08', type: 'person'},
{name: 'Jimi Hendrix', start: '1942-11-27', end: '1970-09-18', type: 'person'},
{name: 'Janis Joplin', start: '1943-01-19', end: '1970-10-04', type: 'person'},
{name: 'Edie Sedgwick', start: '1943-04-20', end: '1971-11-16', type: 'person'},
{name: 'Andreas Baader', start: '1943-05-06', end: '1977-10-18', type: 'person'},
{name: 'Jim Morrison', start: '1943-12-08', end: '1971-06-03', type: 'person'},
{name: 'Serge Daney', start: '1944-06-04', end: '1992-06-12', type: 'person'},
{name: 'Bob Marley', start: '1945-02-06', end: '1981-05-11', type: 'person'},
{name: 'Fred Hampton', start: '1948-08-30', end: '1969-12-04', type: 'person'},
{name: 'Martin Kippenberger', start: '1953-02-25', end: '1997-03-07', type: 'person'},
{name: 'Osama bin Laden', start: '1957-03-10', end: '2011-05-02', type: 'person'},
{name: 'Michael Jackson', start: '1958-08-29', end: '2009-06-25', type: 'person'},
{name: 'Jean-Michel Basquiat', start: '1960-12-22', end: '1988-08-12', type: 'person'},
{name: 'Lady Diana', start: '1961-07-01', end: '1997-08-31', type: 'person'},
{name: 'Kurt Cobain', start: '1967-02-20', end: '1994-04-05', type: 'person'},
{name: 'Holy Roman Empire', start: '962-02-02', end: '1806-08-06', type: 'place'},
{name: 'Ottoman Empire', start: '1299-07-27', end: '1923-10-29', type: 'place'},
{name: 'Ming Dynasty', start: '1368', end: '1644', type: 'place'},
{name: 'Mughal Empire', start: '1526-04-21', end: '1858-06-20', type: 'place'},
{name: 'Qing Dynasty', start: '1644', end: '1912', type: 'place'},
{name: 'Austrian Empire', start: '1804-08-11', end: '1867-03-30', type: 'place'},
{name: 'Congo Free State', start: '1885-07-11', end: '1908-11-15', type: 'place'},
@ -173,7 +356,8 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Stone Age', start: '-10000', end: '-3000', type: 'other'},
{name: 'Bronze Age', start: '-3000', end: '-1000', type: 'other'},
{name: 'Iron Age', start: '-1000', end: '500', type: 'other'},
{name: 'Middle Ages', start: '501', end: '1350', type: 'other'},
{name: 'Pompeji', start: '79-08-24', end: '79-08-25', type: 'other'},
{name: 'Middle Ages', start: '500', end: '1350', type: 'other'},
{name: 'Battle of Hastings', start: '1066-10-14', end: '1066-10-15', type: 'other'},
{name: 'Crusades', start: '1095', end: '1291', type: 'other'},
{name: 'Hundred Years\' War', start: '1337', end: '1453', type: 'other'},
@ -181,16 +365,22 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Fall of Constantinople', start: '1453-04-06', end: '1453-05-29', type: 'other'},
{name: 'Spanish Inquisition', start: '1480-09-27', end: '1834-07-15', type: 'other'},
{name: 'Discovery of America', start: '1492', end: '1493', type: 'other'},
{name: 'Queen Mary', start: '1553-07-19', end: '1558-11-17', type: 'other'},
{name: 'Queen Elizabeth', start: '1558-11-17', end: '1603-03-24', type: 'other'},
{name: 'Gregorian Calendar', start: '1582-10-05', end: '1582-10-15', type: 'other'},
{name: 'East India Company', start: '1600', end: '1874', type: 'other'},
{name: 'Thirty Years\' War', start: '1618', end: '1648', type: 'other'},
{name: 'Great Fire of London', start: '1666-09-02', end: '1666-09-05', type: 'other'},
{name: 'Industrial Revolution', start: '1750', end: '1850', type: 'other'},
{name: 'Lisbon Earthquake', start: '1755-11-01', end: '1755-11-02', type: 'other'},
{name: 'Declaration of Independence', start: '1776-07-04', end: '1776-07-05', type: 'other'},
{name: 'French Revolution', start: '1789', end: '1799', type: 'other'},
{name: 'Storming of the Bastille', start: '1789-07-14', end: '1789-07-15', type: 'other'},
{name: 'Napoleonic Era', start: '1799-11-09', end: '1815-06-28', type: 'other'},
{name: 'Battle of Trafalgar', start: '1805-10-21', end: '1805-10-22', type: 'other'},
{name: 'Battle of Waterloo', start: '1815-06-18', end: '1815-06-19', type: 'other'},
{name: 'The Year Without a Summer', start: '1816', end: '1817', type: 'other'},
{name: 'Queen Isabella', start: '1833-09-29', end: '1868-09-30', type: 'other'},
{name: 'Queen Victoria', start: '1837-06-20', end: '1901-01-22', type: 'other'},
{name: 'Crimean War', start: '1853-10', end: '1856-02', type: 'other'},
{name: 'American Civil War', start: '1861-04-12', end: '1865-04-09', type: 'other'},
@ -213,6 +403,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Battle of Stalingrad', start: '1942-08-23', end: '1943-02-02', type: 'other'},
{name: 'D-Day', start: '1944-06-06', end: '1944-06-07', type: 'other'},
{name: 'Liberation of Auschwitz', start: '1945-01-27', end: '1945-01-28', type: 'other'},
{name: 'Battle of Okinawa', start: '1945-04-01', end: '1945-06-22', type: 'other'},
{name: 'Hiroshima', start: '1945-08-06', end: '1945-08-07', type: 'other'},
{name: 'Nagasaki', start: '1945-08-09', end: '1945-08-10', type: 'other'},
{name: 'Nuremburg Trials', start: '1945-11-20', end: '1946-10-01', type: 'other'},
@ -239,9 +430,11 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: '1968 Summer Olympics', start: '1968-10-12', end: '1968-10-27', type: 'other'},
{name: 'Apollo 11', start: '1969-07-16', end: '1969-07-24', type: 'other'},
{name: 'Moon Landing', start: '1969-07-20', end: '1969-07-21', type: 'other'},
{name: 'Woodstock', start: '1969-08-15', end: '1969-08-18', type: 'other'},
{name: 'The Epoch', start: '1970-01-01 00:00:00', end: '1970-01-01 00:00:01', type: 'other'},
{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: 'Indian Emergency', start: '1975-06-25', end: '1977-03-21', 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'},

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

@ -835,12 +835,11 @@ Ox.Calendar = function(options, self) {
return 1;
} else if (a.type != 'person' && b.type == 'person') {
return -1;
/*
} else if (a.startTime < b.startTime || a.startTime > b.startTime) {
return a.startTime - b.startTime;
*/
} else {
///*
} else if ((b.endTime - b.startTime) != (a.endTime - a.startTime)) {
return (b.endTime - b.startTime) - (a.endTime - a.startTime);
} else /*if (a.startTime < b.startTime || a.startTime > b.startTime)*/ {
return a.startTime - b.startTime;
}
}).forEach(function(event, i) {
var line = lineEvents.length;