From 783ad3502c3eb5ac2f16e7aaad5513f01db62f62 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 20 Jan 2013 18:47:08 -0800 Subject: [PATCH] updated bootstrap styling. --- NzbDrone.Backbone/index.html | 5 ++-- NzbDrone.Web/AddSeries/Views/addSeriesView.js | 8 +++---- NzbDrone.Web/Content2/base.css | 4 +++- NzbDrone.Web/Global.asax.cs | 1 + .../JsLibraries/backbone.marionette.js | 5 +++- NzbDrone.Web/Views/AddSeries/bt.cshtml | 23 +++++++++---------- NzbDrone.Web/Views/Shared/_Bootstrap.cshtml | 8 +++---- 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/NzbDrone.Backbone/index.html b/NzbDrone.Backbone/index.html index 71c084645..aee3b5579 100644 --- a/NzbDrone.Backbone/index.html +++ b/NzbDrone.Backbone/index.html @@ -43,8 +43,7 @@ - - - + + diff --git a/NzbDrone.Web/AddSeries/Views/addSeriesView.js b/NzbDrone.Web/AddSeries/Views/addSeriesView.js index 254b686bf..e8e851b60 100644 --- a/NzbDrone.Web/AddSeries/Views/addSeriesView.js +++ b/NzbDrone.Web/AddSeries/Views/addSeriesView.js @@ -1,16 +1,16 @@ NzbDrone.AddSeriesView = Backbone.Marionette.ItemView.extend({ - template: "#add-series-template", + template: "#add-series-tmpl", initialise: function () { }, - + onRender: function () { - this.$el.find('#myTab a').click(function (e) { + this.$el.find('#myTab a').click(function (e) { e.preventDefault(); $(this).tab('show'); }); }, - + }); NzbDrone.AddNewSeriesView = Backbone.Marionette.ItemView.extend({ diff --git a/NzbDrone.Web/Content2/base.css b/NzbDrone.Web/Content2/base.css index c2b1d3c82..9ae5278f1 100644 --- a/NzbDrone.Web/Content2/base.css +++ b/NzbDrone.Web/Content2/base.css @@ -22,7 +22,6 @@ body { text-transform: lowercase; letter-spacing: -1px; line-height: 110px; - padding-left: 140px; font-family: "Segoe UI Light", "Open Sans", "Segoe UI", sans-serif; font-weight: 100; font-size: 110px; @@ -32,6 +31,9 @@ body { background: white; } +#main-region { + min-height: 600px; +} #footer { text-align: center; diff --git a/NzbDrone.Web/Global.asax.cs b/NzbDrone.Web/Global.asax.cs index 4c158a2dd..d05ee3ba1 100644 --- a/NzbDrone.Web/Global.asax.cs +++ b/NzbDrone.Web/Global.asax.cs @@ -24,6 +24,7 @@ namespace NzbDrone.Web { routes.IgnoreRoute("api/{*pathInfo}"); routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); + routes.IgnoreRoute("{resource}.html"); routes.IgnoreRoute("{*robotstxt}", new { robotstxt = @"(.*/)?robots.txt(/.*)?" }); routes.IgnoreRoute("{*favicon}", new { favicon = @"(.*/)?favicon.ico(/.*)?" }); diff --git a/NzbDrone.Web/JsLibraries/backbone.marionette.js b/NzbDrone.Web/JsLibraries/backbone.marionette.js index 521106c59..ce492751f 100644 --- a/NzbDrone.Web/JsLibraries/backbone.marionette.js +++ b/NzbDrone.Web/JsLibraries/backbone.marionette.js @@ -973,7 +973,9 @@ var Marionette = (function (Backbone, _, $) { // this method to provide your own template retrieval, // such as asynchronous loading from a server. loadTemplate: function (templateId) { - var template = $(templateId).html(); + + var templateEl = $(templateId); + var template = templateEl.html(); if (!template || template.length === 0) { var msg = "Could not find template: '" + templateId + "'"; @@ -982,6 +984,7 @@ var Marionette = (function (Backbone, _, $) { throw err; } + templateEl.remove(); return template; }, diff --git a/NzbDrone.Web/Views/AddSeries/bt.cshtml b/NzbDrone.Web/Views/AddSeries/bt.cshtml index 3458a8df1..a730c8922 100644 --- a/NzbDrone.Web/Views/AddSeries/bt.cshtml +++ b/NzbDrone.Web/Views/AddSeries/bt.cshtml @@ -3,25 +3,24 @@ Layout = "~/Views/Shared/_Bootstrap.cshtml"; } - @* + +@section Templates +{ + +}

Add Existing

Single Series

diff --git a/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml b/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml index 32cc7fb40..36ae6738e 100644 --- a/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml +++ b/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml @@ -26,9 +26,7 @@ @Bundles.RenderStylesheets() - + @RenderBody()
-
+