From d3fe2960f6b893d7793f7b6270989db0519d8a0a Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 14 Mar 2016 21:55:45 +0100
Subject: [PATCH] yWeb/neutrinoyparser: add icons for scrabled and webtv
 channels

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/129dacc9126a479e520fbb3b6fca97d577f20cd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- yWeb/neutrinoyparser: add icons for scrabled and webtv channels

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/nhttpd/tuxboxapi/neutrinoyparser.cpp |   9 +++++++++
 src/nhttpd/web/Y_Version.txt             |   2 +-
 src/nhttpd/web/images/Makefile.am        |   2 ++
 src/nhttpd/web/images/key.png            | Bin 0 -> 612 bytes
 src/nhttpd/web/images/webtv.png          | Bin 0 -> 904 bytes
 5 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 src/nhttpd/web/images/key.png
 create mode 100644 src/nhttpd/web/images/webtv.png

diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
index b50ab79d1..637e64198 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -450,6 +450,15 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 			yresult += "</a>\n";
 		}
 
+		if (!channel->getUrl().empty())
+		{
+			yresult += "<img src=\"/images/webtv.png\" alt=\"WebTV\" title=\"WebTV\" />\n";
+		}
+
+		if (channel->scrambled)
+		{
+			yresult += "<img src=\"/images/key.png\" alt=\"Scrambled\" title=\"Scrambled\" />\n";
+		}
 		if (event.eventID)
 		{
 			yresult += string_printf("<a href=\"javascript:do_epg('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"','"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 5e1a41265..f2f7e0cd8 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.9.0.35
+version=2.9.0.36
 date=14.03.2016
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am
index b5b1af3aa..f8a8e47be 100644
--- a/src/nhttpd/web/images/Makefile.am
+++ b/src/nhttpd/web/images/Makefile.am
@@ -34,6 +34,7 @@ install_DATA =	accept.png \
 		hidden.png \
 		info.png \
 		inlink.gif \
+		key.png \
 		live.png \
 		live_popup.png \
 		livelock.png \
@@ -82,6 +83,7 @@ install_DATA =	accept.png \
 		volumeunmute.png \
 		volumeup.png \
 		wait.gif \
+		webtv.png \
 		wget.png \
 		x_red.png \
 		zap.png
diff --git a/src/nhttpd/web/images/key.png b/src/nhttpd/web/images/key.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ec1a928140311ff30a0a9120e958096c77f446e
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz_DMuRR5;6x
zlS@w%Q5c4azot!D;Bb+VOG43r3yFWgr3+W?*dVu(V(A1@5@<*SmAE1_hL9KyB@hUZ
zQlJKc(+0s(E*e^xX*->nmX^MrbE*gmZ6|p*GkKoxa?X?hD9M+@sRvFH{EqYA??u6x
z<ad^vB!ywshg9SZ((yU+I?E)%N%Lr4!Bsf<vmdF`@jul;pWrwT&oDoqPrzEHuzu8m
z<jD}pY);}bBb$-1H^MQ=tpeIIg;|cfnIs*Xg|Z_+-Ft+K<N|gaWw^Zq{VVC9@2`Z3
zEQpIui2AC@cpo6XG~Ni`p*sjKy&ymrVw-hPzdeN(d=AC`1oB1&(y|p|rx7!~6@mZH
zd-@^5%dI$<T%;OL;K!u;GsJzhkXJbd`@2nW+bXxOEs?_6OpMIwhIZ73=#~NM_C09(
zJvf}GM@D%^+Ma;lV#2&o`Q`E$uims&coIsWg;X*@5$m9b?C{z->2pu{uGnrwz*>rh
zfvUA@7b#acN?M*mBG3rQV?e^+0R5m3YXWyRZL5Bt@3vAw{9JaEW$}=f4bXO52yBH{
z;G~ZN|GLn>k~{On3Swd-Sy(gFkOdyw-RP%&exwl01R<AsLys&$3w1*O@fNFgPM&ex
yA1nrD0`FLT+orSXc->JRp))TI*SsngruhZksQ*NT%!X?K0000<MNUMnLSTZAs}%YG

literal 0
HcmV?d00001

diff --git a/src/nhttpd/web/images/webtv.png b/src/nhttpd/web/images/webtv.png
new file mode 100644
index 0000000000000000000000000000000000000000..699149f84dd7c17fa23aa2c276faa1f97984ff21
GIT binary patch
literal 904
zcmV;319$w1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~$d6FBEPDTYUfk0~JX`
zK~y-)U6adeTxA%>f8V*xNivgW#x$5qM<GfLYU`z`71CCe)~2WnLETgYvv46u@Q>)m
zrKme?K(SUtrJya*pw&i_617T+mqf{=P125;$;>2~bIx~lVU59e`SQHK=Y@wyIOo_t
zqmv_tfLDP1Ko<}Ibzs_A_txu&PMzPb7yklACr1Kc40z_L;*qG(+C`(8r71z11kDX5
zR?cao%@<mm=iWa4!NwL~baEsFz8c(l&(Pz=M`<JxDU$hyAmbt`O^ef#R+_A&-!ij2
z^Rrg^@cYkxTK8^#GWKBS?xBOdgH(+~c>=9HVx6H$hH4s7PFlHE54kP(5QE)!?UkuI
z4dAaGT|5Z9c4GIF{uQ&y3Nf+OY$Q3VX-Ff1xutdLo0~+13Zi3<hj$JzF?*^1-RZHP
z0^rqSy$8Z_vdMa&@oYD@m=-Rs3iQGn8;L@8rL^__$y&>GDkfp^tjE1_*uSJddD#Q@
z7kBhA8!xl0R@vdQSRAFY<PR^vwOYDwRGIf@_&vQ!?W0br$#sqo--=50o&e}<3$m1&
z%aqe5?QQ+kWIMH0Nk{ERL_Vc48&iyXu(C<Ka22nAmHFuwbYk;?b4~~cGHu`}5`>0x
zQ;Hy|abn*-!Z3sZu-0O&CB8eRQmK$62~?CH7;UQ!+34%^^R&0z$F;u#5*3p3TF7Rz
zXswY_VvM0ys}aXB&N-ZOXlXV*t@IBI)kW@XE3#ak#D+^`{1lZm(OMHl5kd&+^*Y8F
zf*`>2{z>0zTk@3DZ+!gg1$}$2i=eqgz49G}LW)r7mb+34&-1np0fZ2^y8g_2=ZQ1p
zGF6|C&tBk>zWeF$vlMccR!?mKgb-vh8Nx6miXy@=#P@x;(wqnYRH~l;dhYVYG?sgh
zJ#d)c$^kkT^5yt>2BxO?FrVj+UAriiO4Mp=^mO+iJb}z~{8y&oHy>-)N}tin9DQNv
z#h_Y(Z%&^@8iUgstu@9NthE?pFvhUHzJ5gfzs^G^4?JzOdC3^N#~NF>xvm4h0H?k`
edHKEV`o95l+q4i#qD!d&0000<MNUMnLSTYdAFezA

literal 0
HcmV?d00001