diff options
Diffstat (limited to 'gerrit-httpd/src/main/java/com/google/gerrit')
3 files changed, 85 insertions, 23 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java index e51731d8d3..dd2ef69571 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java @@ -149,28 +149,9 @@ class GerritConfigProvider implements Provider<GerritConfig> { } config.setCommentLinks(links); - config.setBackgroundColor(getThemeColor("backgroundColor", "#FFFFFF")); - config.setTextColor(getThemeColor("textColor", "#000000")); - config.setTrimColor(getThemeColor("trimColor", "#D4E9A9")); - config.setSelectionColor(getThemeColor("selectionColor", "#FFFFCC")); - - config - .setTopMenuColor(getThemeColor("topMenuColor", config.getTrimColor())); - return config; } - private String getThemeColor(String name, String defaultValue) { - String v = cfg.getString("theme", null, name); - if (v == null || v.isEmpty()) { - v = defaultValue; - } - if (!v.startsWith("#") && v.matches("^[0-9a-fA-F]{2,6}$")) { - v = "#" + v; - } - return v; - } - @Override public GerritConfig get() { try { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java index 45213487da..1c2e5b8ab4 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java @@ -62,6 +62,8 @@ public class HostPageServlet extends HttpServlet { private final Provider<CurrentUser> currentUser; private final GerritConfig config; + private final HostPageData.Theme signedOutTheme; + private final HostPageData.Theme signedInTheme; private final SitePaths site; private final Document template; private final String noCacheName; @@ -70,10 +72,12 @@ public class HostPageServlet extends HttpServlet { @Inject HostPageServlet(final Provider<CurrentUser> cu, final SitePaths sp, - final GerritConfig gc, final ServletContext servletContext) - throws IOException, ServletException { + final ThemeFactory themeFactory, final GerritConfig gc, + final ServletContext servletContext) throws IOException, ServletException { currentUser = cu; config = gc; + signedOutTheme = themeFactory.getSignedOutTheme(); + signedInTheme = themeFactory.getSignedInTheme(); site = sp; final String pageName = "HostPage.html"; @@ -158,12 +162,16 @@ public class HostPageServlet extends HttpServlet { w.write(HPD_ID + ".account="); json(((IdentifiedUser) user).getAccount(), w); w.write(";"); + w.write(HPD_ID + ".accountDiffPref="); json(((IdentifiedUser) user).getAccountDiffPreference(), w); w.write(";"); - final byte[] userData = w.toString().getBytes("UTF-8"); + w.write(HPD_ID + ".theme="); + json(signedInTheme, w); + w.write(";"); + final byte[] userData = w.toString().getBytes("UTF-8"); raw = concat(page.part1, userData, page.part2); } else { raw = page.full; @@ -303,7 +311,14 @@ public class HostPageServlet extends HttpServlet { } part1 = raw.substring(0, p).getBytes("UTF-8"); part2 = raw.substring(raw.indexOf('>', p) + 1).getBytes("UTF-8"); - full = concat(part1, part2, new byte[0]); + + final StringWriter w = new StringWriter(); + w.write(HPD_ID + ".theme="); + json(signedOutTheme, w); + w.write(";"); + + final byte[] themeData = w.toString().getBytes("UTF-8"); + full = concat(part1, themeData, part2); full_gz = HtmlDomUtil.compress(full); } } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ThemeFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ThemeFactory.java new file mode 100644 index 0000000000..a1e09f9861 --- /dev/null +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ThemeFactory.java @@ -0,0 +1,66 @@ +// Copyright (C) 2011 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.httpd.raw; + +import com.google.gerrit.common.data.HostPageData; +import com.google.gerrit.server.config.GerritServerConfig; +import com.google.inject.Inject; + +import org.eclipse.jgit.lib.Config; + +class ThemeFactory { + private final Config cfg; + + @Inject + ThemeFactory(@GerritServerConfig Config cfg) { + this.cfg = cfg; + } + + HostPageData.Theme getSignedOutTheme() { + return getTheme("signed-out"); + } + + HostPageData.Theme getSignedInTheme() { + return getTheme("signed-in"); + } + + private HostPageData.Theme getTheme(String name) { + HostPageData.Theme theme = new HostPageData.Theme(); + theme.backgroundColor = color(name, "backgroundColor", "#FFFFFF"); + theme.textColor = color(name, "textColor", "#000000"); + theme.trimColor = color(name, "trimColor", "#D4E9A9"); + theme.selectionColor = color(name, "selectionColor", "#FFFFCC"); + theme.topMenuColor = color(name, "topMenuColor", theme.trimColor); + return theme; + } + + private String color(String section, String name, String defaultValue) { + String v = cfg.getString("theme", section, name); + if (v == null || v.isEmpty()) { + v = cfg.getString("theme", null, name); + if (v == null || v.isEmpty()) { + if ("signed-in".equals(section) && "backgroundColor".equals(name)) { + v = "#FCFEEF"; + } else { + v = defaultValue; + } + } + } + if (!v.startsWith("#") && v.matches("^[0-9a-fA-F]{2,6}$")) { + v = "#" + v; + } + return v; + } +} |