updated bootstrap styling.

pull/23/head
kay.one 12 years ago
parent 1e26b2513c
commit 783ad3502c

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

@ -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({

@ -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;

@ -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(/.*)?" });

@ -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;
},

@ -3,25 +3,24 @@
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">
<li class="active"><a href="#home">Home</a></li>
<li><a href="#profile">Profile</a></li>
<li><a href="#messages">Messages</a></li>
<li><a href="#settings">Settings</a></li>
<li class="active"><a href="#add-new">Add New Series</a></li>
<li><a href="#import-existing">Import Existing Series</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="home">.eeeeee..</div>
<div class="tab-pane" id="profile">...ddddd</div>
<div class="tab-pane" id="messages">..dddd.</div>
<div class="tab-pane" id="settings">..ggggggggggggggggggggggg.</div>
<div class="tab-pane active" id="add-new"> Add new series!</div>
<div class="tab-pane" id="import-existing">Import exisintg.</div>
</div>
</div>
</script>
@*
@section Templates
{
}
<div id="add-existing-series">
<h1>Add Existing</h1>
<h2 id="single">Single Series</h2>

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

Loading…
Cancel
Save