diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 36e1623e5..9fcca2db3 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -201,7 +201,6 @@
-
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js b/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
index 11eea1f79..247ee979c 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
+++ b/NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js
@@ -15,17 +15,16 @@ NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
},
ui: {
- addNewTab: ".nav-tabs a[href='#add-new']",
- importTab: ".nav-tabs a[href='#import-existing']",
- rootDirTab: ".nav-tabs a[href='#root-folders']",
- rootTabRequiredMessage: "",
+ addNewTab: ".x-add-new-tab",
+ importExistingTab: ".x-import-existing-tab",
+ rootFoldersTab: ".x-root-folders-tab",
},
events: {
- "click .nav-tabs a[href='#add-new']": 'showAddNew',
- "click .nav-tabs a[href='#import-existing']": 'showImport',
- "click .nav-tabs a[href='#root-folders']": 'showRootFolders',
+ "click .x-add-new-tab": 'showAddNew',
+ "click .x-import-existing-tab": 'showImport',
+ "click .x-root-folders-tab": 'showRootFolders',
},
showAddNew: function (e) {
@@ -39,14 +38,14 @@ NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
showImport: function (e) {
if (e) e.preventDefault();
- this.ui.importTab.tab('show');
+ this.ui.importExistingTab.tab('show');
NzbDrone.Router.navigate('series/add/import');
},
showRootFolders: function (e) {
if (e) e.preventDefault();
- this.ui.rootDirTab.tab('show');
+ this.ui.rootFoldersTab.tab('show');
NzbDrone.Router.navigate('series/add/rootfolders');
},
@@ -93,11 +92,11 @@ NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
evaluateActions: function () {
if (this.rootFolderCollection.length == 0) {
this.ui.addNewTab.hide();
- this.ui.importTab.hide();
+ this.ui.importExistingTab.hide();
this.showRootFolders();
} else {
this.ui.addNewTab.show();
- this.ui.importTab.show();
+ this.ui.importExistingTab.show();
}
},
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirItemTemplate.html b/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirItemTemplate.html
index 1691b90a0..03dff6155 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirItemTemplate.html
+++ b/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirItemTemplate.html
@@ -3,6 +3,6 @@
- |
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirTemplate.html b/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirTemplate.html
index 2f4e33848..06a90a99c 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirTemplate.html
+++ b/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirTemplate.html
@@ -1,8 +1,8 @@
-
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirView.js b/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirView.js
index d5998d74a..29ed1390f 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirView.js
+++ b/NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirView.js
@@ -8,14 +8,14 @@ NzbDrone.AddSeries.RootDirItemView = Backbone.Marionette.ItemView.extend({
tagName: 'tr',
events: {
- 'click #remove-dir': 'removeDir',
+ 'click .x-remove': 'removeFolder',
},
onRender: function () {
NzbDrone.ModelBinder.bind(this.model, this.el);
},
- removeDir: function () {
+ removeFolder: function () {
this.model.destroy({ wait: true });
this.model.collection.remove(this.model);
},
@@ -34,7 +34,7 @@ NzbDrone.AddSeries.RootDirView = Backbone.Marionette.Layout.extend({
route: "series/add/rootdir",
ui: {
- pathInput: '.path input'
+ pathInput: '.x-path input'
},
regions: {
@@ -42,37 +42,20 @@ NzbDrone.AddSeries.RootDirView = Backbone.Marionette.Layout.extend({
},
events: {
- 'click #add-dir': 'addDir',
- },
-
- shortcuts: {
- 'enter': 'addDir'
+ 'click .x-add': 'addFolder',
},
collection: new NzbDrone.AddSeries.RootDirCollection(),
onRender: function () {
- var self = this;
-
- //NzbDrone.Router.navigate(this.route, { trigger: true });
-
- /*
- this.ui.seriesSearch
- .data('timeout', null)
- .keyup(function () {
- clearTimeout(self.$el.data('timeout'));
- self.$el.data('timeout', setTimeout(self.search, 500, self));
- });
- */
this.currentDirs.show(new NzbDrone.AddSeries.RootDirListView({ collection: this.collection }));
-
this.collection.fetch();
},
- addDir: function () {
+ addFolder: function () {
var newDir = new NzbDrone.AddSeries.RootDirModel(
{
Path: this.ui.pathInput.val()
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css b/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
index dd2a4b83b..809a1594a 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
+++ b/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
@@ -21,9 +21,8 @@
text-align: left;
}
- .result-list .well:hover {
+ .result-list .accordion-heading:hover {
background-color: #fcf8e3;
- cursor: pointer;
}
@@ -33,6 +32,10 @@
padding-left: 10px;
}
+.search-item .accordion-body .in {
+ background-color: #fcf8e3;
+}
+
.result-list .result-item a {
font-size: 20px;
}
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/addSeriesLayoutTemplate.html b/NzbDrone.Web/_backboneApp/AddSeries/addSeriesLayoutTemplate.html
index 7446aaa67..da973c799 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/addSeriesLayoutTemplate.html
+++ b/NzbDrone.Web/_backboneApp/AddSeries/addSeriesLayoutTemplate.html
@@ -2,9 +2,9 @@
Heads up! you need to add at least one TV folder.
-->
Add new series.
diff --git a/NzbDrone.Web/_backboneApp/Content/base.css b/NzbDrone.Web/_backboneApp/Content/base.css
index 664c05460..f0868aa5d 100644
--- a/NzbDrone.Web/_backboneApp/Content/base.css
+++ b/NzbDrone.Web/_backboneApp/Content/base.css
@@ -41,14 +41,14 @@ body {
text-align: center;
}
-#footer {
+#footer-region {
font-size: 16px;
text-decoration: none;
font-weight: lighter;
margin: 20px 0 30px 0;
}
- #footer a:hover {
+ #footer-region a:hover {
text-decoration: underline;
}
diff --git a/NzbDrone.Web/_backboneApp/app.js b/NzbDrone.Web/_backboneApp/app.js
index 8c0404f20..3ef1e704b 100644
--- a/NzbDrone.Web/_backboneApp/app.js
+++ b/NzbDrone.Web/_backboneApp/app.js
@@ -11,7 +11,6 @@
///
///
///
-///
if (typeof console == "undefined") {
window.console = { log: function () { } };
diff --git a/NzbDrone.Web/_backboneApp/nzbdrone.logging.js b/NzbDrone.Web/_backboneApp/nzbdrone.logging.js
deleted file mode 100644
index 69069ac09..000000000
--- a/NzbDrone.Web/_backboneApp/nzbdrone.logging.js
+++ /dev/null
@@ -1,3 +0,0 @@
-$(document).ajaxSuccess(function (event, XMLHttpRequest, ajaxOptionsa) {
- console.log(ajaxOptionsa);
-});
\ No newline at end of file