From 812d3abc3e4840919b88ad3312e82eb46c24080c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 12 May 2015 21:05:16 +0200 Subject: [PATCH] extjs.c - cleanups --- src/webui/extjs.c | 88 +++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/src/webui/extjs.c b/src/webui/extjs.c index b118a5a18..00072677a 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -49,15 +49,39 @@ #include "input.h" #include "satip/server.h" +#define EXTJSPATH "static/extjs" + /** * */ static void -extjs_load(htsbuf_queue_t *hq, const char *script) +extjs_load(htsbuf_queue_t *hq, const char *script, ...) { - htsbuf_qprintf(hq, - "\n", script); + va_list ap; + htsbuf_qprintf(hq, "\n"); +} + +/** + * + */ +static void +extjs_lcss(htsbuf_queue_t *hq, const char *css, ...) +{ + va_list ap; + + htsbuf_qprintf(hq, "\n"); } /** @@ -68,13 +92,13 @@ extjs_exec(htsbuf_queue_t *hq, const char *fmt, ...) { va_list ap; - htsbuf_qprintf(hq, "\r\n"); + htsbuf_qprintf(hq, "\n\n"); } /** @@ -85,26 +109,22 @@ extjs_root(http_connection_t *hc, const char *remain, void *opaque) { htsbuf_queue_t *hq = &hc->hc_reply; -#define EXTJSPATH "static/extjs" htsbuf_qprintf(hq, "\n"); htsbuf_qprintf(hq, "\n"); htsbuf_qprintf(hq, "\n"); - htsbuf_qprintf(hq, "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n", - tvheadend_webui_debug ? "-debug" : "", - tvheadend_webui_debug ? "-debug" : "", - "");//tvheadend_webui_debug ? "" : "-min"); + extjs_load(hq, EXTJSPATH "/adapter/ext/ext-base%s.js", tvheadend_webui_debug ? "-debug" : ""); + extjs_load(hq, EXTJSPATH "/ext-all%s.js", tvheadend_webui_debug ? "-debug" : ""); + extjs_lcss(hq, EXTJSPATH "/resources/css/ext-all-notheme.css"); + extjs_lcss(hq, EXTJSPATH "/resources/css/xtheme-blue.css"); + extjs_lcss(hq, "static/livegrid/resources/css/ext-ux-livegrid.css"); + extjs_lcss(hq, EXTJSPATH "/examples/ux/gridfilters/css/GridFilters.css"); + extjs_lcss(hq, EXTJSPATH "/examples/ux/gridfilters/css/RangeMenu.css"); + extjs_lcss(hq, "static/xcheckbox/xcheckbox.css"); + extjs_lcss(hq, "static/app/ext.css"); - extjs_exec(hq, "Ext.BLANK_IMAGE_URL = " "'"EXTJSPATH"/resources/images/default/s.gif';"); + extjs_exec(hq, "Ext.BLANK_IMAGE_URL = \'" EXTJSPATH "/resources/images/default/s.gif';"); /** * Load extjs extensions @@ -116,15 +136,15 @@ extjs_root(http_connection_t *hc, const char *remain, void *opaque) extjs_load(hq, "static/multiselect/ddview.js"); extjs_load(hq, "static/xcheckbox/xcheckbox.js"); extjs_load(hq, "static/checkcolumn/CheckColumn.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/GridFilters.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/filter/Filter.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/filter/BooleanFilter.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/filter/DateFilter.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/filter/ListFilter.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/filter/NumericFilter.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/filter/StringFilter.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/menu/ListMenu.js"); - extjs_load(hq, "static/extjs/examples/ux/gridfilters/menu/RangeMenu.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/GridFilters.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/filter/Filter.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/filter/BooleanFilter.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/filter/DateFilter.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/filter/ListFilter.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/filter/NumericFilter.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/filter/StringFilter.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/menu/ListMenu.js"); + extjs_load(hq, EXTJSPATH "/examples/ux/gridfilters/menu/RangeMenu.js"); /** * Create a namespace for our app @@ -210,14 +230,14 @@ extjs_livetv(http_connection_t *hc, const char *remain, void *opaque) htsbuf_qprintf(hq, "\n"); htsbuf_qprintf(hq, "\n"); htsbuf_qprintf(hq, "HTS Tvheadend %s\n", tvheadend_version); - htsbuf_qprintf(hq, "\n"); + extjs_lcss(hq, "static/tv.css"); if(tvheadend_webui_debug) { - extjs_load(hq, "static/extjs/adapter/ext/ext-base-debug.js"); - extjs_load(hq, "static/extjs/ext-all-debug.js"); + extjs_load(hq, EXTJSPATH "/adapter/ext/ext-base-debug.js"); + extjs_load(hq, EXTJSPATH "/ext-all-debug.js"); } else { - extjs_load(hq, "static/extjs/adapter/ext/ext-base.js"); - extjs_load(hq, "static/extjs/ext-all.js"); + extjs_load(hq, EXTJSPATH "/adapter/ext/ext-base.js"); + extjs_load(hq, EXTJSPATH "/ext-all.js"); } extjs_load(hq, "static/tv.js"); -- 2.47.2