Upgraded Full Calendar, now things are left aligned

pull/6/head
Mark McDowall 12 years ago committed by markus101
parent 2e1d36a05e
commit 0df8157b01

@ -15,7 +15,7 @@ define(['app', 'Calendar/CalendarItemView'], function () {
this.calendar = new NzbDrone.Calendar.CalendarCollection(); this.calendar = new NzbDrone.Calendar.CalendarCollection();
}, },
onCompositeCollectionRendered: function () { onCompositeCollectionRendered: function () {
$(this.ui.calendar).fullCalendar({ $(this.ui.calendar).empty().fullCalendar({
allDayDefault : false, allDayDefault : false,
ignoreTimezone: false, ignoreTimezone: false,
weekMode : 'variable', weekMode : 'variable',

@ -1,138 +1,135 @@
/* /*!
* FullCalendar v1.5.4 Stylesheet * FullCalendar v1.6.1 Stylesheet
* * Docs & License: http://arshaw.com/fullcalendar/
* Copyright (c) 2011 Adam Shaw * (c) 2013 Adam Shaw
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
* Date: Tue Sep 4 23:38:33 2012 -0700
*
*/ */
.fc { .fc {
direction: ltr; direction: ltr;
text-align: left; text-align: left;
} }
.fc table { .fc table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
} }
html .fc, html .fc,
.fc table { .fc table {
font-size: 1em; font-size: 1em;
} }
.fc td, .fc td,
.fc th { .fc th {
padding: 0; padding: 0;
vertical-align: top; vertical-align: top;
} }
/* Header /* Header
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-header td { .fc-header td {
white-space: nowrap; white-space: nowrap;
} }
.fc-header-left { .fc-header-left {
width: 25%; width: 25%;
text-align: left; text-align: left;
} }
.fc-header-center { .fc-header-center {
text-align: center; text-align: center;
} }
.fc-header-right { .fc-header-right {
width: 25%; width: 25%;
text-align: right; text-align: right;
} }
.fc-header-title { .fc-header-title {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
} }
.fc-header-title h2 { .fc-header-title h2 {
margin-top: 0; margin-top: 0;
white-space: nowrap; white-space: nowrap;
} }
.fc .fc-header-space { .fc .fc-header-space {
padding-left: 10px; padding-left: 10px;
} }
.fc-header .fc-button { .fc-header .fc-button {
margin-bottom: 1em; margin-bottom: 1em;
vertical-align: top; vertical-align: top;
} }
/* buttons edges butting together */ /* buttons edges butting together */
.fc-header .fc-button { .fc-header .fc-button {
margin-right: -1px; margin-right: -1px;
} }
.fc-header .fc-corner-right {
margin-right: 1px; /* back to normal */
}
.fc-header .ui-corner-right { .fc-header .fc-corner-right, /* non-theme */
.fc-header .ui-corner-right { /* theme */
margin-right: 0; /* back to normal */ margin-right: 0; /* back to normal */
} }
/* button layering (for border precedence) */ /* button layering (for border precedence) */
.fc-header .fc-state-hover, .fc-header .fc-state-hover,
.fc-header .ui-state-hover { .fc-header .ui-state-hover {
z-index: 2; z-index: 2;
} }
.fc-header .fc-state-down { .fc-header .fc-state-down {
z-index: 3; z-index: 3;
} }
.fc-header .fc-state-active, .fc-header .fc-state-active,
.fc-header .ui-state-active { .fc-header .ui-state-active {
z-index: 4; z-index: 4;
} }
/* Content /* Content
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-content { .fc-content {
clear: both; clear: both;
} }
.fc-view { .fc-view {
width: 100%; /* needed for view switching (when view is absolute) */ width: 100%; /* needed for view switching (when view is absolute) */
/*overflow: hidden;*/ overflow: hidden;
} }
/* Cell Styles /* Cell Styles
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-widget-header, /* <th>, usually */ .fc-widget-header, /* <th>, usually */
.fc-widget-content { .fc-widget-content { /* <td>, usually */
/* <td>, usually */ border: 1px solid #ddd;
border: 1px solid #cccccc; }
}
.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
.fc-state-highlight { background: #fcf8e3;
/* <td> today cell */ }
/* TODO: add .fc-today to <th> */
background: #ffffcc; .fc-cell-overlay { /* semi-transparent rectangle while dragging */
} background: #bce8f1;
opacity: .3;
.fc-cell-overlay { filter: alpha(opacity=30); /* for IE */
/* semi-transparent rectangle while dragging */ }
background: #99ccff;
opacity: .2;
filter: alpha(opacity=20); /* for IE */
}
/* Buttons /* Buttons
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -140,168 +137,162 @@ html .fc,
.fc-button { .fc-button {
position: relative; position: relative;
display: inline-block; display: inline-block;
cursor: pointer; padding: 0 .6em;
}
.fc-state-default {
/* non-theme */
border-style: solid;
border-width: 1px 0;
}
.fc-button-inner {
position: relative;
float: left;
overflow: hidden; overflow: hidden;
}
.fc-state-default .fc-button-inner {
/* non-theme */
border-style: solid;
border-width: 0 1px;
}
.fc-button-content {
position: relative;
float: left;
height: 1.9em; height: 1.9em;
line-height: 1.9em; line-height: 1.9em;
padding: 0 .6em;
white-space: nowrap; white-space: nowrap;
} cursor: pointer;
}
.fc-state-default { /* non-theme */
border: 1px solid;
}
.fc-state-default.fc-corner-left { /* non-theme */
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
.fc-state-default.fc-corner-right { /* non-theme */
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
/*
Our default prev/next buttons use HTML entities like &lsaquo; &rsaquo; &laquo; &raquo;
and we'll try to make them look good cross-browser.
*/
.fc-text-arrow {
margin: 0 .1em;
font-size: 2em;
font-family: "Courier New", Courier, monospace;
vertical-align: baseline; /* for IE7 */
}
.fc-button-prev .fc-text-arrow,
.fc-button-next .fc-text-arrow { /* for &lsaquo; &rsaquo; */
font-weight: bold;
}
/* icon (for jquery ui) */ /* icon (for jquery ui) */
.fc-button-content .fc-icon-wrap { .fc-button .fc-icon-wrap {
position: relative; position: relative;
float: left; float: left;
top: 50%; top: 50%;
} }
.fc-button-content .ui-icon { .fc-button .ui-icon {
position: relative; position: relative;
float: left; float: left;
margin-top: -50%; margin-top: -50%;
*margin-top: 0; *margin-top: 0;
*top: -50%; *top: -50%;
} }
/* gloss effect */ /*
button states
borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
*/
.fc-state-default .fc-button-effect { .fc-state-default {
position: absolute; background-color: #f5f5f5;
top: 50%; background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
left: 0; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
} background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
.fc-state-default .fc-button-effect span { background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
position: absolute; background-repeat: repeat-x;
top: -100px; border-color: #e6e6e6 #e6e6e6 #bfbfbf;
left: 0; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
width: 500px; color: #333;
height: 100px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
border-width: 100px 0 0 1px; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
border-style: solid; }
border-color: #ffffff;
background: #444444;
opacity: .09;
filter: alpha(opacity=9);
}
/* button states (determines colors) */
.fc-state-default,
.fc-state-default .fc-button-inner {
border-style: solid;
border-color: #cccccc #bbbbbb #aaaaaa;
background: #f3f3f3;
color: #000000;
}
.fc-state-hover, .fc-state-hover,
.fc-state-hover .fc-button-inner {
border-color: #999999;
}
.fc-state-down, .fc-state-down,
.fc-state-down .fc-button-inner {
border-color: #555555;
background: #777777;
}
.fc-state-active, .fc-state-active,
.fc-state-active .fc-button-inner { .fc-state-disabled {
border-color: #555555; color: #333333;
background: #777777; background-color: #e6e6e6;
color: #ffffff; }
}
.fc-state-hover {
.fc-state-disabled, color: #333333;
.fc-state-disabled .fc-button-inner { text-decoration: none;
color: #999999; background-position: 0 -15px;
border-color: #dddddd; -webkit-transition: background-position 0.1s linear;
} -moz-transition: background-position 0.1s linear;
-o-transition: background-position 0.1s linear;
transition: background-position 0.1s linear;
}
.fc-state-down,
.fc-state-active {
background-color: #cccccc;
background-image: none;
outline: 0;
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.fc-state-disabled { .fc-state-disabled {
cursor: default; cursor: default;
} background-image: none;
opacity: 0.65;
filter: alpha(opacity=65);
box-shadow: none;
}
.fc-state-disabled .fc-button-effect {
display: none;
}
/* Global Event Styles /* Global Event Styles
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-event { .fc-event {
border-style: solid; border: 1px solid #3a87ad; /* default BORDER color */
border-width: 0; background-color: #3a87ad; /* default BACKGROUND color */
color: #fff; /* default TEXT color */
font-size: .85em; font-size: .85em;
cursor: default; cursor: default;
} }
a.fc-event {
text-decoration: none;
}
a.fc-event, a.fc-event,
.fc-event-draggable { .fc-event-draggable {
cursor: pointer; cursor: pointer;
} }
a.fc-event {
text-decoration: none;
}
.fc-rtl .fc-event { .fc-rtl .fc-event {
text-align: right; text-align: right;
} }
.fc-event-skin {
border-color: #3366cc; /* default BORDER color */
background-color: #3366cc; /* default BACKGROUND color */
color: #ffffff; /* default TEXT color */
}
.fc-event-inner { .fc-event-inner {
position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-style: solid;
border-width: 0;
overflow: hidden; overflow: hidden;
} }
.fc-event-time, .fc-event-time,
.fc-event-title { .fc-event-title {
padding: 0 1px; padding: 0 1px;
} }
.fc .ui-resizable-handle { .fc .ui-resizable-handle {
/*** TODO: don't use ui-resizable anymore, change class ***/
display: block; display: block;
position: absolute; position: absolute;
z-index: 99999; z-index: 99999;
overflow: hidden; /* hacky spaces (IE6/7) */ overflow: hidden; /* hacky spaces (IE6/7) */
font-size: 300%; /* */ font-size: 300%; /* */
line-height: 50%; /* */ line-height: 50%; /* */
} }
/* Horizontal Events /* Horizontal Events
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -309,7 +300,21 @@ a.fc-event {
.fc-event-hori { .fc-event-hori {
border-width: 1px 0; border-width: 1px 0;
margin-bottom: 1px; margin-bottom: 1px;
} }
.fc-ltr .fc-event-hori.fc-event-start,
.fc-rtl .fc-event-hori.fc-event-end {
border-left-width: 1px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.fc-ltr .fc-event-hori.fc-event-end,
.fc-rtl .fc-event-hori.fc-event-start {
border-right-width: 1px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
/* resizable */ /* resizable */
@ -319,7 +324,7 @@ a.fc-event {
width: 7px !important; width: 7px !important;
height: 100% !important; height: 100% !important;
cursor: e-resize; cursor: e-resize;
} }
.fc-event-hori .ui-resizable-w { .fc-event-hori .ui-resizable-w {
top: 0 !important; top: 0 !important;
@ -327,106 +332,63 @@ a.fc-event {
width: 7px !important; width: 7px !important;
height: 100% !important; height: 100% !important;
cursor: w-resize; cursor: w-resize;
} }
.fc-event-hori .ui-resizable-handle { .fc-event-hori .ui-resizable-handle {
_padding-bottom: 14px; /* IE6 had 0 height */ _padding-bottom: 14px; /* IE6 had 0 height */
} }
/* Fake Rounded Corners (for buttons and events)
------------------------------------------------------------*/
.fc-corner-left {
margin-left: 1px;
}
.fc-corner-left .fc-button-inner,
.fc-corner-left .fc-event-inner {
margin-left: -1px;
}
.fc-corner-right {
margin-right: 1px;
}
.fc-corner-right .fc-button-inner,
.fc-corner-right .fc-event-inner {
margin-right: -1px;
}
.fc-corner-top {
margin-top: 1px;
}
.fc-corner-top .fc-event-inner {
margin-top: -1px;
}
.fc-corner-bottom {
margin-bottom: 1px;
}
.fc-corner-bottom .fc-event-inner {
margin-bottom: -1px;
}
/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
-----------------------------------------------------------------*/
.fc-corner-left .fc-event-inner {
border-left-width: 1px;
}
.fc-corner-right .fc-event-inner {
border-right-width: 1px;
}
.fc-corner-top .fc-event-inner {
border-top-width: 1px;
}
.fc-corner-bottom .fc-event-inner {
border-bottom-width: 1px;
}
/* Reusable Separate-border Table /* Reusable Separate-border Table
------------------------------------------------------------*/ ------------------------------------------------------------*/
table.fc-border-separate { table.fc-border-separate {
border-collapse: separate; border-collapse: separate;
} }
.fc-border-separate th, .fc-border-separate th,
.fc-border-separate td { .fc-border-separate td {
border-width: 1px 0 0 1px; border-width: 1px 0 0 1px;
} }
.fc-border-separate th.fc-last, .fc-border-separate th.fc-last,
.fc-border-separate td.fc-last { .fc-border-separate td.fc-last {
border-right-width: 1px; border-right-width: 1px;
} }
.fc-border-separate tr.fc-last th, .fc-border-separate tr.fc-last th,
.fc-border-separate tr.fc-last td { .fc-border-separate tr.fc-last td {
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.fc-border-separate tbody tr.fc-first td, .fc-border-separate tbody tr.fc-first td,
.fc-border-separate tbody tr.fc-first th { .fc-border-separate tbody tr.fc-first th {
border-top-width: 0; border-top-width: 0;
} }
/* Month View, Basic Week View, Basic Day View /* Month View, Basic Week View, Basic Day View
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-grid th { .fc-grid th {
text-align: center; text-align: center;
} }
.fc .fc-week-number {
width: 22px;
text-align: center;
}
.fc .fc-week-number div {
padding: 0 2px;
}
.fc-grid .fc-day-number { .fc-grid .fc-day-number {
float: right; float: right;
padding: 0 2px; padding: 0 2px;
} }
.fc-grid .fc-other-month .fc-day-number { .fc-grid .fc-other-month .fc-day-number {
opacity: 0.3; opacity: 0.3;
@ -434,39 +396,41 @@ table.fc-border-separate {
/* opacity with small font can sometimes look too faded /* opacity with small font can sometimes look too faded
might want to set the 'color' property instead might want to set the 'color' property instead
making day-numbers bold also fixes the problem */ making day-numbers bold also fixes the problem */
} }
.fc-grid .fc-day-content { .fc-grid .fc-day-content {
clear: both; clear: both;
padding: 2px 2px 1px; /* distance between events and day edges */ padding: 2px 2px 1px; /* distance between events and day edges */
} }
/* event styles */ /* event styles */
.fc-grid .fc-event-time { .fc-grid .fc-event-time {
font-weight: bold; font-weight: bold;
} }
/* right-to-left */ /* right-to-left */
.fc-rtl .fc-grid .fc-day-number { .fc-rtl .fc-grid .fc-day-number {
float: left; float: left;
} }
.fc-rtl .fc-grid .fc-event-time { .fc-rtl .fc-grid .fc-event-time {
float: right; float: right;
} }
/* Agenda Week View, Agenda Day View /* Agenda Week View, Agenda Day View
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-agenda table { .fc-agenda table {
border-collapse: separate; border-collapse: separate;
} }
.fc-agenda-days th { .fc-agenda-days th {
text-align: center; text-align: center;
} }
.fc-agenda .fc-agenda-axis { .fc-agenda .fc-agenda-axis {
width: 50px; width: 50px;
@ -475,110 +439,124 @@ table.fc-border-separate {
text-align: right; text-align: right;
white-space: nowrap; white-space: nowrap;
font-weight: normal; font-weight: normal;
} }
.fc-agenda .fc-week-number {
font-weight: bold;
}
.fc-agenda .fc-day-content { .fc-agenda .fc-day-content {
padding: 2px 2px 1px; padding: 2px 2px 1px;
} }
/* make axis border take precedence */ /* make axis border take precedence */
.fc-agenda-days .fc-agenda-axis { .fc-agenda-days .fc-agenda-axis {
border-right-width: 1px; border-right-width: 1px;
} }
.fc-agenda-days .fc-col0 { .fc-agenda-days .fc-col0 {
border-left-width: 0; border-left-width: 0;
} }
/* all-day area */ /* all-day area */
.fc-agenda-allday th { .fc-agenda-allday th {
border-width: 0 1px; border-width: 0 1px;
} }
.fc-agenda-allday .fc-day-content { .fc-agenda-allday .fc-day-content {
min-height: 34px; /* TODO: doesnt work well in quirksmode */ min-height: 34px; /* TODO: doesnt work well in quirksmode */
_height: 34px; _height: 34px;
} }
/* divider (between all-day and slots) */ /* divider (between all-day and slots) */
.fc-agenda-divider-inner { .fc-agenda-divider-inner {
height: 2px; height: 2px;
overflow: hidden; overflow: hidden;
} }
.fc-widget-header .fc-agenda-divider-inner { .fc-widget-header .fc-agenda-divider-inner {
background: #eeeeee; background: #eee;
} }
/* slot rows */ /* slot rows */
.fc-agenda-slots th { .fc-agenda-slots th {
border-width: 1px 1px 0; border-width: 1px 1px 0;
} }
.fc-agenda-slots td { .fc-agenda-slots td {
border-width: 1px 0 0; border-width: 1px 0 0;
background: none; background: none;
} }
.fc-agenda-slots td div { .fc-agenda-slots td div {
height: 20px; height: 20px;
} }
.fc-agenda-slots tr.fc-slot0 th, .fc-agenda-slots tr.fc-slot0 th,
.fc-agenda-slots tr.fc-slot0 td { .fc-agenda-slots tr.fc-slot0 td {
border-top-width: 0; border-top-width: 0;
} }
.fc-agenda-slots tr.fc-minor th, .fc-agenda-slots tr.fc-minor th,
.fc-agenda-slots tr.fc-minor td { .fc-agenda-slots tr.fc-minor td {
border-top-style: dotted; border-top-style: dotted;
} }
.fc-agenda-slots tr.fc-minor th.ui-widget-header { .fc-agenda-slots tr.fc-minor th.ui-widget-header {
*border-top-style: solid; /* doesn't work with background in IE6/7 */ *border-top-style: solid; /* doesn't work with background in IE6/7 */
} }
/* Vertical Events /* Vertical Events
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-event-vert { .fc-event-vert {
border-width: 0 1px; border-width: 0 1px;
} }
.fc-event-vert .fc-event-head, .fc-event-vert.fc-event-start {
.fc-event-vert .fc-event-content { border-top-width: 1px;
position: relative; border-top-left-radius: 3px;
z-index: 2; border-top-right-radius: 3px;
width: 100%; }
overflow: hidden;
} .fc-event-vert.fc-event-end {
border-bottom-width: 1px;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
.fc-event-vert .fc-event-time { .fc-event-vert .fc-event-time {
white-space: nowrap; white-space: nowrap;
font-size: 10px; font-size: 10px;
} }
.fc-event-vert .fc-event-bg { .fc-event-vert .fc-event-inner {
/* makes the event lighter w/ a semi-transparent overlay */ position: relative;
z-index: 2;
}
.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #ffffff; background: #fff;
opacity: .3; opacity: .25;
filter: alpha(opacity=30); filter: alpha(opacity=25);
} }
.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */ .fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
.fc-select-helper .fc-event-bg { .fc-select-helper .fc-event-bg {
display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */ display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
} }
/* resizable */ /* resizable */
@ -592,9 +570,10 @@ table.fc-border-separate {
font-family: monospace; font-family: monospace;
text-align: center; text-align: center;
cursor: s-resize; cursor: s-resize;
} }
.fc-agenda .ui-resizable-resizing { .fc-agenda .ui-resizable-resizing { /* TODO: better selector */
/* TODO: better selector */
_overflow: hidden; _overflow: hidden;
} }

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save