greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #942 from notFloran/suppress-github-diff 

Better build for the WebUI to avoid big diffs in PR
pull/955/head
Nicolas Hennion 2016-10-22 17:40:54 +02:00 committed by GitHub
parent f0341db1bc b574de27d6
commit 86fb5efdbf
11 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1 +1 @@
glances/outputs/static/public/js/*.js -diff glances/outputs/static/public/* -diff linguist-vendored

0
glances/outputs/static/css/bootstrap.min.css → glances/outputs/static/css/bootstrap.css
View File

5
glances/outputs/static/gulpfile.js
View File

@ -4,6 +4,7 @@ var mainBowerFiles = require('main-bower-files');
var ngAnnotate = require('gulp-ng-annotate'); var ngAnnotate = require('gulp-ng-annotate');
var templateCache = require('gulp-angular-templatecache'); var templateCache = require('gulp-angular-templatecache');
var del = require('del'); var del = require('del');
var rename = require('gulp-rename');
gulp.task('clean', function() { gulp.task('clean', function() {
del('./public/*') del('./public/*')
@ -14,6 +15,7 @@ gulp.task('copy', function() {
.pipe(gulp.dest('./public')); .pipe(gulp.dest('./public'));
gulp.src('./css/*.css') gulp.src('./css/*.css')
.pipe(rename({suffix: '.min'}))
.pipe(gulp.dest('./public/css')); .pipe(gulp.dest('./public/css'));
gulp.src('./images/*.png') gulp.src('./images/*.png')
@ -26,6 +28,7 @@ gulp.task('copy', function() {
gulp.task('bower', function() { gulp.task('bower', function() {
return gulp.src(mainBowerFiles()) return gulp.src(mainBowerFiles())
.pipe(concat('vendor.js')) .pipe(concat('vendor.js'))
.pipe(rename({suffix: '.min'}))
.pipe(gulp.dest('./public/js')) .pipe(gulp.dest('./public/js'))
}); });
@ -33,12 +36,14 @@ gulp.task('build-js', function() {
return gulp.src('./js/**/*.js') return gulp.src('./js/**/*.js')
.pipe(ngAnnotate()) .pipe(ngAnnotate())
.pipe(concat('main.js')) .pipe(concat('main.js'))
.pipe(rename({suffix: '.min'}))
.pipe(gulp.dest('./public/js')) .pipe(gulp.dest('./public/js'))
}); });
gulp.task('template', function () { gulp.task('template', function () {
return gulp.src('./html/plugins/*.html') return gulp.src('./html/plugins/*.html')
.pipe(templateCache('templates.js', {'root': 'plugins/', 'module': 'glancesApp'})) .pipe(templateCache('templates.js', {'root': 'plugins/', 'module': 'glancesApp'}))
.pipe(rename({suffix: '.min'}))
.pipe(gulp.dest('./public/js')); .pipe(gulp.dest('./public/js'));
}); });

10
glances/outputs/static/html/index.html
View File

@ -8,13 +8,13 @@
<base href="/"> <base href="/">
<link rel="icon" type="image/x-icon" href="favicon.ico" /> <link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="stylesheet" type="text/css" href="css/normalize.css" /> <link rel="stylesheet" type="text/css" href="css/normalize.min.css" />
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" /> <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="css/style.css" /> <link rel="stylesheet" type="text/css" href="css/style.min.css" />
<script type="text/javascript" src="js/vendor.js"></script> <script type="text/javascript" src="js/vendor.min.js"></script>
<script type="text/javascript" src="js/main.js"></script> <script type="text/javascript" src="js/main.min.js"></script>
<script type="text/javascript" src="js/templates.js"></script> <script type="text/javascript" src="js/templates.min.js"></script>
</head> </head>
<body ng-view="" ng-keydown="onKeyDown($event)"> <body ng-view="" ng-keydown="onKeyDown($event)">

1
glances/outputs/static/package.json
View File

@ -8,6 +8,7 @@
"gulp-angular-templatecache": "^2.0.0", "gulp-angular-templatecache": "^2.0.0",
"gulp-concat": "^2.6.0", "gulp-concat": "^2.6.0",
"gulp-ng-annotate": "^2.0.0", "gulp-ng-annotate": "^2.0.0",
"gulp-rename": "^1.2.2",
"main-bower-files": "^2.13.1" "main-bower-files": "^2.13.1"
}, },
"scripts": { "scripts": {

0
glances/outputs/static/public/css/normalize.css → glances/outputs/static/public/css/normalize.min.css vendored
View File

0
glances/outputs/static/public/css/style.css → glances/outputs/static/public/css/style.min.css vendored
View File

10
glances/outputs/static/public/index.html vendored
View File

@ -8,13 +8,13 @@
<base href="/"> <base href="/">
<link rel="icon" type="image/x-icon" href="favicon.ico" /> <link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="stylesheet" type="text/css" href="css/normalize.css" /> <link rel="stylesheet" type="text/css" href="css/normalize.min.css" />
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" /> <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="css/style.css" /> <link rel="stylesheet" type="text/css" href="css/style.min.css" />
<script type="text/javascript" src="js/vendor.js"></script> <script type="text/javascript" src="js/vendor.min.js"></script>
<script type="text/javascript" src="js/main.js"></script> <script type="text/javascript" src="js/main.min.js"></script>
<script type="text/javascript" src="js/templates.js"></script> <script type="text/javascript" src="js/templates.min.js"></script>
</head> </head>
<body ng-view="" ng-keydown="onKeyDown($event)"> <body ng-view="" ng-keydown="onKeyDown($event)">

0
glances/outputs/static/public/js/main.js → glances/outputs/static/public/js/main.min.js vendored
View File

0
glances/outputs/static/public/js/templates.js → glances/outputs/static/public/js/templates.min.js vendored
View File

0
glances/outputs/static/public/js/vendor.js → glances/outputs/static/public/js/vendor.min.js vendored
View File