From 6e232716e7f571e01065614bdc9248d78afb374f Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 4 Nov 2021 16:51:04 +1100 Subject: [PATCH] gerrit: update theme to javascript plugin Gerrit 3.4 deprecates HTML-based plugins, so the old theme doesn't work. I have reworked this into a javascript plugin. This should look the same, although I've achieved things in different ways. This doesn't register light and dark variants; since background-primary-color is white, by setting the header-background-color to this we get white behind the header bar, and it correctly switches to the default black(ish) when in dark mode (currently its seems the header doesn't obey dark mode, so this is an improvement). I'm not sure what's going on with the extant header-border-image which is a linear gradient all of the same color. I modified this down to 1px (same as default) and made it fade in-and-out of the logo colour, just for fun. Change-Id: Ia2e32731c1cfe97639de2ec0e7660c7ed583e045 --- docker/gerrit/bazel/Dockerfile | 2 +- .../files/plugins/opendev-theme-plugin.js | 39 +++++++++++ .../gerrit/files/plugins/opendevtheme.html | 70 ------------------- playbooks/zuul/gerrit/run.yaml | 2 +- 4 files changed, 41 insertions(+), 72 deletions(-) create mode 100644 playbooks/zuul/gerrit/files/plugins/opendev-theme-plugin.js delete mode 100644 playbooks/zuul/gerrit/files/plugins/opendevtheme.html diff --git a/docker/gerrit/bazel/Dockerfile b/docker/gerrit/bazel/Dockerfile index 5c1db52c55..4031001093 100644 --- a/docker/gerrit/bazel/Dockerfile +++ b/docker/gerrit/bazel/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir /var/gerrit/plugins && \ unzip -jo /var/gerrit/bin/gerrit.war WEB-INF/plugins/* -d /var/gerrit/plugins # NOTE(ianw) : copied into build context by playbooks/zuul/gerrit/run.yaml -COPY plugins/opendevtheme.html /var/gerrit/plugins/opendevtheme.html +COPY plugins/opendev-theme-plugin.js /var/gerrit/plugins/opendev-theme-plugin.js # Copy copies only the contents of a directory not the directory itself. COPY static/ /var/gerrit/static/ diff --git a/playbooks/zuul/gerrit/files/plugins/opendev-theme-plugin.js b/playbooks/zuul/gerrit/files/plugins/opendev-theme-plugin.js new file mode 100644 index 0000000000..38742f075a --- /dev/null +++ b/playbooks/zuul/gerrit/files/plugins/opendev-theme-plugin.js @@ -0,0 +1,39 @@ +/** + * @license + * Copyright (C) 2021 Red Hat, Inc. + * + * 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. + */ + +'use strict'; + +const openDevThemeStyle = document.createElement('dom-module'); +openDevThemeStyle.innerHTML = ` + +`; +openDevThemeStyle.register('opendev-site-theme'); + +Gerrit.install(plugin => { + plugin.registerStyleModule('app-theme', 'opendev-site-theme'); +}); diff --git a/playbooks/zuul/gerrit/files/plugins/opendevtheme.html b/playbooks/zuul/gerrit/files/plugins/opendevtheme.html deleted file mode 100644 index 2ffa829412..0000000000 --- a/playbooks/zuul/gerrit/files/plugins/opendevtheme.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/playbooks/zuul/gerrit/run.yaml b/playbooks/zuul/gerrit/run.yaml index c6fe55f3d3..0dd1e081fb 100644 --- a/playbooks/zuul/gerrit/run.yaml +++ b/playbooks/zuul/gerrit/run.yaml @@ -53,7 +53,7 @@ - static/robots.txt - static/system-cla.html - static/usg-cla.html - - plugins/opendevtheme.html + - plugins/opendev-theme-plugin.js - name: Build docker image include_role: