From d8e1a4c7bd4ddd129c58dc412465e895b44b6dbb Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Wed, 27 Mar 2013 16:29:09 +0100 Subject: [PATCH] Make status.o.o header and footer reusable Externalize the top menu and footer section of status.openstack.org so that it can be reused by child pages without them having to know about each other. Fixes bug 1129239. Note: this does not make child pages other than the default page use the reusable header/footer: that should be pushed in subsequent commits. Additionally, clean up unused .js links that result in 404s. Change-Id: I75e2d827648cb648a2887f4b036342f18690ab92 Reviewed-on: https://review.openstack.org/25530 Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- .../openstack_project/files/status/common.js | 94 +++++++++++++++++++ .../openstack_project/files/status/index.html | 73 ++------------ modules/openstack_project/manifests/static.pp | 6 ++ 3 files changed, 107 insertions(+), 66 deletions(-) create mode 100644 modules/openstack_project/files/status/common.js diff --git a/modules/openstack_project/files/status/common.js b/modules/openstack_project/files/status/common.js new file mode 100644 index 0000000000..e6f4cd0cc1 --- /dev/null +++ b/modules/openstack_project/files/status/common.js @@ -0,0 +1,94 @@ +// Copyright 2013 OpenStack Foundation +// // +// // 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. + +function header(activeTabName) { + tabsName = new Array(); + tabsLink = new Array(); + tabsName[0] = 'Status'; tabsLink[0] = 'http://status.openstack.org/'; + tabsName[1] = 'Zuul'; tabsLink[1] = 'http://status.openstack.org/zuul/'; + tabsName[2] = 'Rechecks'; tabsLink[2] = 'http://status.openstack.org/rechecks/'; + tabsName[3] = 'Release'; tabsLink[3] = 'http://status.openstack.org/release/'; + tabsName[4] = 'Reviews'; tabsLink[4] = 'http://status.openstack.org/reviews/'; + tabsName[5] = 'Bugday'; tabsLink[5] = 'http://status.openstack.org/bugday/'; + + document.write( + '
'+ + '') +} + +function footer() { + document.write( + '
'+ + '
'+ + ''+ + '
') +} + diff --git a/modules/openstack_project/files/status/index.html b/modules/openstack_project/files/status/index.html index a7c58da3f1..82e7d2be40 100644 --- a/modules/openstack_project/files/status/index.html +++ b/modules/openstack_project/files/status/index.html @@ -16,11 +16,9 @@ OpenStack Project Status - - - - - + + @@ -50,26 +48,8 @@
-
- -
+ +

OpenStack Infrastructure and Project Status

@@ -116,46 +96,7 @@
-
-
- -
+ + diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index fd28b521fc..1521a9a4c0 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -146,6 +146,12 @@ class openstack_project::static ( require => File['/srv/static/status'], } + file { '/srv/static/status/common.js': + ensure => present, + source => 'puppet:///modules/openstack_project/status/common.js', + require => File['/srv/static/status'], + } + cron { 'gziplogs': user => 'root', minute => '0',