Revert "Merge branch 'rename-existing-folder' into develop"

This reverts commit a340bc4da3, reversing
changes made to 4be7772d53.
This commit is contained in:
Tim Turner
2017-01-28 06:49:02 -05:00
parent 9953a5ed06
commit 5d2ef4786b
12 changed files with 330 additions and 397 deletions
-1
View File
@@ -9,7 +9,6 @@ module.exports = Marionette.ItemView.extend({
//var type = this.model.get('seriesType');
return {
rename : this.naming.get('renameEpisodes'),
folderFormat: this.naming.get('movieFolderFormat'),
format : this.naming.get('standardMovieFormat')
};
},
@@ -1,4 +1,3 @@
{{#if rename}}
Folder Naming pattern: {{folderFormat}}<br>
Naming pattern: {{format}}
{{/if}}
@@ -9,7 +9,7 @@
</div>
<div class="modal-body">
<div class="alert alert-info">
<div class="path-info x-path-info">Your movie may be moved; see the paths below</div>
<div class="path-info x-path-info">All paths are relative to: <strong>{{path}}</strong></div>
<div class="x-format-region"></div>
</div>