more add series updates.

pull/3113/head
kay.one 12 years ago
parent 45bd95ee91
commit 4cca5d21b1

@ -385,6 +385,8 @@
<Content Include="_backboneApp\JsLibraries\backbone.js" /> <Content Include="_backboneApp\JsLibraries\backbone.js" />
<Content Include="_backboneApp\JsLibraries\backbone.marionette.js" /> <Content Include="_backboneApp\JsLibraries\backbone.marionette.js" />
<Content Include="_backboneApp\AddSeries\addSeriesLayoutTemplate.html" /> <Content Include="_backboneApp\AddSeries\addSeriesLayoutTemplate.html" />
<Content Include="_backboneApp\Shared\SpinnerTemplate.html" />
<Content Include="_backboneApp\Shared\SpinnerView.js" />
<None Include="_backboneApp\JsLibraries\jquery-1.8.2.intellisense.js" /> <None Include="_backboneApp\JsLibraries\jquery-1.8.2.intellisense.js" />
<Content Include="_backboneApp\JsLibraries\backbone.collectionbinder.js" /> <Content Include="_backboneApp\JsLibraries\backbone.collectionbinder.js" />
<Content Include="_backboneApp\JsLibraries\backbone.debug.js" /> <Content Include="_backboneApp\JsLibraries\backbone.debug.js" />

@ -1,8 +1,9 @@
<div class="tab-pane" id="add-new"> <div class="tab-pane" id="add-new">
<div class="input-prepend nz-input-large search"> <div class="input-prepend nz-input-large search row">
<i class="add-on icon-search"></i> <i class="add-on icon-search"></i>
<input type="text" class="span10" placeholder="Start typing the name of series you want to add ..."> <input type="text" class="span10" placeholder="Start typing the name of series you want to add ...">
</div> </div>
<div id="search-result" class="result-list span12 offset4"> <div class="row">
<div id="search-result" class="result-list span12 offset4" />
</div> </div>
</div> </div>

@ -5,7 +5,7 @@
NzbDrone.AddSeries.SearchItemView = Backbone.Marionette.ItemView.extend({ NzbDrone.AddSeries.SearchItemView = Backbone.Marionette.ItemView.extend({
template: "AddSeries/AddNewSeries/SearchResultTemplate", template: "AddSeries/AddNewSeries/SearchResultTemplate",
className: 'well', className: 'search-item-view well',
onRender: function () { onRender: function () {
NzbDrone.ModelBinder.bind(this.model, this.el); NzbDrone.ModelBinder.bind(this.model, this.el);
} }
@ -24,7 +24,7 @@ NzbDrone.AddSeries.SearchResultView = Backbone.Marionette.CollectionView.extend(
NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({ NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
template: "AddSeries/AddNewSeries/AddNewSeriesTemplate", template: "AddSeries/AddNewSeries/AddNewSeriesTemplate",
route : "Series/add/new", route: "Series/add/new",
ui: { ui: {
seriesSearch: '.search input' seriesSearch: '.search input'
@ -36,9 +36,8 @@ NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
collection: new NzbDrone.AddSeries.SearchResultCollection(), collection: new NzbDrone.AddSeries.SearchResultCollection(),
onRender: function () {
//NzbDrone.Router.navigate(this.route, { trigger: true }); onRender: function () {
console.log('binding auto complete'); console.log('binding auto complete');
var self = this; var self = this;
@ -49,20 +48,27 @@ NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
self.$el.data('timeout', setTimeout(self.search, 500, self)); self.$el.data('timeout', setTimeout(self.search, 500, self));
}); });
this.searchResult.show(new NzbDrone.AddSeries.SearchResultView({ collection: this.collection })); this.resultView = new NzbDrone.AddSeries.SearchResultView({ collection: this.collection });
}, },
search: function (context) { search: function (context) {
var term = context.ui.seriesSearch.val(); var term = context.ui.seriesSearch.val();
context.collection.reset();
if (term != "") {
context.searchResult.show(new NzbDrone.Shared.SpinnerView());
if (term == "") { context.collection.fetch({
context.collection.reset(); data: $.param({ term: term }),
success: function () {
context.searchResult.show(context.resultView);
}
});
} else { } else {
console.log(term); context.searchResult.close();
context.collection.fetch({ data: $.param({ term: term }) });
} }
}, },
}); });

@ -1,7 +1,5 @@
<div class="result-item row"> <div class="result-item row">
<div> <div>
<a href="http://thetvdb.com/?tab=series&id={{id}}" target="_blank" class="icon-link"></a>{{seriesName}} ({{seriesYear}}) <a href="http://thetvdb.com/?tab=series&id={{id}}" target="_blank" class="icon-info-sign"></a>{{seriesName}} ({{seriesYear}})
<div class="btn btn-info pull-right icon-plus" />
</div> </div>
</div> </div>

@ -1,6 +1,7 @@
/// <reference path="../app.js" /> /// <reference path="../app.js" />
/// <reference path="AddNewSeries/AddNewSeriesView.js" /> /// <reference path="AddNewSeries/AddNewSeriesView.js" />
/// <reference path="RootDir/RootDirView.js" /> /// <reference path="RootDir/RootDirView.js" />
/// <reference path="../Shared/SpinnerView.js" />
NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({ NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
template: "AddSeries/addSeriesLayoutTemplate", template: "AddSeries/addSeriesLayoutTemplate",

@ -29,6 +29,10 @@
padding-left: 20px; padding-left: 20px;
} }
.result-item *[class*='icon-'] {
padding-right: 10px;
}
.result-list .result-item a { .result-list .result-item a {
font-size: 20px; font-size: 20px;
} }

@ -51,3 +51,10 @@ body {
#footer a:hover { #footer a:hover {
text-decoration: underline; text-decoration: underline;
} }
.nz-spinner {
font-size: 56px;
text-align: center;
padding: 30px;
}

@ -0,0 +1 @@
<i class="icon-spinner icon-spin"></i>

@ -0,0 +1,8 @@
/// <reference path="../app.js" />
NzbDrone.Shared.SpinnerView = Backbone.Marionette.ItemView.extend({
template: "Shared/SpinnerTemplate",
className: 'nz-spinner row',
});

@ -18,6 +18,7 @@ if (typeof console == "undefined") {
NzbDrone = new Backbone.Marionette.Application(); NzbDrone = new Backbone.Marionette.Application();
NzbDrone.AddSeries = NzbDrone.module("AddSeries"); NzbDrone.AddSeries = NzbDrone.module("AddSeries");
NzbDrone.Shared = NzbDrone.module("Shared");
_.templateSettings = { _.templateSettings = {
interpolate: /\{\{([\s\S]+?)\}\}/g interpolate: /\{\{([\s\S]+?)\}\}/g
@ -41,18 +42,17 @@ NzbDrone.Routes = {
}, },
}; };
http://localhost:65079/_backboneApp/Content NzbDrone.Controller = Backbone.Marionette.Controller.extend({
NzbDrone.Controller = Backbone.Marionette.Controller.extend({
addSeries: function () { addSeries: function () {
NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout()); NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout());
}, },
notFound: function () { notFound: function () {
alert('route not found'); alert('route not found');
}, },
}); });
NzbDrone.Router = Backbone.Marionette.AppRouter.extend({ NzbDrone.Router = Backbone.Marionette.AppRouter.extend({

Loading…
Cancel
Save