Permalink
Browse files

Fixed bugs when no user generated config.js is supplied and removed h…

…ardcoded title for jenkins tab
  • Loading branch information...
1 parent 0cac190 commit 951aa545d32b51723e9e9d4225926303487ae437 Adam Hope committed Jul 30, 2012
Showing with 2 additions and 17 deletions.
  1. +0 −15 index.html
  2. +1 −1 js/dashboard.js
  3. +1 −1 js/jenkins.js
View
@@ -14,24 +14,9 @@
<div id="frame">
<ul class="nav nav-tabs">
- <!-- Example: This is how you add an extra tab -->
- <!-- <li><a href="#your-stuff">Your Stuff</a></li> -->
</ul>
<div class="pill-content">
- <!-- Example: Adding extra tab content -->
- <!-- #your-stuff -->
- <!-- <section id="your-stuff">
- <header><h2>Other Stuff</h2></header>
- <div class="content">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
- tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
- quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
- consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
- cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
- proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
- </div>
- </section> -->
</div>
</div>
View
@@ -15,7 +15,7 @@ var dashboard = (function () {
cfg;
function setDefaults() {
- cfg = $.extend({}, DEFAULTS, CONFIG);
+ cfg = typeof CONFIG !== "undefined" ? DEFAULTS : $.extend({}, DEFAULTS);
}
function setTitle() {
View
@@ -90,7 +90,7 @@
function init() {
- el = dashboard.createTab('GMP Build Status');
+ el = dashboard.createTab(dashboardConfig.project_title);
$('header', el.parent()).append('<p class="timestamp" />');

0 comments on commit 951aa54

Please sign in to comment.