Link to the new GWT Theme jar.

Add the header image for the built in UI. Update the favicon. Signed-off-by: Chris Larsen <clarsen@yahoo-inc.com>
OpenTSDB · Dec 17, 2015 · ba2039e · ba2039e
1 parent 53b1959
commit ba2039e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 14 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -305,7 +305,9 @@ httpui_SRC := \
 httpui_DEPS = src/tsd/QueryUi.gwt.xml
 
 #dist_pkgdata_DATA = src/logback.xml
-dist_static_DATA = src/tsd/static/favicon.ico
+dist_static_DATA = \
+	src/tsd/static/favicon.ico	\
+	src/tsd/static/openTSDB_header.jpg
 
 EXTRA_DIST = tsdb.in $(tsdb_SRC) $(test_SRC) \
         $(test_plugin_SRC) $(test_plugin_MF) $(test_plugin_SVCS:%=test/%) \
@@ -400,14 +402,14 @@ get_dep_classpath = `for jar in $(tsdb_DEPS); do $(find_jar); done | tr '\n' ':'
 	@touch "$@"
 
 VALIDATION_API_CLASSPATH = `jar=$(VALIDATION_API); $(find_jar)`:`jar=$(VALIDATION_API_SOURCES); $(find_jar)`
-GWT_CLASSPATH = $(VALIDATION_API_CLASSPATH):`jar=$(GWT_DEV); $(find_jar)`:`jar=$(GWT_USER); $(find_jar)`:$(srcdir)/src
+GWT_CLASSPATH = $(VALIDATION_API_CLASSPATH):`jar=$(GWT_DEV); $(find_jar)`:`jar=$(GWT_USER); $(find_jar)`:`jar=$(GWT_THEME); $(find_jar)`:$(srcdir)/src
 # The GWT compiler is way too slow, that's not very Googley.  So we save the
 # MD5 of the files we compile in the stamp file and everytime `make' things it
 # needs to recompile the GWT code, we verify whether the code really changed
 # or whether it's just a file that was touched (which happens frequently when
 # using Git while rebasing and whatnot).
 gwtc: .gwtc-stamp
-.gwtc-stamp: $(httpui_SRC) $(httpui_DEPS) $(VALIDATION_API) $(VALIDATION_API_SOURCES) $(GWT_DEV) $(GWT_USER)
+.gwtc-stamp: $(httpui_SRC) $(httpui_DEPS) $(VALIDATION_API) $(VALIDATION_API_SOURCES) $(GWT_DEV) $(GWT_USER) $(GWT_THEME)
 	@$(mkdir_p) gwt
 	{ cd $(srcdir) && cat $(httpui_SRC); } | $(MD5) >"$@-t"
 	cmp -s "$@" "$@-t" && exit 0; \
@@ -666,6 +668,7 @@ pom.xml: pom.xml.in Makefile
 	    -e 's/@ASYNCHBASE_VERSION@/$(ASYNCHBASE_VERSION)/' \
 	    -e 's/@GUAVA_VERSION@/$(GUAVA_VERSION)/' \
 	    -e 's/@GWT_VERSION@/$(GWT_VERSION)/' \
+	    -e 's/@GWT_THEME_VERSION@/$(GWT_THEME_VERSION)/' \
 	    -e 's/@HAMCREST_VERSION@/$(HAMCREST_VERSION)/' \
 	    -e 's/@JACKSON_VERSION@/$(JACKSON_VERSION)/' \
 	    -e 's/@JAVASSIST_VERSION@/$(JAVASSIST_VERSION)/' \
