stuff we did :D

UI/Settings/Naming/NamingTemplate.html

@@ -5,9 +5,7 @@
         <label class="control-label">Use Scene Name</label>
 
         <div class="controls">
-            <div class="switch">
-                <input type="checkbox" name="sortingUseSceneName"/>
-            </div>
+            <input type="checkbox" name="useSceneName"/>
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Use the scene name, ignoring all other naming settings"></i>
             </span>
@@ -15,12 +13,10 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label">Series Name</label>
+        <label class="control-label">Include Series Title</label>
 
         <div class="controls">
-            <div class="switch">
-                <input type="checkbox" name="sortingIncludeSeriesName"/>
-            </div>
+            <input type="checkbox" name="includeSeriesTitle"/>
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Should filenames contain the series name when renamed?"></i>
             </span>
@@ -28,12 +24,10 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label">Episode Name</label>
+        <label class="control-label">Include Episode Title</label>
 
         <div class="controls">
-            <div class="switch">
-                <input type="checkbox" name="sortingIncludeEpisodeTitle"/>
-            </div>
+            <input type="checkbox" name="includeEpisodeTitle"/>
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Should filenames contain the episode name when renamed?"></i>
             </span>
@@ -45,7 +39,7 @@
 
         <div class="controls">
             <div class="switch">
-                <input type="checkbox" name="sortingReplaceSpaces"/>
+                <input type="checkbox" name="replaceSpaces"/>
             </div>
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Do you want to replace spaces in the filename with periods?"></i>
@@ -54,11 +48,11 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label">Append Quality</label>
+        <label class="control-label">Include Quality</label>
 
         <div class="controls">
             <div class="switch">
-                <input type="checkbox" name="sortingAppendQuality"/>
+                <input type="checkbox" name="includeQuality"/>
             </div>
         <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="Should filenames have the quality appended to the end?"></i>
@@ -67,25 +61,11 @@
         </div>
     </div>
 
-    <div class="control-group">
-        <label class="control-label">Use Season Folders</label>
-
-        <div class="controls">
-            <div class="switch">
-                <input type="checkbox" name="useSeasonFolder"/>
-            </div>
-            <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Should files be stored in season folders by default? (Applied only when a series is added)"></i>
-            </span>
-
-        </div>
-    </div>
-
     <div class="control-group">
         <label class="control-label">Season Folder Format</label>
 
         <div class="controls">
-            <input type="text" placeholder="Season %s" name="sortingSeasonFolderFormat"/>
+            <input type="text" placeholder="Season %s" name="seasonFolderFormat"/>
             <span class="help-inline">
                 <i class="icon-question-sign" title="How should season folders be named? (Use %0s to pad to two digits)"></i>
             </span>
@@ -93,13 +73,13 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label">Separator Style</label>
+        <label class="control-label">Separator</label>
 
         <div class="controls">
-            <select class="inputClass x-backlog-setting" name="sortingSeparatorStyle">
-                <option value="0">Dash</option>
-                <option value="1">Space</option>
-                <option value="2">Period</option>
+            <select class="inputClass x-backlog-setting" name="separator">
+                <option value=" - ">Dash</option>
+                <option value=" ">Space</option>
+                <option value=".">Period</option>
             </select>
             <span class="help-inline">
                 <i class="icon-question-sign" title="How should NzbDrone separate sections of the filename?"></i>
@@ -111,7 +91,7 @@
         <label class="control-label">Numbering Style</label>
 
         <div class="controls">
-            <select class="inputClass x-backlog-setting" name="sortingNumberStyle">
+            <select class="inputClass x-backlog-setting" name="numberStyle">
                 <option value="0">1x05</option>
                 <option value="1">01x05</option>
                 <option value="2">S01E05</option>
@@ -127,7 +107,7 @@
         <label class="control-label">Multi-Episode Style</label>
 
         <div class="controls">
-            <select class="inputClass x-backlog-setting" name="sortingMultiEpisodeStyle">
+            <select class="inputClass x-backlog-setting" name="multiEpisodeStyle">
                 <option value="0">Extend</option>
                 <option value="1">Duplicate</option>
                 <option value="2">Repeat</option>
@@ -168,4 +148,4 @@
             </span>
         </div>
     </div>
-</fieldset>
+</fieldset>