diff --git a/UI/Calendar/CalendarCollectionView.js b/UI/Calendar/CalendarCollectionView.js index 0e34dacf5..04c37b561 100644 --- a/UI/Calendar/CalendarCollectionView.js +++ b/UI/Calendar/CalendarCollectionView.js @@ -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; diff --git a/UI/Content/Images/black_linen_v2.png b/UI/Content/Images/black_linen_v2.png new file mode 100644 index 000000000..d125b4b8a Binary files /dev/null and b/UI/Content/Images/black_linen_v2.png differ diff --git a/UI/Content/base.css b/UI/Content/base.css index 8fb039a54..b596ba63b 100644 --- a/UI/Content/base.css +++ b/UI/Content/base.css @@ -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;*/ -/*}*/ +} \ No newline at end of file diff --git a/UI/Content/theme.css b/UI/Content/theme.css index 293157ca6..231baef4a 100644 --- a/UI/Content/theme.css +++ b/UI/Content/theme.css @@ -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; diff --git a/UI/Controller.js b/UI/Controller.js index 8fdb55c36..da9cbbfdc 100644 --- a/UI/Controller.js +++ b/UI/Controller.js @@ -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) { diff --git a/UI/HeaderView.js b/UI/HeaderView.js deleted file mode 100644 index ed7683f01..000000000 --- a/UI/HeaderView.js +++ /dev/null @@ -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 - 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(); -}); diff --git a/UI/Index.html b/UI/Index.html index 24e63a4fa..75f7204c8 100644 --- a/UI/Index.html +++ b/UI/Index.html @@ -12,7 +12,6 @@ - @@ -23,71 +22,61 @@ + -
-
-
-
- + -
-
-
-
-
- +
+
+
+
+
+

NZBDRONE

+
+
+
+
+
-
-
-
+
-
-

NZBDRONE

+
+

© Copyright 2013 NzbDrone

-
-
-
-
-
-
-
-
-
-

© Copyright 2013 NzbDrone

-
-
-
-
+