From fbafc79ffcb19ef4eb46569c7a8583fe12699569 Mon Sep 17 00:00:00 2001 From: horchi Date: Mon, 22 May 2017 18:06:39 +0200 Subject: 2017-05-16: version 1.1.115 (horchi)\n - change: Changed apple-mobile-web-app-status-bar-style to black\n - bugfix: Fixed typo in eventsviews\n\n --- HISTORY.h | 8 ++++++-- Makefile | 4 ++-- configs/eventsview-3po.sql | 2 +- configs/eventsview-ck.sql | 2 +- configs/eventsview-horchi.sql | 2 +- configs/eventsview-perlbo.sql | 2 +- configs/eventsview-uti.sql | 2 +- configs/eventsview.sql | 2 +- contrib/epgd.service | 1 + contrib/epghttpd.service | 1 + http/Makefile | 13 ++++++------- 11 files changed, 22 insertions(+), 17 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index e3aac53..2580c92 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -4,8 +4,8 @@ * ----------------------------------- */ -#define _VERSION "1.1.114" -#define VERSION_DATE "23.03.2017" +#define _VERSION "1.1.115" +#define VERSION_DATE "16.05.2017" #define DB_API 4 #ifdef GIT_REV @@ -17,6 +17,10 @@ /* * ------------------------------------ +2017-05-16: version 1.1.115 (horchi) + - change: Changed apple-mobile-web-app-status-bar-style to black + - bugfix: Fixed typo in eventsviews + 2017-03-23: version 1.1.114 (horchi) - change: Minor view change for peding features diff --git a/Makefile b/Makefile index ab0aca0..ff6e64b 100644 --- a/Makefile +++ b/Makefile @@ -264,5 +264,5 @@ upd: update update: git pull @make clean install - restart epgd - restart epghttpd + systemctrl restart epgd + systemctrl restart epghttpd diff --git a/configs/eventsview-3po.sql b/configs/eventsview-3po.sql index 39ba49e..6902469 100644 --- a/configs/eventsview-3po.sql +++ b/configs/eventsview-3po.sql @@ -21,7 +21,7 @@ else ) end shorttext, case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then - concat('sub_longdescription','|DVB: ',cnt_longdescription) + concat(sub_longdescription,'|DVB: ',cnt_longdescription) else sub_longdescription end longdescription, diff --git a/configs/eventsview-ck.sql b/configs/eventsview-ck.sql index 1a8c506..daf30be 100644 --- a/configs/eventsview-ck.sql +++ b/configs/eventsview-ck.sql @@ -12,7 +12,7 @@ else sub_shorttext end shorttext, case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then - concat('sub_longdescription','|DVB: ',cnt_longdescription) + concat(sub_longdescription,'|DVB: ',cnt_longdescription) else sub_longdescription end longdescription, diff --git a/configs/eventsview-horchi.sql b/configs/eventsview-horchi.sql index e137594..6be77a6 100644 --- a/configs/eventsview-horchi.sql +++ b/configs/eventsview-horchi.sql @@ -12,7 +12,7 @@ else sub_shorttext end shorttext, case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then - concat('sub_longdescription','|DVB: ',cnt_longdescription) + concat(sub_longdescription,'|DVB: ',cnt_longdescription) else sub_longdescription end longdescription, diff --git a/configs/eventsview-perlbo.sql b/configs/eventsview-perlbo.sql index 44dddcc..8a882c8 100644 --- a/configs/eventsview-perlbo.sql +++ b/configs/eventsview-perlbo.sql @@ -10,7 +10,7 @@ case end end shorttext, case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then - concat('sub_longdescription','|DVB: ',cnt_longdescription) + concat(sub_longdescription,'|DVB: ',cnt_longdescription) else sub_longdescription end longdescription, diff --git a/configs/eventsview-uti.sql b/configs/eventsview-uti.sql index e8960ec..f287f06 100644 --- a/configs/eventsview-uti.sql +++ b/configs/eventsview-uti.sql @@ -12,7 +12,7 @@ else sub_shorttext end shorttext, case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then - concat('sub_longdescription','|DVB: ',cnt_longdescription) + concat(sub_longdescription,'|DVB: ',cnt_longdescription) else sub_longdescription end longdescription, diff --git a/configs/eventsview.sql b/configs/eventsview.sql index 62397d2..6504f1a 100644 --- a/configs/eventsview.sql +++ b/configs/eventsview.sql @@ -12,7 +12,7 @@ else sub_shorttext end shorttext, case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then - concat('sub_longdescription','|DVB: ',cnt_longdescription) + concat(sub_longdescription,'|DVB: ',cnt_longdescription) else sub_longdescription end longdescription, diff --git a/contrib/epgd.service b/contrib/epgd.service index d7af532..8d8dfbd 100644 --- a/contrib/epgd.service +++ b/contrib/epgd.service @@ -7,6 +7,7 @@ After = Type = forking ExecStart = /epgd -c /etc/epgd -p +Restart = always [Install] diff --git a/contrib/epghttpd.service b/contrib/epghttpd.service index fd8d7f4..7084097 100644 --- a/contrib/epghttpd.service +++ b/contrib/epghttpd.service @@ -7,6 +7,7 @@ After = epgd.service Type = forking ExecStart = /epghttpd -c /etc/epgd +Restart = always [Install] diff --git a/http/Makefile b/http/Makefile index ae1ec10..6b86a0c 100644 --- a/http/Makefile +++ b/http/Makefile @@ -17,8 +17,8 @@ core: @echo "var epgd = {};" > ./epgd.full.js @cat ./src/lang/$(DEFAULT_LANG).js >> ./epgd.full.js @cat ./src/js/*.js >> ./epgd.full.js - @java -jar tools/yuicompressor-2.4.8.jar ./epgd.full.js -o ./www/epgd.js -v - + @java -jar tools/yuicompressor-2.4.8.jar ./epgd.full.js -o ./www/epgd.js -v + # baut aus allen benötigten 3rdParty-scripten eine gesamt Javascriptdatei -> www/common.js common: # cat ./3rdParty/modernizr.custom.js > ./www/common.js @@ -38,7 +38,7 @@ lang: cp -ua ./src/lang/* ./www/lang/ # baut das default-theme und hinter dann auch ggf. weitere themes -style: +style: $(LESS_Compiler) -f ./tools/less-rhino-1.7.0.js ./tools/lessc-rhino-1.7.0.js --ru ./src/css/theme/default.less ./www/epgd.css @@ -51,10 +51,10 @@ install-core: cp ./www/epgd.css $(HTTPDEST)/ if test -f ./custom.css; then \ cat ./custom.css >> $(HTTPDEST)/epgd.css; \ - fi + fi cp -u ../HISTORY.h $(HTTPDEST)/ cp -u ../TODO $(HTTPDEST)/ - + install-lang: cp -ua ./www/lang/* $(HTTPDEST)/lang @@ -80,5 +80,4 @@ install-env: @if ! test -d $(HTTPDEST)/images/; then \ mkdir -p "$(HTTPDEST)/images/"; \ chmod a+rx $(HTTPDEST)/images/; \ - fi - + fi -- cgit v1.2.3