openstack
/
fuel-stats
Code Issues Proposed changes

Fixed paths for UI files 

Closes-Bug: #1473336

Change-Id: I2bcc3b4dc31324d67b8f95eb0a00141aa57bf00c
This commit is contained in:
Kate Pimenova 2015-08-06 19:21:49 +03:00
parent 4b76d287ab
commit 650e29f03e
6 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
analytics/static/bower.json
View File

@ -22,12 +22,21 @@
"dist/css/bootstrap.css",
"dist/css/bootstrap.css.map",
"dist/js/bootstrap.js"
]
],
"normalize": {
"css": ["*.css", "*.map"]
}
},
"jquery-ui": {
"main": [
"themes/base/*",
"themes/base/images/*",
"jquery-ui.js"
]
],
"normalize": {
"css": ["*.css"],
"css/images": ["*.png"]
}
}
},
"ignore": [

9
analytics/static/gulpfile.js
View File

@ -2,6 +2,7 @@ var gulp = require('gulp');
var jshint = require('gulp-jshint');
var bower = require('gulp-bower');
var bowerMainFiles = require('main-bower-files');
var bowerNormalizer = require('gulp-bower-normalize');
var jscs = require('gulp-jscs');
var lintspaces = require('gulp-lintspaces');
@ -101,7 +102,7 @@ gulp.task('bower-build', function() {
gulp.task('bower', ['bower-build'], function() {
return gulp.src(bowerMainFiles({
checkExistence: true
})
)
.pipe(gulp.dest('js/libs/'));
});
}), {base: './bower_components'})
.pipe(bowerNormalizer({bowerJson: './bower.json'}))
.pipe(gulp.dest('./js/libs/'))
});

4
analytics/static/index.html
View File

@ -9,13 +9,13 @@
<link rel="icon" href="favicon.ico">
<title>Fuel Statistics</title>
<!-- Bootstrap core CSS -->
<link href="js/libs/bootstrap.css" rel="stylesheet">
<link href="js/libs/bootstrap/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="css/nv.d3.css" rel="stylesheet">
<link href="css/fuel-stat.css" rel="stylesheet">
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<script data-main="js/main" src="js/libs/require.js"></script>
<script data-main="js/main" src="js/libs/requirejs/js/require.js"></script>
</head>
<body>

12
analytics/static/js/main.js
View File

@ -3,12 +3,12 @@ requirejs.config({
waitSeconds: 60,
urlArgs: '_=' + (new Date()).getTime(),
paths: {
jquery: 'libs/jquery',
elasticsearch: 'libs/elasticsearch',
d3: 'libs/d3',
d3pie: 'libs/d3pie',
d3tip: 'libs/index',
nv: 'libs/nv.d3',
jquery: 'libs/jquery/js/jquery',
elasticsearch: 'libs/elasticsearch/js/elasticsearch',
d3: 'libs/d3/js/d3',
d3pie: 'libs/d3pie/js/d3pie',
d3tip: 'libs/d3-tip/js/index',
nv: 'libs/nvd3/js/nv.d3',
app: 'app'
},
shim: {

1
analytics/static/package.json
View File

@ -12,6 +12,7 @@
"gulp-lintspaces": "~0.2.2",
"gulp-bower": "~0.0.7",
"main-bower-files": "~2.4.0",
"gulp-bower-normalize": "~1.0.6",
"jshint-stylish": "~1.0.0"
}
}

8
analytics/static/reports.html
View File

@ -9,11 +9,11 @@
<link rel="icon" href="favicon.ico">
<title>Fuel Statistics</title>
<!-- Bootstrap core CSS -->
<link href="js/libs/bootstrap.css" rel="stylesheet">
<link href="js/libs/bootstrap/css/bootstrap.css" rel="stylesheet">
<link href="css/fuel-stat.css" rel="stylesheet">
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.css">
<script src="js/libs/jquery.js"></script>
<script src="js/libs/jquery-ui.js"></script>
<link rel="stylesheet" href="js/libs/jquery-ui/css/jquery-ui.css">
<script src="js/libs/jquery/js/jquery.js"></script>
<script src="js/libs/jquery-ui/js/jquery-ui.js"></script>
<script src="js/reports.js"></script>
</head>
<body>