From 4cca5d21b1bae5bba517023e2930320ec2303768 Mon Sep 17 00:00:00 2001
From: "kay.one" <kay.one@gmail.com>
Date: Sat, 26 Jan 2013 12:05:08 -0800
Subject: [PATCH] more add series updates.

---
 NzbDrone.Web/NzbDrone.Web.csproj              |  2 ++
 .../AddNewSeries/AddNewSeriesTemplate.html    |  5 ++--
 .../AddNewSeries/AddNewSeriesView.js          | 28 +++++++++++--------
 .../AddNewSeries/SearchResultTemplate.html    |  4 +--
 .../_backboneApp/AddSeries/AddSeriesLayout.js |  1 +
 .../_backboneApp/AddSeries/addSeries.css      |  4 +++
 NzbDrone.Web/_backboneApp/Content/base.css    |  7 +++++
 .../_backboneApp/Shared/SpinnerTemplate.html  |  1 +
 .../_backboneApp/Shared/SpinnerView.js        |  8 ++++++
 NzbDrone.Web/_backboneApp/app.js              | 18 ++++++------
 10 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100644 NzbDrone.Web/_backboneApp/Shared/SpinnerTemplate.html
 create mode 100644 NzbDrone.Web/_backboneApp/Shared/SpinnerView.js

diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 9c3f5ee16..7b004ad0e 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -385,6 +385,8 @@
     <Content Include="_backboneApp\JsLibraries\backbone.js" />
     <Content Include="_backboneApp\JsLibraries\backbone.marionette.js" />
     <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" />
     <Content Include="_backboneApp\JsLibraries\backbone.collectionbinder.js" />
     <Content Include="_backboneApp\JsLibraries\backbone.debug.js" />
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesTemplate.html b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesTemplate.html
index e9ae99b65..aa0ef6804 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesTemplate.html
+++ b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesTemplate.html
@@ -1,8 +1,9 @@
 <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>
         <input type="text" class="span10" placeholder="Start typing the name of series you want to add ...">
     </div>
-    <div id="search-result" class="result-list span12 offset4">
+    <div class="row">
+        <div id="search-result" class="result-list span12 offset4" />
     </div>
 </div>
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js
index 7f0998e48..e425004dd 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js
+++ b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js
@@ -5,7 +5,7 @@
 NzbDrone.AddSeries.SearchItemView = Backbone.Marionette.ItemView.extend({
 
     template: "AddSeries/AddNewSeries/SearchResultTemplate",
-    className: 'well',
+    className: 'search-item-view well',
     onRender: function () {
         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({
     template: "AddSeries/AddNewSeries/AddNewSeriesTemplate",
-    route : "Series/add/new",
+    route: "Series/add/new",
 
     ui: {
         seriesSearch: '.search input'
@@ -36,9 +36,8 @@ NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
 
     collection: new NzbDrone.AddSeries.SearchResultCollection(),
 
-    onRender: function () {
 
-        //NzbDrone.Router.navigate(this.route, { trigger: true });
+    onRender: function () {
         console.log('binding auto complete');
         var self = this;
 
@@ -49,20 +48,27 @@ NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
                 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) {
 
         var term = context.ui.seriesSearch.val();
+        context.collection.reset();
+
+        if (term != "") {
+            context.searchResult.show(new NzbDrone.Shared.SpinnerView());
 
-        if (term == "") {
-            context.collection.reset();
+            context.collection.fetch({
+                data: $.param({ term: term }),
+                success: function () {
+                    context.searchResult.show(context.resultView);
+                }
+                
+            });
         } else {
-            console.log(term);
-            context.collection.fetch({ data: $.param({ term: term }) });
+            context.searchResult.close();
         }
-
-
     },
 });
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/SearchResultTemplate.html b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/SearchResultTemplate.html
index 595a76716..5241a049c 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/SearchResultTemplate.html
+++ b/NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/SearchResultTemplate.html
@@ -1,7 +1,5 @@
 <div class="result-item row">
     <div>
-        <a href="http://thetvdb.com/?tab=series&id={{id}}" target="_blank" class="icon-link"></a>{{seriesName}} ({{seriesYear}})
-        <div class="btn btn-info pull-right icon-plus" />
+        <a href="http://thetvdb.com/?tab=series&id={{id}}" target="_blank" class="icon-info-sign"></a>{{seriesName}} ({{seriesYear}})
     </div>
-
 </div>
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js b/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
index 3ca4241e7..8b0fa4edc 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
+++ b/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
@@ -1,6 +1,7 @@
 /// <reference path="../app.js" />
 /// <reference path="AddNewSeries/AddNewSeriesView.js" />
 /// <reference path="RootDir/RootDirView.js" />
+/// <reference path="../Shared/SpinnerView.js" />
 
 NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
     template: "AddSeries/addSeriesLayoutTemplate",
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css b/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
index 891716249..1c0aef6a7 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
+++ b/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
@@ -29,6 +29,10 @@
     padding-left: 20px;
 }
 
+.result-item *[class*='icon-'] {
+    padding-right: 10px;
+}
+
 .result-list .result-item a {
     font-size: 20px;
 }
diff --git a/NzbDrone.Web/_backboneApp/Content/base.css b/NzbDrone.Web/_backboneApp/Content/base.css
index 913aa23da..8d07034b3 100644
--- a/NzbDrone.Web/_backboneApp/Content/base.css
+++ b/NzbDrone.Web/_backboneApp/Content/base.css
@@ -51,3 +51,10 @@ body {
     #footer a:hover {
         text-decoration: underline;
     }
+
+
+.nz-spinner {
+    font-size: 56px;
+    text-align: center;
+    padding: 30px;
+}
diff --git a/NzbDrone.Web/_backboneApp/Shared/SpinnerTemplate.html b/NzbDrone.Web/_backboneApp/Shared/SpinnerTemplate.html
new file mode 100644
index 000000000..43c430f33
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/Shared/SpinnerTemplate.html
@@ -0,0 +1 @@
+<i class="icon-spinner icon-spin"></i>
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/Shared/SpinnerView.js b/NzbDrone.Web/_backboneApp/Shared/SpinnerView.js
new file mode 100644
index 000000000..9c04c03c2
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/Shared/SpinnerView.js
@@ -0,0 +1,8 @@
+/// <reference path="../app.js" />
+
+NzbDrone.Shared.SpinnerView = Backbone.Marionette.ItemView.extend({
+
+    template: "Shared/SpinnerTemplate",
+    className: 'nz-spinner row',
+   
+});
diff --git a/NzbDrone.Web/_backboneApp/app.js b/NzbDrone.Web/_backboneApp/app.js
index efe9b9ded..7b59464c9 100644
--- a/NzbDrone.Web/_backboneApp/app.js
+++ b/NzbDrone.Web/_backboneApp/app.js
@@ -18,6 +18,7 @@ if (typeof console == "undefined") {
 
 NzbDrone = new Backbone.Marionette.Application();
 NzbDrone.AddSeries = NzbDrone.module("AddSeries");
+NzbDrone.Shared = NzbDrone.module("Shared");
 
 _.templateSettings = {
     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 () {
-            NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout());
-        },
+    addSeries: function () {
+        NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout());
+    },
 
 
-        notFound: function () {
-            alert('route not found');
-        },
-    });
+    notFound: function () {
+        alert('route not found');
+    },
+});
 
 
 NzbDrone.Router = Backbone.Marionette.AppRouter.extend({