mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

updated bootstrap styling.

This commit is contained in:
kay.one 2013-01-20 18:47:08 -08:00
parent 1e26b2513c
commit 783ad3502c
7 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NzbDrone.Backbone/index.html
View File

@ -43,8 +43,7 @@
<script src="app.js" type="text/javascript"></script> <script src="app.js" type="text/javascript"></script>
<script src="AddSeries/Views/addSeriesView.js" type="text/javascript"></script> <script src="AddSeries/Views/addSeriesView.js" type="text/javascript"></script>
<script src="bootstrap.js" type="text/javascript"></script>
</body> </body>
</html> </html>

8
NzbDrone.Web/AddSeries/Views/addSeriesView.js
View File

@ -1,16 +1,16 @@
NzbDrone.AddSeriesView = Backbone.Marionette.ItemView.extend({ NzbDrone.AddSeriesView = Backbone.Marionette.ItemView.extend({
template: "#add-series-template", template: "#add-series-tmpl",
initialise: function () { initialise: function () {
}, },
onRender: function () { onRender: function () {
this.$el.find('#myTab a').click(function (e) { this.$el.find('#myTab a').click(function (e) {
e.preventDefault(); e.preventDefault();
$(this).tab('show'); $(this).tab('show');
}); });
}, },
}); });
NzbDrone.AddNewSeriesView = Backbone.Marionette.ItemView.extend({ NzbDrone.AddNewSeriesView = Backbone.Marionette.ItemView.extend({

4
NzbDrone.Web/Content2/base.css
View File

@ -22,7 +22,6 @@ body {
text-transform: lowercase; text-transform: lowercase;
letter-spacing: -1px; letter-spacing: -1px;
line-height: 110px; line-height: 110px;
padding-left: 140px;
font-family: "Segoe UI Light", "Open Sans", "Segoe UI", sans-serif; font-family: "Segoe UI Light", "Open Sans", "Segoe UI", sans-serif;
font-weight: 100; font-weight: 100;
font-size: 110px; font-size: 110px;
@ -32,6 +31,9 @@ body {
background: white; background: white;
} }
#main-region {
min-height: 600px;
}
#footer { #footer {
text-align: center; text-align: center;

1
NzbDrone.Web/Global.asax.cs
View File

@ -24,6 +24,7 @@ namespace NzbDrone.Web
{ {
routes.IgnoreRoute("api/{*pathInfo}"); routes.IgnoreRoute("api/{*pathInfo}");
routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
routes.IgnoreRoute("{resource}.html");
routes.IgnoreRoute("{*robotstxt}", new { robotstxt = @"(.*/)?robots.txt(/.*)?" }); routes.IgnoreRoute("{*robotstxt}", new { robotstxt = @"(.*/)?robots.txt(/.*)?" });
routes.IgnoreRoute("{*favicon}", new { favicon = @"(.*/)?favicon.ico(/.*)?" }); routes.IgnoreRoute("{*favicon}", new { favicon = @"(.*/)?favicon.ico(/.*)?" });

5
NzbDrone.Web/JsLibraries/backbone.marionette.js
View File

@ -973,7 +973,9 @@ var Marionette = (function (Backbone, _, $) {
// this method to provide your own template retrieval, // this method to provide your own template retrieval,
// such as asynchronous loading from a server. // such as asynchronous loading from a server.
loadTemplate: function (templateId) { loadTemplate: function (templateId) {
var template = $(templateId).html();
var templateEl = $(templateId);
var template = templateEl.html();
if (!template || template.length === 0) { if (!template || template.length === 0) {
var msg = "Could not find template: '" + templateId + "'"; var msg = "Could not find template: '" + templateId + "'";
@ -982,6 +984,7 @@ var Marionette = (function (Backbone, _, $) {
throw err; throw err;
} }
templateEl.remove();
return template; return template;
}, },

23
NzbDrone.Web/Views/AddSeries/bt.cshtml
View File

@ -3,25 +3,24 @@
Layout = "~/Views/Shared/_Bootstrap.cshtml"; Layout = "~/Views/Shared/_Bootstrap.cshtml";
} }
<script type="text/template" id="add-series-template">
<div id="add-series" class="row">
<div id="add-series-tmpl" class="row">
<ul class="nav nav-tabs" id="myTab"> <ul class="nav nav-tabs" id="myTab">
<li class="active"><a href="#home">Home</a></li> <li class="active"><a href="#add-new">Add New Series</a></li>
<li><a href="#profile">Profile</a></li> <li><a href="#import-existing">Import Existing Series</a></li>
<li><a href="#messages">Messages</a></li>
<li><a href="#settings">Settings</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="home">.eeeeee..</div> <div class="tab-pane active" id="add-new"> Add new series!</div>
<div class="tab-pane" id="profile">...ddddd</div> <div class="tab-pane" id="import-existing">Import exisintg.</div>
<div class="tab-pane" id="messages">..dddd.</div>
<div class="tab-pane" id="settings">..ggggggggggggggggggggggg.</div>
</div> </div>
</div> </div>
</script>
@* @*
@section Templates
{
}
<div id="add-existing-series"> <div id="add-existing-series">
<h1>Add Existing</h1> <h1>Add Existing</h1>
<h2 id="single">Single Series</h2> <h2 id="single">Single Series</h2>

8
NzbDrone.Web/Views/Shared/_Bootstrap.cshtml
View File

@ -26,9 +26,7 @@
@Bundles.RenderStylesheets() @Bundles.RenderStylesheets()
</head> </head>
<body> <body>
<script type="text/template" id="search_template"> @RenderBody()
@RenderBody()
</script>
<div class="container"> <div class="container">
<div id="menu" class="row"> <div id="menu" class="row">
@ -48,7 +46,7 @@
</div> </div>
</div> </div>
<div id="logo" class="row"> <div id="logo" class="row">
<div class="span12"> <div class="span10 offset1">
@ViewBag.Title @ViewBag.Title
</div> </div>
</div> </div>
@ -58,7 +56,7 @@
@RenderSection("ActionMenu", required: false) @RenderSection("ActionMenu", required: false)
</div> </div>
<div class="row"> <div class="row">
<div id="main-region"></div> <div id="main-region" class="span12"></div>
</div> </div>
</div> </div>
</div> </div>