webui: fix the access theme - multiselect / about colors

diff --git a/Makefile.webui b/Makefile.webui
index f0ac4ae66c1a22894def58b4bef1f0c78307f59d..d978cfd763016a6dcdbf477d6a6e0d8775b28bf3 100644 (file)
--- a/Makefile.webui
+++ b/Makefile.webui
@@ -74,8 +74,13 @@ CSS_DONE   += static/xcheckbox/xcheckbox.css
 CSS_DONE   += static/app/ext.css
 
 CSS_BLUE   += $(EXTJSPATH)/resources/css/xtheme-blue.css
+CSS_BLUE2  += static/app/ext-blue.css
+
 CSS_GRAY   += $(EXTJSPATH)/resources/css/xtheme-gray.css
+CSS_GRAY2  += static/app/ext-gray.css
+
 CSS_ACCESS += $(EXTJSPATH)/resources/css/xtheme-access.css
+CSS_ACCESS2+= static/app/ext-access.css
 
 #
 # extjs extensions
@@ -159,9 +164,9 @@ JAVASCRIPT_TV += $(ROOTPATH)/tv.js
 #
 
 JAVASCRIPT_SRC = $(foreach f,$(JAVASCRIPT),$(WEBDIR)/$(f))
-CSS_BLUE_SRC   = $(foreach f,$(CSS_INIT) $(CSS_BLUE) $(CSS_DONE),$(WEBDIR)/$(f))
-CSS_GRAY_SRC   = $(foreach f,$(CSS_INIT) $(CSS_GRAY) $(CSS_DONE),$(WEBDIR)/$(f))
-CSS_ACCESS_SRC = $(foreach f,$(CSS_INIT) $(CSS_ACCESS) $(CSS_DONE),$(WEBDIR)/$(f))
+CSS_BLUE_SRC   = $(foreach f,$(CSS_INIT) $(CSS_BLUE) $(CSS_DONE) $(CSS_BLUE2),$(WEBDIR)/$(f))
+CSS_GRAY_SRC   = $(foreach f,$(CSS_INIT) $(CSS_GRAY) $(CSS_DONE) $(CSS_GRAY2),$(WEBDIR)/$(f))
+CSS_ACCESS_SRC = $(foreach f,$(CSS_INIT) $(CSS_ACCESS) $(CSS_ACCESS2) $(CSS_DONE),$(WEBDIR)/$(f))
 CSS_SRC        = $(CSS_BLUE_SRC) $(CSS_GRAY_SRC) $(CSS_ACCESS_SRC)
 
 JAVASCRIPT_TV_SRC = $(foreach f,$(JAVASCRIPT_TV),$(WEBDIR)/$(f))
@@ -233,6 +238,7 @@ $(WEBDIR)/extjs-debug.c: $(JAVASCRIPT_SRC) $(CSS_SRC)
        $(VV)printf '$(foreach f,$(CSS_INIT),extjs_lcss(hq, "$(f)");\n)' > $@
        $(VV)printf 'extjs_lcss(hq, "redir/theme.debug.css");\n' >> $@
        $(VV)printf '$(foreach f,$(CSS_DONE),extjs_lcss(hq, "$(f)");\n)' >> $@
+       $(VV)printf 'extjs_lcss(hq, "redir/theme.app.debug.css");\n' >> $@
        $(VV)printf 'extjs_load(hq, "redir/locale.js");\n' >> $@
        $(VV)printf '$(foreach f,$(JAVASCRIPT),extjs_load(hq, "$(f)");\n)' >> $@
 

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 3fc8f6bdb11e65f9b4c59e14c147fddca9f04452..f2b79689647fd0ae0c9727bf587043372c228bcd 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -193,7 +193,7 @@ page_about(http_connection_t *hc, const char *remain, void *opaque)
   htsbuf_queue_t *hq = &hc->hc_reply;
   const char *lang = hc->hc_access->aa_lang_ui;
 
-  htsbuf_qprintf(hq, "<center>\n\
+  htsbuf_qprintf(hq, "<center class=\"about-tab\">\n\
 <div class=\"about-title\">HTS Tvheadend %s</div>\n\
 <p>&copy; 2006 - 2016 Andreas \303\226man, Jaroslav Kysela, Adam Sutton, et al.</p>\n\
 <p><img src=\"static/img/logobig.png\"></p>\n\

diff --git a/src/webui/static/app/ext-access.css b/src/webui/static/app/ext-access.css
new file mode 100644 (file)
index 0000000..c9639ee
--- /dev/null
+++ b/src/webui/static/app/ext-access.css
@@ -0,0 +1,25 @@
+.ux-mselect {
+    overflow: auto;
+    background: #33373d;
+    position: relative; /* for calculating scroll offsets */
+    zoom: 1;
+    overflow: auto;
+}
+
+.ux-mselect-item {
+    font: normal 15px tahoma, arial, helvetica, sans-serif;
+    padding: 2px;
+    border: 1px solid #33373d;
+    white-space: nowrap;
+    cursor: pointer;
+}
+
+.ux-mselect-selected {
+    border: 3px solid #ff9c33 !important;
+    background: #66676d;
+    cursor: pointer;
+}
+
+.about-tab a {
+    color: #ff9c33
+}

diff --git a/src/webui/static/app/ext-blue.css b/src/webui/static/app/ext-blue.css
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/webui/static/app/ext-gray.css b/src/webui/static/app/ext-gray.css
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index b3350878a6c1f549d95b7d8c439931dcf6367399..86a9069c11b7dfb8015b643c2b913b2a8b271c4a 100644 (file)
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -974,6 +974,11 @@
     font-size: 150%;
 }
 
+.about-tab {
+    margin-left: auto;
+    margin-right: auto;
+}
+
 .about-title {
     font-size: 24px;
     font-weight: bold;

diff --git a/src/webui/webui.c b/src/webui/webui.c
index 8e3edee7a3287987e844f45909875f1905bd816b..dbe56fadb397caf6c7c9704103b7fd118bdc2c8a 100644 (file)
--- a/src/webui/webui.c
+++ b/src/webui/webui.c
@@ -1812,6 +1812,18 @@ http_redir(http_connection_t *hc, const char *remain, void *opaque)
       }
       return HTTP_STATUS_BAD_REQUEST;
     }
+    if (!strcmp(components[0], "theme.app.debug.css")) {
+      theme = access_get_theme(hc->hc_access);
+      if (theme) {
+        snprintf(buf, sizeof(buf), "src/webui/static/app/ext-%s.css", theme);
+        if (!http_file_test(buf)) {
+          snprintf(buf, sizeof(buf), "/static/app/ext-%s.css", theme);
+          http_css_import(hc, buf);
+          return 0;
+        }
+      }
+      return HTTP_STATUS_BAD_REQUEST;
+    }
   }
 
   return HTTP_STATUS_BAD_REQUEST;