Calendar, theme, awesome.

This commit is contained in:
Mark McDowall 2013-04-19 17:46:56 -07:00 committed by markus101
parent 754c50aeba
commit 09deaf9ad1
7 changed files with 51 additions and 120 deletions

View File

@ -55,7 +55,6 @@ define(['app', 'Calendar/CalendarItemView'], function () {
}); });
NzbDrone.Calendar.CalendarCollectionView.Instance = this; NzbDrone.Calendar.CalendarCollectionView.Instance = this;
$(this.ui.calendar).fullCalendar('addEventSource', this.calendar.toJSON());
}, },
getEvents : function (start, end, callback) { getEvents : function (start, end, callback) {
var bbView = NzbDrone.Calendar.CalendarCollectionView.Instance; var bbView = NzbDrone.Calendar.CalendarCollectionView.Instance;

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

View File

@ -82,22 +82,3 @@ html {
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
} }
/* Todo: Should move this to somehting modal/form specific */
/*label.checkbox {*/
/*font-size: 14px;*/
/*line-height: normal;*/
/*color: #595959;*/
/*}*/
/*label, .form-horizontal input, .form-horizontal select {*/
/*font-size: 14px;*/
/*line-height: 14px;*/
/*}*/
/*label.control-label {*/
/*font-size: 16px;*/
/*line-height: 16px;*/
/*font-weight: bold;*/
/*}*/

View File

@ -1,5 +1,6 @@
body { body {
background-color: #f6f6f6; background-color: #252525;
background-image: url('../content/images/black_linen_v2.png');s
} }
body p { body p {
@ -15,14 +16,6 @@ body h1, body h2, body h3, body h4, body h5, body h6 {
font-weight: 300; font-weight: 300;
} }
#logo {
color: #333333;
}
a#logo:hover {
text-decoration: none;
}
.page { .page {
width: 1210px; width: 1210px;
min-width: 1210px; min-width: 1210px;

View File

@ -2,7 +2,7 @@
define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout', define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView', 'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView',
'Calendar/CalendarCollectionView', 'Shared/NotificationView', 'Calendar/CalendarCollectionView', 'Shared/NotificationView',
'Shared/NotFoundView', 'MainMenuView', 'HeaderView', 'Shared/NotFoundView', 'MainMenuView',
'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection', 'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
'Settings/SettingsLayout', 'Missing/MissingCollectionView'], 'Settings/SettingsLayout', 'Missing/MissingCollectionView'],
function (app, modalRegion) { function (app, modalRegion) {

View File

@ -1,31 +0,0 @@
define(['app'], function () {
NzbDrone.HeaderView = Backbone.Marionette.ItemView.extend({
events: {
'click #logo': 'onClick'
},
onClick: function (event) {
event.preventDefault();
var target = $(event.target);
var href = undefined;
//look down for <a/>
href = event.target.getAttribute('href');
if (href && href.startsWith('http')) {
window.location.href = href;
} else {
NzbDrone.Router.navigate(href, { trigger: true, replace: true });
}
},
initialize: function () {
this.setElement($('#in-nav'));
}
});
return new NzbDrone.HeaderView();
});

View File

@ -12,7 +12,6 @@
<link href="/content/bootstrap.css" rel='stylesheet' type='text/css'/> <link href="/content/bootstrap.css" rel='stylesheet' type='text/css'/>
<link href="/content/bootstrap.slider.css" rel='stylesheet' type='text/css'/> <link href="/content/bootstrap.slider.css" rel='stylesheet' type='text/css'/>
<link href="/content/bootstrapSwitch.css" rel='stylesheet' type='text/css'/> <link href="/content/bootstrapSwitch.css" rel='stylesheet' type='text/css'/>
<link href="/content/base.css" rel='stylesheet' type='text/css'/>
<link href="/content/theme.css" rel='stylesheet' type='text/css'> <link href="/content/theme.css" rel='stylesheet' type='text/css'>
<link href="/content/toastr.css" rel='stylesheet' type='text/css'> <link href="/content/toastr.css" rel='stylesheet' type='text/css'>
<link href="/content/fullcalendar.css" rel='stylesheet' type='text/css'> <link href="/content/fullcalendar.css" rel='stylesheet' type='text/css'>
@ -23,20 +22,10 @@
<link href="/content/form.css" rel='stylesheet' type='text/css'/> <link href="/content/form.css" rel='stylesheet' type='text/css'/>
<link href="/content/settings.quality.css" rel='stylesheet' type='text/css'/> <link href="/content/settings.quality.css" rel='stylesheet' type='text/css'/>
<link href="/series/series.css" rel='stylesheet' type='text/css'/> <link href="/series/series.css" rel='stylesheet' type='text/css'/>
<link href="/content/base.css" rel='stylesheet' type='text/css'/>
</head> </head>
<body> <body>
<div id="in-nav"> <div id="in-sub-nav">
<div class="container">
<div class="row">
<div class=span2>
<a id="logo" href="/">
<h4>Nzb<strong>Drone</strong></h4>
</a>
</div>
</div>
</div>
</div>
<div id="in-sub-nav">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
@ -64,8 +53,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="page"> <div class="page">
<div class="page-container"> <div class="page-container">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -78,8 +67,8 @@
<div id="modal-region"></div> <div id="modal-region"></div>
</div> </div>
</div> </div>
</div> </div>
<footer> <footer>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
@ -87,7 +76,7 @@
</div> </div>
</div> </div>
</div> </div>
</footer> </footer>
</body> </body>
<script src="/JsLibraries/jquery.js"></script> <script src="/JsLibraries/jquery.js"></script>
<script src="/JsLibraries/bootstrap.js"></script> <script src="/JsLibraries/bootstrap.js"></script>