diff --git a/data/css/data_table.css b/data/css/data_table.css index 5846855c..5c9ac606 100644 --- a/data/css/data_table.css +++ b/data/css/data_table.css @@ -172,6 +172,14 @@ table.display tr.even.gradeA { background-color: #ddffdd; } +table.display tr.odd.gradeI { + background-color: #bebebe; +} + +table.display tr.even.gradeI { + background-color: #bebebe; +} + table.display tr.odd.gradeC { background-color: #ddddff; } diff --git a/data/interfaces/default/album.html b/data/interfaces/default/album.html index 98dc51ba..ba8bf33b 100644 --- a/data/interfaces/default/album.html +++ b/data/interfaces/default/album.html @@ -13,7 +13,7 @@
Delete Album - %if album['Status'] == 'Skipped': + %if album['Status'] == 'Skipped' or album['Status'] == 'Ignored': Mark Album as Wanted %elif album['Status'] == 'Wanted': Force Check diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html index 06bb7ba6..423fa014 100644 --- a/data/interfaces/default/artist.html +++ b/data/interfaces/default/artist.html @@ -16,7 +16,7 @@ Pause Artist %endif %if artist['IncludeExtras']: - Remove Extras + Remove Extras Modify Extras %else: Get Extras @@ -62,6 +62,7 @@ + @@ -89,6 +90,8 @@ grade = 'X' elif album['Status'] == 'Snatched': grade = 'C' + elif album['Status'] == 'Ignored': + grade = 'I' else: grade = 'A' @@ -123,12 +126,12 @@ %> - + ${album['AlbumTitle']} ${album['ReleaseDate']} ${album['Type']} ${album['Status']} - %if album['Status'] == 'Skipped': + %if album['Status'] == 'Skipped' or album['Status'] == 'Ignored': [want] %elif (album['Status'] == 'Wanted' or album['Status'] == 'Wanted Lossless'): [skip] diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 820e729d..60aeaf99 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -678,9 +678,9 @@
-

LMS

+

Logitech Media Server

- +
@@ -690,8 +690,7 @@
- - +

Pushalot

@@ -708,6 +707,10 @@
+ + + +

Synology NAS

@@ -776,7 +779,40 @@
- + +
+

OS X

+
+ +
+
+
+ Enter the path/application name to be registered with the Notification Center, default is /Applications/Headphones + + +
+
+ +
+
+
+ +
+

Boxcar2

+
+ +
+
+
+ +
+
+ +
+
+
+ + @@ -1427,6 +1463,7 @@ $("#pushbulletoptions").hide(); } + $("#pushbullet").click(function(){ if ($("#pushbullet").is(":checked")) { @@ -1457,8 +1494,48 @@ $("#twitteroptions").slideUp(); } }); - - if ($("#songkick").is(":checked")) + + if ($("#osx_notify").is(":checked")) + { + $("#osx_notify_options").show(); + } + else + { + $("#osx_notify_options").hide(); + } + + $("#osx_notify").click(function(){ + if ($("#osx_notify").is(":checked")) + { + $("#osx_notify_options").slideDown(); + } + else + { + $("#osx_notify_options").slideUp(); + } + }); + + if ($("#boxcar").is(":checked")) + { + $("#boxcar_options").show(); + } + else + { + $("#boxcar_options").hide(); + } + + $("#boxcar").click(function(){ + if ($("#boxcar").is(":checked")) + { + $("#boxcar_options").slideDown(); + } + else + { + $("#boxcar_options").slideUp(); + } + }); + + if ($("#songkick").is(":checked")) { $("#songkickoptions").show(); } @@ -1671,6 +1748,12 @@ function (data) { $('#ajaxMsg').html("
"+data+"
"); }); $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); }); + + $('#osxnotifyregister').click(function () { + var osx_notify_app = $("#osx_notify_reg").val(); + $.get("/osxnotifyregister", {'app': osx_notify_app}, function (data) { $('#ajaxMsg').html("
"+data+"
"); }); + $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut() + }) } $(document).ready(function() { diff --git a/data/interfaces/default/css/data_table.css b/data/interfaces/default/css/data_table.css index 08c6de4c..90c99801 100644 --- a/data/interfaces/default/css/data_table.css +++ b/data/interfaces/default/css/data_table.css @@ -224,6 +224,14 @@ table.display tr.even.gradeA { background-color: #ddffdd; } +table.display tr.odd.gradeI { + background-color: #bebebe; +} + +table.display tr.even.gradeI { + background-color: #bebebe; +} + table.display tr.odd.gradeC { background-color: #ebf5ff; } @@ -254,6 +262,13 @@ table.display tr.even.gradeU { background-color: #eee; } +table.display tr.odd.gradeW { + background-color: #ffffaa; +} + +table.display tr.even.gradeW { + background-color: #ffffaa; +} table.display tr.odd.gradeZ { background-color: #FAFAFA; @@ -269,6 +284,7 @@ table.display tr.gradeL #status { } table.display tr.gradeA td, table.display tr.gradeC td, +table.display tr.gradeI td, table.display tr.gradeX td, table.display tr.gradeU td, table.display tr.gradeZ td {border-bottom: 1px solid #FFF;} diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css index 4e7b0739..0bcf383f 100644 --- a/data/interfaces/default/css/style.css +++ b/data/interfaces/default/css/style.css @@ -163,6 +163,14 @@ img.albumArt { max-height: 300px; position: relative; } +img.albumArt-nostretch { + float: left; + min-height: 64px; + min-width: 64px; + max-width: 250px; + max-height: 300px; + position: relative; +} .title { margin-bottom: 20px; margin-top: 10px; diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 9b46369c..c28faf15 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -316,6 +316,10 @@ function doAjaxCall(url,elem,reload,form) { } if ( reload == "tabs") refreshTab(); if ( reload == "page") location.reload(); + if ( reload == "submenu&table") { + refreshSubmenu(); + refreshTable(); + } if ( form ) { // Change the option to 'choose...' $(formID + " select").children('option[disabled=disabled]').attr('selected','selected'); diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html index e6ed4aeb..35f09f88 100644 --- a/data/interfaces/default/logs.html +++ b/data/interfaces/default/logs.html @@ -1,10 +1,18 @@ -lossless<%inherit file="base.html"/> +<%inherit file="base.html"/> <%! from headphones import helpers %> +<%def name="headerIncludes()"> +
+
+ Clear log +
+
+ + <%def name="body()"> -
+

Logs

@@ -40,6 +48,8 @@ lossless<%inherit file="base.html"/>