Merging feature/db into feature/trackParse

src/UI/Series/Editor/SeriesEditorFooterView.js

@@ -2,8 +2,8 @@ var _ = require('underscore');
 var Marionette = require('marionette');
 var vent = require('vent');
 var Profiles = require('../../Profile/ProfileCollection');
-var RootFolders = require('../../AddSeries/RootFolders/RootFolderCollection');
-var RootFolderLayout = require('../../AddSeries/RootFolders/RootFolderLayout');
+var RootFolders = require('../../AddArtist/RootFolders/RootFolderCollection');
+var RootFolderLayout = require('../../AddArtist/RootFolders/RootFolderLayout');
 var UpdateFilesSeriesView = require('./Organize/OrganizeFilesView');
 var Config = require('../../Config');
 

src/UI/Series/Index/EmptyTemplate.hbs

@@ -7,7 +7,7 @@
     </div>
     <div class="row">
         <div class="col-md-4 col-md-offset-4">
-            <a href="/addseries" class='btn btn-lg btn-block btn-success x-add-series'>
+            <a href="/addartist" class='btn btn-lg btn-block btn-success x-add-artist'>
                 <i class='icon-lidarr-add'></i>
                 Add Music
             </a>

src/UI/Series/Index/SeriesIndexLayout.js

@@ -81,9 +81,9 @@ module.exports = Marionette.Layout.extend({
         collapse   : true,
         items      : [
             {
-                title : 'Add Series',
+                title : 'Add Artist',
                 icon  : 'icon-lidarr-add',
-                route : 'addseries'
+                route : 'addartist'
             },
             {
                 title : 'Season Pass',