From 91e6200de16fea550d2e5ae17c47a5fa81f36cfd Mon Sep 17 00:00:00 2001 From: Glauco Oliveira <gvinici@thoughtworks.com> Date: Fri, 30 Oct 2015 11:14:36 +0900 Subject: [PATCH] Update common.js to include OpenStack-Health This commit includes an entry for OpenStack-Health on the header, as well fixes a few minor lint issues found during the process. Change-Id: I57825f7e04bbdb405f7a1e67e4639d6afd7f3c5c --- .../templates/status/common.js.erb | 129 +++++++++--------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/modules/openstack_project/templates/status/common.js.erb b/modules/openstack_project/templates/status/common.js.erb index b4fee555a2..2fe6ee684e 100644 --- a/modules/openstack_project/templates/status/common.js.erb +++ b/modules/openstack_project/templates/status/common.js.erb @@ -1,4 +1,4 @@ -// Copyright 2013 OpenStack Foundation +// Copyright (c) 2013-2015 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 @@ -12,82 +12,85 @@ // // License for the specific language governing permissions and limitations // // under the License. +'use strict'; + function header(activeTabName) { - tabsName = new Array(); - tabsLink = new Array(); + var tabsName = []; + var tabsLink = []; tabsName[0] = 'Status'; tabsLink[0] = '<%= @status_base_url %>'; tabsName[1] = 'Zuul'; tabsLink[1] = '<%= @status_base_url %>/zuul/'; tabsName[2] = 'Rechecks'; tabsLink[2] = '<%= @status_base_url %>/elastic-recheck/'; tabsName[3] = 'QA health'; tabsLink[3] = '<%= @status_base_url %>/openstack-health/'; tabsName[4] = 'Reviews'; tabsLink[4] = '<%= @status_base_url %>/reviews/'; tabsName[5] = 'Bugday'; tabsLink[5] = '<%= @status_base_url %>/bugday/'; + tabsName[6] = 'OpenStack-Health'; tabsLink[6] = '<%= @status_base_url %>/openstack-health/'; document.write( - '<div id="header" class="container">'+ - '<div class="span-5">'+ - ' <h1 id="logo"><a href="<%= @status_base_url %>"><%= @status_title %></a></h1>'+ - '</div>\n'+ - '<div class="span-19 last blueLine">'+ - '<div id="navigation" class="span-19">'+ - '<ul id="Menu1">\n') + '<div id="header" class="container">' + + '<div class="span-5">' + + ' <h1 id="logo"><a href="<%= @status_base_url %>"><%= @status_title %></a></h1>' + + '</div>\n' + + '<div class="span-19 last blueLine">' + + '<div id="navigation" class="span-19">' + + '<ul id="Menu1">\n'); - for (var i = 0; i < tabsName.length; i++) { - document.write('<li><a id="menu-'+tabsName[i]+'" href="'+tabsLink[i]+'"') - if (tabsName[i] == activeTabName) { - document.write(' class="current"'); - } - document.write('>'+tabsName[i]+'</a></li>\n'); - } + tabsName.forEach(function(value, index) { + document.write('<li><a id="menu-' + tabsName[index] + '" href="' + tabsLink[index] + '"'); + if (tabsName[index] == activeTabName) { + document.write(' class="current"'); + } + document.write('>' + tabsName[index] + '</a></li>\n'); + }); document.write( - '</ul>'+ - '</div>'+ - '</div>'+ - '</div>') + '</ul>' + + '</div>' + + '</div>' + + '</div>'); } function footer() { - document.write( - '<div class="container">'+ - '<hr>'+ - '<div id="footer">'+ - '<div class="span-4">'+ - '<h3>OpenStack</h3>'+ - '<ul>'+ - ' <li><a href="http://www.openstack.org/projects/">Projects</a></li>'+ - ' <li><a href="http://www.openstack.org/openstack-security/">OpenStack Security</a></li>'+ - ' <li><a href="http://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>'+ - ' <li><a href="http://www.openstack.org/blog/">Blog</a></li>'+ - '</ul>'+ - '</div>\n'+ - '<div class="span-4">'+ - '<h3>Community</h3>'+ - '<ul>'+ - ' <li><a href="http://www.openstack.org/community/">User Groups</a></li>'+ - ' <li><a href="http://www.openstack.org/events/">Events</a></li>'+ - ' <li><a href="http://www.openstack.org/jobs/">Jobs</a></li>'+ - ' <li><a href="http://www.openstack.org/companies/">Companies</a></li>'+ - ' <li><a href="http://wiki.openstack.org/HowToContribute">Contribute</a></li>'+ - '</ul>'+ - '</div>\n'+ - '<div class="span-4">'+ - '<h3>Documentation</h3>'+ - '<ul>'+ - ' <li><a href="http://docs.openstack.org/">OpenStack Manuals</a></li>'+ - ' <li><a href="http://docs.openstack.org/diablo/openstack-compute/starter/content/">Getting Started</a></li>'+ - ' <li><a href="http://wiki.openstack.org/">Wiki</a></li>'+ - '</ul>'+ - '</div>\n'+ - '<div class="span-4 last">'+ - '<h3>Branding & Legal</h3>'+ - '<ul>'+ - ' <li><a href="http://www.openstack.org/brand/">Logos & Guidelines</a></li>'+ - ' <li><a href="http://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>'+ - ' <li><a href="http://www.openstack.org/privacy/">Privacy Policy</a></li>'+ - ' <li><a href="http://wiki.openstack.org/CLA">OpenStack CLA</a></li>'+ - '</ul>'+ - '</div>'+ - '</div>'+ - '</div>') + document.write( + '<div class="container">' + + '<hr>' + + '<div id="footer">' + + '<div class="span-4">' + + '<h3>OpenStack</h3>' + + '<ul>' + + ' <li><a href="http://www.openstack.org/projects/">Projects</a></li>' + + ' <li><a href="http://www.openstack.org/openstack-security/">OpenStack Security</a></li>' + + ' <li><a href="http://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>' + + ' <li><a href="http://www.openstack.org/blog/">Blog</a></li>' + + '</ul>' + + '</div>\n' + + '<div class="span-4">' + + '<h3>Community</h3>' + + '<ul>' + + ' <li><a href="http://www.openstack.org/community/">User Groups</a></li>' + + ' <li><a href="http://www.openstack.org/events/">Events</a></li>' + + ' <li><a href="http://www.openstack.org/jobs/">Jobs</a></li>' + + ' <li><a href="http://www.openstack.org/companies/">Companies</a></li>' + + ' <li><a href="http://wiki.openstack.org/HowToContribute">Contribute</a></li>' + + '</ul>' + + '</div>\n' + + '<div class="span-4">' + + '<h3>Documentation</h3>' + + '<ul>' + + ' <li><a href="http://docs.openstack.org/">OpenStack Manuals</a></li>' + + ' <li><a href="http://docs.openstack.org/diablo/openstack-compute/starter/content/">Getting Started</a></li>' + + ' <li><a href="http://wiki.openstack.org/">Wiki</a></li>' + + '</ul>' + + '</div>\n' + + '<div class="span-4 last">' + + '<h3>Branding & Legal</h3>' + + '<ul>' + + ' <li><a href="http://www.openstack.org/brand/">Logos & Guidelines</a></li>' + + ' <li><a href="http://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>' + + ' <li><a href="http://www.openstack.org/privacy/">Privacy Policy</a></li>' + + ' <li><a href="http://wiki.openstack.org/CLA">OpenStack CLA</a></li>' + + '</ul>' + + '</div>' + + '</div>' + + '</div>'); }