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 0000000000..f788c41c26 Binary files /dev/null and b/modules/gerrit/files/openstack-page-bkg.jpg differ diff --git a/modules/jenkins_master/files/title.png b/modules/gerrit/files/openstack.png similarity index 100% rename from modules/jenkins_master/files/title.png rename to modules/gerrit/files/openstack.png diff --git a/modules/gerrit/files/stackforge.png b/modules/gerrit/files/stackforge.png new file mode 100644 index 0000000000..26a160beb1 Binary files /dev/null and b/modules/gerrit/files/stackforge.png differ diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp index b86aba2598..f08afd02eb 100644 --- a/modules/gerrit/manifests/init.pp +++ b/modules/gerrit/manifests/init.pp @@ -14,7 +14,8 @@ $commentlinks = [ { name => '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 0000000000..146faec5cf Binary files /dev/null and b/modules/jenkins_master/files/openstack.png differ diff --git a/modules/jenkins_master/files/stackforge.png b/modules/jenkins_master/files/stackforge.png new file mode 100644 index 0000000000..26a160beb1 Binary files /dev/null and b/modules/jenkins_master/files/stackforge.png differ diff --git a/modules/jenkins_master/manifests/init.pp b/modules/jenkins_master/manifests/init.pp index 6b490ceb90..6719ccbeb3 100644 --- a/modules/jenkins_master/manifests/init.pp +++ b/modules/jenkins_master/manifests/init.pp @@ -1,4 +1,4 @@ -class jenkins_master($site, $serveradmin) { +class jenkins_master($site, $serveradmin, $logo) { #This key is at http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key apt::key { "D50582E6": @@ -154,7 +154,7 @@ class jenkins_master($site, $serveradmin) { file { "/var/lib/jenkins/plugins/simple-theme-plugin/openstack.js": ensure => 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");