From 514844ec2dfa81e68129e0e9e9bfcc7cdcf18fff Mon Sep 17 00:00:00 2001
From: Remy Varma <remyvarma@gmail.com>
Date: Fri, 27 Jan 2012 11:48:03 +0000
Subject: [PATCH] Fixed prowl config layout

---
 data/interfaces/default/config.html | 38 ++++++++++++++++++++------
 data/interfaces/remix/config.html   | 42 ++++++++++++++++++++++++-----
 2 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 028e1f87..29727398 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -321,14 +321,6 @@
 					<br><br>
                     <h3>Log Directory:</h3><input type="text" name="log_dir" value="${config['log_dir']}" size="50">
                 </td>
-                <td>
-                      <h2>Prowl Notification:</h2>
-		      <br>
-                      <h3><input type="checkbox" name="prowl_enabled" value="1" ${config['prowl_enabled']} />Enabled?</h3><br>
-                      <h3>API key:</h3><input type="text" name="prowl_keys" value="${config['prowl_keys']}" size="50"><br><br>
-                      <h3><input type="checkbox" name="prowl_onsnatch" value="1" ${config['prowl_onsnatch']} />Notify on snatch?</h3><br>
-                      <h3>Priority (-2,-1,0,1 or 2):</h3><input type="text" name="prowl_priority" value="${config['prowl_priority']}" size="2">
-                </td>
             </tr>
             <tr>
                 <td>
@@ -428,6 +420,16 @@
                     <h3>Path to Encoder:</h3><input type="text" name="encoderfolder" value="${config['encoderfolder']}" size="43">
                 	</div>
                 </td>
+		<td>
+                      <h2>Prowl Notification:</h2>
+		      <br>
+                      <h3><input type="checkbox" name="prowl_enabled" id="prowl" value="1" ${config['prowl_enabled']} />Enabled Prowl Notification</h3><br>
+                      <div id="prowloptions">
+		      	<h3>API key:</h3><input type="text" name="prowl_keys" value="${config['prowl_keys']}" size="50"><br><br>
+                      	<h3><input type="checkbox" name="prowl_onsnatch" value="1" ${config['prowl_onsnatch']} />Notify on snatch?</h3><br>
+                      	<h3>Priority (-2,-1,0,1 or 2):</h3><input type="text" name="prowl_priority" value="${config['prowl_priority']}" size="2">
+                      </div>
+		</td>
             </tr>
         </table>
     </div>
@@ -460,6 +462,26 @@
 				$("#encoderoptions").hide("fast");
 			}
 		});
+
+		if ($("#prowl").is(":checked"))
+			{
+				$("#prowloptions").show();
+			}
+		else
+			{
+				$("#prowloptions").hide();
+			}
+		
+		$("#prowl").click(function(){
+			if ($("#prowl").is(":checked"))
+			{
+				$("#prowloptions").show("fast");
+			}
+			else
+			{
+				$("#prowloptions").hide("fast");
+			}
+		});
 	});
 	</script>
 </%def>
diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html
index 8fb63f75..29727398 100644
--- a/data/interfaces/remix/config.html
+++ b/data/interfaces/remix/config.html
@@ -54,7 +54,7 @@
 	<div class="table_wrapper">
         <a name="download"><h1><u>Download Settings</u></h1></a>
         <table class="configtable" summary="Download Settings">
-		<tr>
+	    <tr>
                 <td>
                     <h2>SABnzbd:</h2>
                 </td>
@@ -149,7 +149,7 @@
 	<div class="table_wrapper">
         <a name="providers"><h1><u>Search Providers</u></h1></a>
         <table class="configtable" summary="Search Providers">
-            <tr>
+	    <tr>
                 <td>
                     <h2>SABnzbd:</h2>
                 </td>
@@ -246,8 +246,6 @@
                     <h3>Kick Ass Torrents: <input type="checkbox" name="use_kat" value="1" ${config['use_kat']} /></h3>
                 </td>
             </tr>
-            
-            
         </table>
 	</div>
 	<div class="table_wrapper">
@@ -296,7 +294,7 @@
                 	<h2>Renaming Options:</h2>
 					<br>
                     <h3>Folder Format:</h3><input type="text" name="folder_format" value="${config['folder_format']}" size="43"><br>
-                      <i class="smalltext">Use: artist, album, year and first (first letter in artist name)<br />
+                      <i class="smalltext">Use: artist, album, year, releasetype and first (first letter in artist name)<br />
                       				E.g.: first/artist/album [year] = G/Girl Talk/All Day [2010]</i>
                     <br><br>
                     <h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
@@ -422,13 +420,23 @@
                     <h3>Path to Encoder:</h3><input type="text" name="encoderfolder" value="${config['encoderfolder']}" size="43">
                 	</div>
                 </td>
+		<td>
+                      <h2>Prowl Notification:</h2>
+		      <br>
+                      <h3><input type="checkbox" name="prowl_enabled" id="prowl" value="1" ${config['prowl_enabled']} />Enabled Prowl Notification</h3><br>
+                      <div id="prowloptions">
+		      	<h3>API key:</h3><input type="text" name="prowl_keys" value="${config['prowl_keys']}" size="50"><br><br>
+                      	<h3><input type="checkbox" name="prowl_onsnatch" value="1" ${config['prowl_onsnatch']} />Notify on snatch?</h3><br>
+                      	<h3>Priority (-2,-1,0,1 or 2):</h3><input type="text" name="prowl_priority" value="${config['prowl_priority']}" size="2">
+                      </div>
+		</td>
             </tr>
         </table>
     </div>
 
         <p class="center"><input type="submit" value="Save Changes"><br>
         (Web Interface changes require a restart to take effect)</h3>
-      </form>
+      </form>
 </%def>
 
 <%def name="javascriptIncludes()">
@@ -454,6 +462,26 @@
 				$("#encoderoptions").hide("fast");
 			}
 		});
+
+		if ($("#prowl").is(":checked"))
+			{
+				$("#prowloptions").show();
+			}
+		else
+			{
+				$("#prowloptions").hide();
+			}
+		
+		$("#prowl").click(function(){
+			if ($("#prowl").is(":checked"))
+			{
+				$("#prowloptions").show("fast");
+			}
+			else
+			{
+				$("#prowloptions").hide("fast");
+			}
+		});
 	});
 	</script>
-</%def>
\ No newline at end of file
+</%def>