From db9802e4424780dc95177cdce37257051a7d31e9 Mon Sep 17 00:00:00 2001
From: Supremicus <Supremicus@users.noreply.github.com>
Date: Thu, 2 Oct 2014 20:16:55 +1000
Subject: [PATCH 1/2] Network logo for NRK1

---
 gui/slick/images/network/nrk1.png | Bin 0 -> 4123 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 gui/slick/images/network/nrk1.png

diff --git a/gui/slick/images/network/nrk1.png b/gui/slick/images/network/nrk1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3354c13fc62aeeb63f585eb2afbd1b7d1aa7129a
GIT binary patch
literal 4123
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
Z2LLv;;`#_$2z~$n002ovPDHLkV1lSnpqc;x

literal 0
HcmV?d00001


From f4e351a1603fb151d74983f7c0801c14686b49ff Mon Sep 17 00:00:00 2001
From: Supremicus <Supremicus@users.noreply.github.com>
Date: Thu, 2 Oct 2014 20:30:06 +1000
Subject: [PATCH 2/2] Fix for active and status sorting

---
 gui/slick/interfaces/default/home.tmpl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gui/slick/interfaces/default/home.tmpl b/gui/slick/interfaces/default/home.tmpl
index cf37dc32..772a820e 100644
--- a/gui/slick/interfaces/default/home.tmpl
+++ b/gui/slick/interfaces/default/home.tmpl
@@ -200,7 +200,7 @@
 		        2: function(node) { return \$(node).find("img").attr("alt"); },
 	        #end if
 	            3: function(node) { return \$(node).find("span").text(); },
-	            6: function(node) { return \$(node).find("img").attr("alt"); }
+	            5: function(node) { return \$(node).find("img").attr("alt"); }
 	        },
 	        widgets: ['saveSort', 'zebra'],
 	        headers: {
@@ -209,6 +209,8 @@
 	            2: { sorter: 'network' },
 	            3: { sorter: 'quality' },
 	            4: { sorter: 'eps' },
+				5: { sorter: 'active' },
+				6: { sorter: 'status' },
 	        }
     });
 
@@ -221,7 +223,7 @@
 		        2: function(node) { return \$(node).find("img").attr("alt"); },
 	        #end if
 	            3: function(node) { return \$(node).find("span").text(); },
-	            6: function(node) { return \$(node).find("img").attr("alt"); }
+	            5: function(node) { return \$(node).find("img").attr("alt"); }
 	        },
 	        widgets: ['saveSort', 'zebra'],
 	        headers: {
@@ -230,6 +232,8 @@
 	            2: { sorter: 'network' },
 	            3: { sorter: 'quality' },
 	            4: { sorter: 'eps' },
+				5: { sorter: 'active' },
+				6: { sorter: 'status' },
 	        }
     });