From 08be53181ba0f63da85c65375da91f2e1f2bf0dd Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Mon, 12 Mar 2012 16:57:38 +0000 Subject: [PATCH] Add Openstack look to gerrit * Adds stylesheet, header and images to make gerrit look more like an Openstack thing * Adds Javascript hack that the CSS detects so we don't ruin the style of the patch pages * Adds both openstack and stackforge logo * Also adds stackforge logo to stackforge Jenkins Change-Id: Ic541443fb706ab119a9d47f474bcad2bf8e9907e --- manifests/site.pp | 9 +++-- manifests/stackforge.pp | 6 ++-- modules/gerrit/files/GerritSite.css | 32 ++++++++++++++++++ modules/gerrit/files/GerritSiteHeader.html | 26 ++++++++++++++ modules/gerrit/files/openstack-page-bkg.jpg | Bin 0 -> 3738 bytes .../title.png => gerrit/files/openstack.png} | Bin modules/gerrit/files/stackforge.png | Bin 0 -> 6204 bytes modules/gerrit/manifests/init.pp | 23 ++++++++++++- modules/jenkins_master/files/openstack.png | Bin 0 -> 3670 bytes modules/jenkins_master/files/stackforge.png | Bin 0 -> 6204 bytes modules/jenkins_master/manifests/init.pp | 6 ++-- .../openstack.js.erb} | 2 +- 12 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 modules/gerrit/files/GerritSite.css create mode 100644 modules/gerrit/files/GerritSiteHeader.html create mode 100644 modules/gerrit/files/openstack-page-bkg.jpg rename modules/{jenkins_master/files/title.png => gerrit/files/openstack.png} (100%) create mode 100644 modules/gerrit/files/stackforge.png create mode 100644 modules/jenkins_master/files/openstack.png create mode 100644 modules/jenkins_master/files/stackforge.png rename modules/jenkins_master/{files/openstack.js => templates/openstack.js.erb} (87%) diff --git a/manifests/site.pp b/manifests/site.pp index abc2ce4c58..d419d4aa65 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -162,7 +162,8 @@ node "gerrit.openstack.org" { }, { name => 'openstack-dev/openstack-nose', close_pull => 'true' - } ] + } ], + logo => 'openstack.png' } } @@ -176,7 +177,8 @@ node "gerrit-dev.openstack.org" { github_projects => [ { name => 'gtest-org/test', close_pull => 'true' - } ] + } ], + logo => 'openstack.png' } } @@ -185,7 +187,8 @@ node "jenkins.openstack.org" { include openstack_server class { 'jenkins_master': site => 'jenkins.openstack.org', - serveradmin => 'webmaster@openstack.org' + serveradmin => 'webmaster@openstack.org', + logo => 'openstack.png' } } diff --git a/manifests/stackforge.pp b/manifests/stackforge.pp index 2ca2ec3686..4cbaecf2d5 100644 --- a/manifests/stackforge.pp +++ b/manifests/stackforge.pp @@ -88,7 +88,8 @@ node "review.stackforge.org" { github_projects => [ { name => 'stackforge/MRaaS', close_pull => 'true' - } ] + } ], + logo => 'stackforge.png' } } @@ -97,7 +98,8 @@ node "jenkins.stackforge.org" { include openstack_server class { 'jenkins_master': serveradmin => 'webmaster@stackforge.org', - site => 'jenkins.stackforge.org' + site => 'jenkins.stackforge.org', + logo => 'stackforge.png' } } diff --git a/modules/gerrit/files/GerritSite.css b/modules/gerrit/files/GerritSite.css new file mode 100644 index 0000000000..b322b4e75c --- /dev/null +++ b/modules/gerrit/files/GerritSite.css @@ -0,0 +1,32 @@ +body {color: #535353 !important; background: url("static/openstack-page-bkg.jpg") no-repeat scroll 0 0 white !important; position: static} +a,a:visited {color: #CF2F19 !important; text-decoration: none;} +a:hover {color: #000 !important; text-decoration: underline} + +a.gwt-InlineHyperlink {background: none !important} + +#gerrit_header {display: block !important; position: relative; top: -60px; margin-bottom: -60px; width: 400px; padding-left: 17px} + +#gerrit_topmenu {background: none; position:relative; top: 0px; left: 400px; margin-right: 400px} + +#gerrit_topmenu tbody tr td table {border: 0} + +#gerrit_body table {background: none;} +#gerrit_body:not(.patch) td {border-bottom: 1px solid #C5E2EA; border-right: 1px solid #C5E2EA} +#gerrit_body:not(.patch) tr:nth-child(even) {background: #EEF3F5; color: #353535} +#gerrit_body:not(.patch) tr:nth-child(odd) {background: #FFF; color: #353535} +#gerrit_body.patch tr {background: #FFF; color: #353535} + +#gerrit_body:not(.patch) tr:nth-child(even)>td {background: #EEF3F5; color: #353535} +#gerrit_body:not(.patch) tr:nth-child(odd)>td {background: #FFF; color: #353535} +#gerrit_body tr:nth-child(even)>td.header {background: #EEF3F5; font-style: normal; color: #353535; font-weight: bold;} +#gerrit_body tr:nth-child(odd)>td.header {background: #FFF; font-style: normal; color: #353535; font-weight: bold;} +#gerrit_body tr>td div {background: none; color: #353535} +#gerrit_body tr>td div a {background: none; color: #353535} +#gerrit_body:not(.patch) tr:first-child>td {color: #353535; font-size: 16px; font-style: normal; background: #FFF} + +#gerrit_topmenu tbody tr td table.gwt-TabBar {color: #353535; border-bottom: 1px solid #C5E2EA;} +.gwt-TabBarItem-selected {color: #CF2F19 !important; border-bottom: 3px solid #CF2F19;} +.gwt-TabBarItem {color: #353535; border-right: 0 !important} +.gwt-TabBar .gwt-TabBarItem, .gwt-TabBar .gwt-TabBarRest, .gwt-TabPanelBottom {background: 0 !important;} + +#gerrit_topmenu .gwt-TextBox {width: 250px} diff --git a/modules/gerrit/files/GerritSiteHeader.html b/modules/gerrit/files/GerritSiteHeader.html new file mode 100644 index 0000000000..d243607e35 --- /dev/null +++ b/modules/gerrit/files/GerritSiteHeader.html @@ -0,0 +1,26 @@ +
+

