diff --git a/Makefile.am b/Makefile.am index d5e8334f10..a2bc819fb6 100644 --- 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 index 9539eaa2a1..e18845d6cd 100644 --- a/pom.xml.in +++ b/pom.xml.in @@ -475,6 +475,12 @@ gwt-user @GWT_VERSION@ + + + net.opentsdb + opentsdb_gwt_theme + @GWT_THEME_VERSION@ + diff --git a/src/tsd/HttpQuery.java b/src/tsd/HttpQuery.java index bea01cb6f2..c2848ee7aa 100644 --- a/src/tsd/HttpQuery.java +++ b/src/tsd/HttpQuery.java @@ -1017,7 +1017,6 @@ 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}" + "//-->"; @@ -1025,12 +1024,10 @@ protected Logger logger() { "\n" + "" + "" - + "" - + "" + + "" diff --git a/src/tsd/QueryUi.gwt.xml b/src/tsd/QueryUi.gwt.xml index 0bf3faf297..781cb128d5 100644 --- a/src/tsd/QueryUi.gwt.xml +++ b/src/tsd/QueryUi.gwt.xml @@ -1,7 +1,7 @@ - + diff --git a/src/tsd/RpcManager.java b/src/tsd/RpcManager.java index 96b98d6f46..61ff738dfe 100644 --- 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( "", - "TSD", "Time Series Database", buf.toString())); + "OpenTSDB", "", buf.toString())); } } diff --git a/src/tsd/static/favicon.ico b/src/tsd/static/favicon.ico old mode 100644 new mode 100755 index 954d3c335e..b2d9ef2245 Binary files a/src/tsd/static/favicon.ico and b/src/tsd/static/favicon.ico differ diff --git a/src/tsd/static/opentsdb_header.jpg b/src/tsd/static/opentsdb_header.jpg new file mode 100755 index 0000000000..ecca08a88f Binary files /dev/null and b/src/tsd/static/opentsdb_header.jpg differ diff --git a/third_party/gwt/include.mk b/third_party/gwt/include.mk index c78c3a7951..83e876026c 100644 --- 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 new file mode 100644 index 0000000000..17b7f7547c --- /dev/null +++ b/third_party/gwt/opentsdb-gwt-theme-1.0.0.jar.md5 @@ -0,0 +1 @@ +458540cf39138f1ad566c2eabf930699
" - + "T" - + "S" - + "D" - + "   
"; + + "
" + + "" + + " 
"; private static final String PAGE_BODY_MID = "