aboutsummaryrefslogtreecommitdiff
path: root/src/main/webapp/apps
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-06 02:28:10 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-06 02:28:47 +0100
commit15d61bce4cc56b2ee6b87e46eaff2afcf0b7cdaa (patch)
treef79ee79b982ab46724bbd94577bb0c3eb7fca16a /src/main/webapp/apps
parent9199316feef9d751ce73bb71d065345b585d3126 (diff)
downloadesper-testing-15d61bce4cc56b2ee6b87e46eaff2afcf0b7cdaa.tar.gz
esper-testing-15d61bce4cc56b2ee6b87e46eaff2afcf0b7cdaa.tar.bz2
esper-testing-15d61bce4cc56b2ee6b87e46eaff2afcf0b7cdaa.tar.xz
esper-testing-15d61bce4cc56b2ee6b87e46eaff2afcf0b7cdaa.zip
o Relaxed parsing of xml files in case the file is missing.
Diffstat (limited to 'src/main/webapp/apps')
-rw-r--r--src/main/webapp/apps/jenkinsApp/build.html2
-rw-r--r--src/main/webapp/apps/jenkinsApp/jenkinsApp.js2
-rwxr-xr-xsrc/main/webapp/apps/jenkinsApp/job.html2
-rw-r--r--src/main/webapp/apps/jenkinsApp/server-list.html3
-rw-r--r--src/main/webapp/apps/jenkinsApp/server.html3
5 files changed, 11 insertions, 1 deletions
diff --git a/src/main/webapp/apps/jenkinsApp/build.html b/src/main/webapp/apps/jenkinsApp/build.html
index 02fa60b..7239c90 100644
--- a/src/main/webapp/apps/jenkinsApp/build.html
+++ b/src/main/webapp/apps/jenkinsApp/build.html
@@ -1,5 +1,7 @@
<div class="container">
+ <navbar/>
+
<div class="page-header">
<h1>Jenkins Build</h1>
</div>
diff --git a/src/main/webapp/apps/jenkinsApp/jenkinsApp.js b/src/main/webapp/apps/jenkinsApp/jenkinsApp.js
index 1cd2d2a..e42c67b 100644
--- a/src/main/webapp/apps/jenkinsApp/jenkinsApp.js
+++ b/src/main/webapp/apps/jenkinsApp/jenkinsApp.js
@@ -1,6 +1,6 @@
'use strict';
-var jenkinsApp = angular.module('jenkinsApp', ['jenkinsServer', 'jenkinsJob', 'jenkinsBuild', 'pagingTableService']).config(function ($routeProvider) {
+var jenkinsApp = angular.module('jenkinsApp', ['jenkinsServer', 'jenkinsJob', 'jenkinsBuild', 'core.directives', 'pagingTableService']).config(function ($routeProvider) {
$routeProvider.
when('/', {controller: ServerListCtrl, templateUrl: '/apps/jenkinsApp/server-list.html?noCache=' + noCache}).
when('/server/:uuid', {controller: ServerCtrl, templateUrl: '/apps/jenkinsApp/server.html?noCache=' + noCache}).
diff --git a/src/main/webapp/apps/jenkinsApp/job.html b/src/main/webapp/apps/jenkinsApp/job.html
index 027748a..8942ab7 100755
--- a/src/main/webapp/apps/jenkinsApp/job.html
+++ b/src/main/webapp/apps/jenkinsApp/job.html
@@ -1,5 +1,7 @@
<div class="container">
+ <navbar/>
+
<div class="page-header">
<h1>Jenkins Job</h1>
</div>
diff --git a/src/main/webapp/apps/jenkinsApp/server-list.html b/src/main/webapp/apps/jenkinsApp/server-list.html
index e488186..9e297e6 100644
--- a/src/main/webapp/apps/jenkinsApp/server-list.html
+++ b/src/main/webapp/apps/jenkinsApp/server-list.html
@@ -1,4 +1,7 @@
<div class="container">
+
+ <navbar/>
+
<div class="page-header">
<h1>Jenkins Servers</h1>
</div>
diff --git a/src/main/webapp/apps/jenkinsApp/server.html b/src/main/webapp/apps/jenkinsApp/server.html
index 03be57e..7fbd9f5 100644
--- a/src/main/webapp/apps/jenkinsApp/server.html
+++ b/src/main/webapp/apps/jenkinsApp/server.html
@@ -1,5 +1,8 @@
<div class="container">
+ <navbar/>
+
+
<div class="page-header">
<h1>Jenkins Server</h1>
</div>