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;
$(this.ui.calendar).fullCalendar('addEventSource', this.calendar.toJSON());
},
getEvents : function (start, end, callback) {
var bbView = NzbDrone.Calendar.CalendarCollectionView.Instance;

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

View File

@ -81,23 +81,4 @@ html {
width: 125px;
font-size: 12px;
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 {
background-color: #f6f6f6;
background-color: #252525;
background-image: url('../content/images/black_linen_v2.png');s
}
body p {
@ -15,14 +16,6 @@ body h1, body h2, body h3, body h4, body h5, body h6 {
font-weight: 300;
}
#logo {
color: #333333;
}
a#logo:hover {
text-decoration: none;
}
.page {
width: 1210px;
min-width: 1210px;

View File

@ -2,7 +2,7 @@
define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView',
'Calendar/CalendarCollectionView', 'Shared/NotificationView',
'Shared/NotFoundView', 'MainMenuView', 'HeaderView',
'Shared/NotFoundView', 'MainMenuView',
'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
'Settings/SettingsLayout', 'Missing/MissingCollectionView'],
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.slider.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/toastr.css" rel='stylesheet' type='text/css'>
<link href="/content/fullcalendar.css" rel='stylesheet' type='text/css'>
@ -23,71 +22,61 @@
<link href="/content/form.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="/content/base.css" rel='stylesheet' type='text/css'/>
</head>
<body>
<div id="in-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="row">
<div class="span12">
<ul id="main-menu-region">
<li><a href="/"><i class="icon-film"></i>
<br>
Series</a></li>
<li><a href="/calendar"><i class="icon-calendar"></i>
<br>
Calendar</a></li>
<li><span class="label label-important pull-right">08</span><a href="history"><i class="icon-time"></i><br>
History</a></li>
<li><span class="label label-important pull-right">04</span><a href="missing"><i class="icon-folder-open"></i><br>
Missing</a></li>
<li><a href="settings"><i class="icon-cogs"></i>
<br>
Settings</a></li>
<li><a href="system"><i class="icon-plane"></i>
<br>
System</a></li>
<li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KRTE52U3XJDSQ" target="_blank"><i class="icon-star"></i>
<br>
Donate</a></li>
</ul>
</div>
</div>
</div>
</div>
<div class="page">
<div class="page-container">
<div id="in-sub-nav">
<div class="container">
<div class="row">
<div class="span12 header">
<h4 id="title-region">NZBDRONE</h4>
<div class="span12">
<ul id="main-menu-region">
<li><a href="/"><i class="icon-film"></i>
<br>
Series</a></li>
<li><a href="/calendar"><i class="icon-calendar"></i>
<br>
Calendar</a></li>
<li><span class="label label-important pull-right">08</span><a href="history"><i class="icon-time"></i><br>
History</a></li>
<li><span class="label label-important pull-right">04</span><a href="missing"><i class="icon-folder-open"></i><br>
Missing</a></li>
<li><a href="settings"><i class="icon-cogs"></i>
<br>
Settings</a></li>
<li><a href="system"><i class="icon-plane"></i>
<br>
System</a></li>
<li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KRTE52U3XJDSQ" target="_blank"><i class="icon-star"></i>
<br>
Donate</a></li>
</ul>
</div>
<div class="span12" id="notification-region"/>
</div>
<div class="span12" id="main-region"></div>
<div id="modal-region"></div>
</div>
</div>
</div>
<footer>
<div class="container">
<div class="row">
<div class="span12">
<p>&copy; Copyright 2013 NzbDrone</p>
</div>
</div>
</div>
</footer>
<div class="page">
<div class="page-container">
<div class="container">
<div class="row">
<div class="span12 header">
<h4 id="title-region">NZBDRONE</h4>
</div>
<div class="span12" id="notification-region"/>
</div>
<div class="span12" id="main-region"></div>
<div id="modal-region"></div>
</div>
</div>
</div>
<footer>
<div class="container">
<div class="row">
<div class="span12">
<p>&copy; Copyright 2013 NzbDrone</p>
</div>
</div>
</div>
</footer>
</body>
<script src="/JsLibraries/jquery.js"></script>
<script src="/JsLibraries/bootstrap.js"></script>