Code Review

+ +
diff --git a/modules/gerrit/files/openstack-page-bkg.jpg b/modules/gerrit/files/openstack-page-bkg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f788c41c26481728fa4329c17c87bde36001adc1 GIT binary patch literal 3738 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 'changeid', match => '([Bb]lue[Pp]rint|[Bb][Pp])[\\s#:]*([A-Za-z0-9\\-]+)', link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2' }, - ] + ], +$logo ) { user { "gerrit2": @@ -123,6 +124,26 @@ $commentlinks = [ { name => 'changeid', require => User["gerrit2"] } + file { '/home/gerrit2/review_site/static/title.png': + ensure => 'present', + source => 'puppet:///modules/gerrit/${logo}', + } + + file { '/home/gerrit2/review_site/static/openstack-page-bkg.jpg': + ensure => 'present', + source => 'puppet:///modules/gerrit/openstack-page-bkg.jpg' + } + + file { '/home/gerrit2/review_site/etc/GerritSite.css': + ensure => 'present', + source => 'puppet:///modules/gerrit/GerritSite.css' + } + + file { '/home/gerrit2/review_site/etc/GerritSiteHeader.html': + ensure => 'present', + source => 'puppet:///modules/gerrit/GerritSiteHeader.html' + } + file { '/home/gerrit2/review_site/etc/replication.config': owner => 'root', group => 'root', diff --git a/modules/jenkins_master/files/openstack.png b/modules/jenkins_master/files/openstack.png new file mode 100644 index 0000000000000000000000000000000000000000..146faec5cfe3773824f4caf39e4480e4974d10df GIT binary patch literal 3670 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 literal 0 HcmV?d00001 diff --git a/modules/jenkins_master/files/stackforge.png b/modules/jenkins_master/files/stackforge.png new file mode 100644 index 0000000000000000000000000000000000000000..26a160beb19141ecfead3b2846e1470b2a1509fc GIT binary patch literal 6204 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 present, - source => "puppet:///modules/jenkins_master/openstack.js", + content => template("jenkins_master/openstack.js.erb"), require => File["/var/lib/jenkins/plugins/simple-theme-plugin"] } @@ -166,7 +166,7 @@ class jenkins_master($site, $serveradmin) { file { "/var/lib/jenkins/plugins/simple-theme-plugin/title.png": ensure => present, - source => "puppet:///modules/jenkins_master/title.png", + source => "puppet:///modules/jenkins_master/${logo}", require => File["/var/lib/jenkins/plugins/simple-theme-plugin"] } } diff --git a/modules/jenkins_master/files/openstack.js b/modules/jenkins_master/templates/openstack.js.erb similarity index 87% rename from modules/jenkins_master/files/openstack.js rename to modules/jenkins_master/templates/openstack.js.erb index c8b0354c6e..8641809024 100644 --- a/modules/jenkins_master/files/openstack.js +++ b/modules/jenkins_master/templates/openstack.js.erb @@ -10,7 +10,7 @@ function makeDoubleDelegate(function1, function2) { function chgeLogo() { var imgs=document.getElementsByTagName("img"); var imgTag = document.createElement("img"); - imgTag.setAttribute("src","https://jenkins.openstack.org/plugin/simple-theme-plugin/title.png"); + imgTag.setAttribute("src","https://<%= site %>/plugin/simple-theme-plugin/title.png"); imgTag.setAttribute("style", "vertical-align: middle;padding-left: 0.75em;"); imgs[0].parentNode.appendChild(imgTag); var spanTag = document.createElement("span");