Merge remote-tracking branch 'Brinken/master'

data/interfaces/brink/CSS/style.css

@@ -52,9 +52,9 @@ h1 a:hover
 	border: 1px solid #000;
 	margin: 0;
 }
-h2 { font-size: 15px; color: #000; text-shadow: 1px 1px 0px rgba(255,255,255,0.2); margin-bottom: 0px; text-decoration: none;}
+h2 { font-size: 13px; color: #000; text-shadow: 1px 1px 0px rgba(255,255,255,0.2); margin-bottom: 0px; text-decoration: none;}
-h3 { font-size: 12px; color: #fafafa; text-shadow: 1px 1px 0px rgb(10,10,10); text-decoration: none; margin: 0px;}
+h3 { font-size: 12px; font-weight: bold; color: rgb(160,160,160); text-shadow: 1px 1px 0px rgb(10,10,10);}
-h4 { font-size: 10px; color: rgb(100,100,100); text-decoration: none;}
+h4 { font-size: 11px; color: rgb(100,100,100); text-decoration: none;}
 
 p { color: rgb(160,160,160); text-shadow: 1px 1px 1px #000;  margin-top: 8px; margin-bottom: 8px; }
 
@@ -642,19 +642,13 @@ text-shadow: 1px 1px 0px rgb(190,0,31);
 	-webkit-border-radius: 3px;
 	box-shadow: 1px 1px 0px rgba(255,255,255,0.2);
 	border: 1px solid #000;
-	background: url(../Images/arrow-down.png);
+	background: url(../Images/arrowDown.png);
 	background-position: 98% 50%;
 	background-repeat: no-repeat;
 	background-color: rgb(160,160,160);
 	overflow: hidden;
 }
 
-.select:hover,
-.select:active
-{
-	background-color: rgb(210,210,210);
-}
-
 /*Tooltip*/
 .tooltip
 {
@@ -768,7 +762,11 @@ input[type="text"]
 .configtable { font-size: 14px; vertical-align: middle; border-spacing: 10px; border-collapse: separate; }
 .configtable td  
 {
-    padding: 5px; 
+    padding: 20px; 
+	background-color: rgba(0,0,0,0.2);
+	box-shadow: 1px 1px 0px rgba(255,255,255,0.2);
+	border-top: 1px solid rgba(0,0,0,0.2);
+	border-left: 1px solid rgba(0,0,0,0.2);
 }
 .configtable td#middle { vertical-align: middle; }
 .configtable.open{

data/interfaces/brink/base.html

@@ -28,21 +28,12 @@
 	<script>!window.jQuery && document.write(unescape('%3Cscript src="js/libs/jquery-1.6.2.min.js"%3E%3C/script%3E'))</script>
 	${next.javascriptIncludes()}
 	
-	<script src="js/plugins.js"></script>
+	<script type="text/javascript" src="interfaces/brink/js/libs/jquery.custom-form-elements.js" ></script>
+	
 	<script src="interfaces/brink/js/script.js"></script>
 	
 	<!-- Theme style -->
 	<link rel="stylesheet" href="interfaces/brink/Themes/Default.css">
-	<!--
-		<script type="text/javascript">
-		selectedTheme();
-		</script>
-	-->
-	
-		<!-- Custom Form elements-->
-		<script type="text/javascript" src="interfaces/brink/js/libs/jquery.custom-form-elements.js" ></script>
-		
-	<!-- jScrollPane -->
 		<!-- styles needed by jScrollPane -->
 		<link type="text/css" href="interfaces/brink/css/libs/jquery.jscrollpane.css" rel="stylesheet" media="all" />
 		<!-- jScrollPane script -->

data/interfaces/brink/config.html

@@ -19,61 +19,43 @@
                 <tr>
                     <td>
                       <h3>HTTP Host:</h3>
-					</td>
-					<td>
                         <input type="text" name="http_host" value="${config['http_host']}" size="25" maxlength="40" />
 						<div class="tooltip">
 							<span>
 								Localhost or 0.0.0.0
 							</span>
 						</div>
-                    </td>
+						
-                    <td>
+
                         <h3>HTTP Port:</h3>
-					</td>
-					<td>
                         <input type="text" name="http_port" value="${config['http_port']}" size="10" maxlength="40" />
                         <div class="tooltip">
 							<span>
 								Default is: 8181
 							</span>
 						</div>
-                    </td>
-                </tr>
 						
-                <tr>
 
-					<td>
                         <h3>HTTP Username:</h3>
-					</td>
-                    <td>
                         <input type="text" name="http_username" value="${config['http_user']}" size="30" maxlength="40" />
-                    </td>
+						
-                    <td>
+
 						<h3>HTTP Password:</h3>
-					</td>
-                    <td>
 						<input type="password" name="http_password" value="${config['http_pass']}" size="30" maxlength="40" />
                     </td>
-                </tr>
+
-                <tr>
 					<td>
-						<h3>Enable API 
+						<h3>API:</h3>
-							<input class="styled" type="checkbox" name="api_enabled" id="api_enabled" value="1" ${config['api_enabled']} />
+						<p>Enable <input class="styled" type="checkbox" name="api_enabled" id="api_enabled" value="1" ${config['api_enabled']} />
-						</h3>
+						</p>
 						<div id="apioptions">
-							<br>
 							<h3>API key:<input type="text" name="api_key" id="api_key" value="${config['api_key']}" size="30"><input class="submit" type="button" value="Generate" id="generate_api"></h3><br><br>
 						</div>
-					</td>                
+
-                </tr>
+						
-				<tr>
-					<td>
 						<h3>
 						    Layout: 
                         </h3>
-					</td>
-                    <td>
                         <select class="styled" name="interface">
 					    %for interface in config['interface_list']:
 						    <%
@@ -87,37 +69,24 @@
                             </option>
 					    %endfor
 					    </select>
-						<!--
+
-							Make config for change of ColorStyle.css.
+						
-						-->
+                        <h3>Launch on Startup:</h3>
-					</td>
-				</tr>
-                <tr>
-                    <td>
-                        <h3>Launch Browser on Startup:</h3>
-					</td>
-					<td>
 						<input class="styled" type="checkbox" name="launch_browser" value="1" ${config['launch_browser']} />
-                    </td>
+						<p>This will launch the browser when running Headphones</p>
-                	<td>
+						
+						<br />
                 	    <h3>Download Scan Interval:</h3>
+                    	<input type="text" name="download_scan_interval" value="${config['download_scan_interval']}" size="2" maxlength="40"> mins
 					</td>
 					<td>
-                    	<input type="text" name="download_scan_interval" value="${config['download_scan_interval']}" size="10" maxlength="40"> mins
-                	</td>
-                </tr>
-                <tr>
-                	<td>
                 	    <h3>NZB Search Interval:</h3>
-					</td>
+
-					<td>
+                	    <input type="text" name="nzb_search_interval" value="${config['nzb_search_interval']}" size="2" maxlength="40"> mins
-                	    <input type="text" name="nzb_search_interval" value="${config['nzb_search_interval']}" size="10" maxlength="40"> mins
+
-               		</td>
-                	<td>
                 	    <h3>Library Scan Interval:</h3>
-					</td>
+
-					<td>
+                	    <input type="text" name="libraryscan_interval" value="${config['libraryscan_interval']}" size="2" maxlength="40"> mins
-                	    <input type="text" name="libraryscan_interval" value="${config['libraryscan_interval']}" size="10" maxlength="40"> mins
                		</td>
 				</tr>
             </table>
@@ -128,51 +97,36 @@
 	            <tr>
                     <td colspan="2">
                         <h2>SABnzbd:</h2>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <h3>
-                            SABnzbd Host:
-                        </h3>
-                        <input type="text" name="sab_host" value="${config['sab_host']}" size="30" maxlength="40" />
-					    <div class="tooltip">
-						    <span>
-							    Usually http://localhost:8080
-						    </span>
-					    </div>
-                    </td>
-                    <td>
-                        <h3>
-                            SABnzbd Username:
-                        </h3>
-                        <input type="text" name="sab_username" value="${config['sab_user']}" size="20" maxlength="40" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <h3>
-                            SABnzbd API:
-                        </h3>
-                        <input type="text" name="sab_apikey" value="${config['sab_api']}" size="36" maxlength="40" />
-                    </td>
-                    <td>
-                        <h3>SABnzbd Password:</h3>
-                        <input type="password" name="sab_password" value="${config['sab_pass']}" size="20" maxlength="40" />
-                    </td>
-                </tr>
 						
-                <tr>
+                        <h3>SABnzbd Host:</h3>
-                    <td>
+							<input type="text" name="sab_host" value="${config['sab_host']}" size="30" maxlength="40" />
-                        <h3>SABnzbd Category:</h3><input type="text" name="sab_category" value="${config['sab_cat']}" size="20" maxlength="40" />
+							<div class="tooltip">
-                    </td>
+								<span>
-                    <td>
+									Usually http://localhost:8080
-                        <h3>Music Download Directory:</h3><input type="text" name="download_dir" value="${config['download_dir']}" size="40" />
+								</span>
-					    <div class="tooltip">
+							</div>
-						    <span>
+
-							    Full path to the directory where SAB downloads your music | i.e. /Users/name/Downloads/music
+                        
-						    </span>
+
-					    </div>
+                        <h3>SABnzbd API:</h3>
+							<input type="text" name="sab_apikey" value="${config['sab_api']}" size="36" maxlength="40" />
+						
+						<h3>SABnzbd Username:</h3>
+							<input type="text" name="sab_username" value="${config['sab_user']}" size="20" maxlength="40" />
+						
+                        <h3>SABnzbd Password:</h3>
+							<input type="password" name="sab_password" value="${config['sab_pass']}" size="20" maxlength="40" />
+
+                        <h3>SABnzbd Category:</h3>
+							<input type="text" name="sab_category" value="${config['sab_cat']}" size="20" maxlength="40" />
+
+                        <h3>Music Download Directory:</h3>
+							<input type="text" name="download_dir" value="${config['download_dir']}" size="40" />
+								<div class="tooltip">
+									<span>
+										Full path to the directory where SAB downloads your music | i.e. /Users/name/Downloads/music
+									</span>
+								</div>
                     </td>
                 </tr>
                 <tr>
@@ -690,7 +644,7 @@
 	    
 
         <p class="center">
-			<input class="submit save" type="submit" value="Save Changes" />
+			<input id="save" class="submit save" type="submit" value="Save Changes" />
 			<br />
             (Web Interface changes require a restart to take effect)
         </p>
@@ -700,7 +654,7 @@
 <%def name="javascriptIncludes()">
 	<script>
 	
-	$("save").click(function(){
+	$("#save").click(function(){
 		messageDialog("update", "Your settings has been saved!")
 	});
 	
@@ -723,6 +677,9 @@
 		}
 	};
 	
+	$(".checkbox").click(function(){
+		alert($(this));
+	});
 	
 	$(document).ready(function()
 	{
@@ -735,18 +692,11 @@
 				$("#apioptions").hide();
 			}
 		
-		$("#api_enabled").click(function(){
+		$("#api_enabled").is(":checked", function(){
-			if ($("#api_enabled").is(":checked"))
+			$("#apioptions").show();
-			{
-				$("#apioptions").show("fast");
-			}
-			else
-			{
-				$("#apioptions").hide("fast");
-			}
 		});		
     
-    	$('#api_key').click(function(){ $('#api_key').select() });
+    	$("#api_key").click(function(){ $("#api_key").select() });
     	$("#generate_api").click(function(){
     	    $.get('generateAPI', 
     	        function(data){
@@ -840,10 +790,5 @@
 		handleNewSelection.apply($("#mirror"));
 
 	});
-	
-	//Slide toggle
-	$(document).ready(function(){
-		$(".configtable").addClass("closed");
-	});
 	</script>
 </%def>

data/interfaces/brink/logs.html

@@ -43,18 +43,11 @@
 	{
 		$('#log_table').dataTable(
 			{
-				"oLanguage": {
+			"aaSorting": [
-					"sLengthMenu":"Show _MENU_ lines per page",
+			],
-					"sEmptyTable": "No log information available",
+			"bPaginate": false,
-					"sInfo":"Showing _START_ to _END_ of _TOTAL_ lines",
+			"bFilter": true
-					"sInfoEmpty":"Showing 0 to 0 of 0 lines",
+		});
-					"sInfoFiltered":"(filtered from _MAX_ total lines)"},
-				"bStateSave": true,
-				"iDisplayLength": 100,
-				"sPaginationType": "full_numbers",
-				"aaSorting": []
-
-			});
 	});
 	</script>
 </%def>