@@ -733,7 +736,8 @@ debian: dist staticroot
 	chmod 755 $(distdir)/debian/DEBIAN/*
 	cp $(top_srcdir)/build-aux/deb/init.d/opentsdb $(distdir)/debian/etc/init.d
 	cp $(jar) $(distdir)/debian/usr/share/opentsdb/lib
-	cp -r staticroot/favicon.ico $(distdir)/debian/usr/share/opentsdb/static
+	cp -r staticroot/icon.ico $(distdir)/debian/usr/share/opentsdb/static
+	cp -r staticroot/openTSDB_header.jpg $(distdir)/debian/usr/share/opentsdb/static
 	cp -r gwt/queryui/* $(distdir)/debian/usr/share/opentsdb/static
 	`for dep_jar in $(tsdb_DEPS); do cp $$dep_jar \
 	     $(distdir)/debian/usr/share/opentsdb/lib; done;`

diff --git a/pom.xml.in b/pom.xml.in
@@ -475,6 +475,12 @@
       <artifactId>gwt-user</artifactId>
       <version>@GWT_VERSION@</version>
     </dependency>
+
+    <dependency>
+      <groupId>net.opentsdb</groupId>
+      <artifactId>opentsdb_gwt_theme</artifactId>
+      <version>@GWT_THEME_VERSION@</version>
+    </dependency>
 
   </dependencies>
 

diff --git a/src/tsd/HttpQuery.java b/src/tsd/HttpQuery.java
@@ -1017,20 +1017,17 @@ protected Logger logger() {
     + "body{font-family:arial,sans-serif;margin-left:2em}"
     + "A.l:link{color:#6f6f6f}"
     + "A.u:link{color:green}"
-    + ".subg{background-color:#e2f4f7}"
     + ".fwf{font-family:monospace;white-space:pre-wrap}"
     + "//--></style>";
 
   private static final String PAGE_HEADER_END_BODY_START =
     "</head>\n"
     + "<body text=#000000 bgcolor=#ffffff>"
     + "<table border=0 cellpadding=2 cellspacing=0 width=100%>"
-    + "<tr><td rowspan=3 width=1% nowrap><b>"
-    + "<font color=#c71a32 size=10>T</font>"
-    + "<font color=#00a189 size=10>S</font>"
-    + "<font color=#1a65b7 size=10>D</font>"
-    + "&nbsp;&nbsp;</b><td>&nbsp;</td></tr>"
-    + "<tr><td class=subg><font color=#507e9b><b>";
+    + "<tr><td rowspan=3 width=1% nowrap>"
+    + "<img src=/s/opentsdb_header.jpg>"
+    + "<td>&nbsp;</td></tr>"
+    + "<tr><td><font color=#507e9b><b>";
 
   private static final String PAGE_BODY_MID =
     "</b></td></tr>"

diff --git a/src/tsd/QueryUi.gwt.xml b/src/tsd/QueryUi.gwt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module rename-to="queryui">
   <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.user.theme.standard.Standard"/>
+  <inherits name="com.sensei.themes.opentsdb.Opentsdb"/>
   <inherits name="com.google.gwt.http.HTTP"/>
   <inherits name="com.google.gwt.json.JSON"/>
   <entry-point class="tsd.client.QueryUi"/>

diff --git a/src/tsd/RpcManager.java b/src/tsd/RpcManager.java
@@ -568,7 +568,7 @@ public void execute(final TSDB tsdb, final HttpQuery query)
       query.sendReply(HttpQuery.makePage(
         "<script type=text/javascript language=javascript"
         + " src=s/queryui.nocache.js></script>",
-        "TSD", "Time Series Database", buf.toString()));
+        "OpenTSDB", "", buf.toString()));
     }
   }
 

diff --git a/src/tsd/static/favicon.ico b/src/tsd/static/favicon.ico
diff --git a/src/tsd/static/opentsdb_header.jpg b/src/tsd/static/opentsdb_header.jpg
diff --git a/third_party/gwt/include.mk b/third_party/gwt/include.mk
@@ -30,4 +30,11 @@ GWT_USER_BASE_URL := http://central.maven.org/maven2/com/google/gwt/gwt-user/$(G
 $(GWT_USER): $(GWT_USER).md5
 	set dummy "$(GWT_USER_BASE_URL)" "$(GWT_USER)"; shift; $(FETCH_DEPENDENCY)
 
-THIRD_PARTY += $(GWT_DEV) $(GWT_USER)
+GWT_THEME_VERSION := 1.0.0
+GWT_THEME := third_party/gwt/opentsdb-gwt-theme-$(GWT_THEME_VERSION).jar
+GWT_THEME_BASE_URL := http://central.maven.org/maven2/net/opentsdb/opentsdb-gwt-theme/$(GWT_THEME_VERSION)
+
+$(GWT_THEME): $(GWT_THEME).md5
+	set dummy "$(GWT_THEME_BASE_URL)" "$(GWT_THEME)"; shift; $(FETCH_DEPENDENCY)
+
+THIRD_PARTY += $(GWT_DEV) $(GWT_USER) $(GWT_THEME)
diff --git a/third_party/gwt/opentsdb-gwt-theme-1.0.0.jar.md5 b/third_party/gwt/opentsdb-gwt-theme-1.0.0.jar.md5
@@ -0,0 +1 @@
+458540cf39138f1ad566c2eabf930699