Index: demo/src/index.html IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- demo/src/index.html (date 1458814406000) +++ demo/src/index.html (date 1467359537000) @@ -1,6 +1,6 @@ - + @@ -146,17 +146,17 @@ - - - - - - - - - - - + + + + + + + + + + + Index: src/less/main.less IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/less/main.less (date 1458814406000) +++ src/less/main.less (date 1467359537000) @@ -1,5 +1,5 @@ /*! - * Copyright 2014 Hippo B.V. (http://www.onehippo.com) + * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ */ // Source directories -@vendorsPath: "../../components"; +@vendorsPath: "../../node_modules"; @bootstrapPath: "@{vendorsPath}/bootstrap"; @bootstrapLessPath: "@{bootstrapPath}/less"; Index: .bowerrc =================================================================== --- .bowerrc (date 1458814406000) +++ .bowerrc (date 1458814406000) @@ -1,4 +0,0 @@ -{ - "directory": "components", - "json": "bower.json" -} \ No newline at end of file Index: .gitattributes IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- .gitattributes (date 1458814406000) +++ .gitattributes (date 1467359537000) @@ -1,5 +1,4 @@ * text=auto !eol -/.bowerrc -text /.jshintrc -text /.npmrc -text /.travis.yml -text @@ -7,7 +6,6 @@ /LICENSE -text /NOTICE -text /README.md -text -/bower.json -text demo/src/angular-components.html -text demo/src/bootstrap-components.html -text demo/src/css-core.html -text Index: .travis.yml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- .travis.yml (date 1458814406000) +++ .travis.yml (date 1467359537000) @@ -7,8 +7,7 @@ - "sh -e /etc/init.d/xvfb start" before_script: - - npm install -g grunt-cli bower - - bower install --verbose + - npm install -g grunt-cli script: - grunt test:unit \ No newline at end of file Index: bower.json =================================================================== --- bower.json (date 1458814406000) +++ bower.json (date 1458814406000) @@ -1,30 +0,0 @@ -{ - "name": "hippo-theme", - "version": "0.0.1", - "private": true, - "dependencies": { - "angular": "1.2.23", - "angular-route": "1.2.23", - "angular-bootstrap": "0.11.0", - "angular-ui-tree": "2.1.5", - "jquery": "1.11.1", - "underscore": "1.5.2", - "bootstrap": "3.1.0", - "chosen": "https://github.com/harvesthq/chosen/releases/download/v1.1.0/chosen_v1.1.0.zip", - "bootstrap-chosen": "https://github.com/alxlit/bootstrap-chosen.git#3537817bdc98fa29c9053097ed2903aabad071cf", - "es5-shim": "4.0.3", - "fastclick": "1.0.3", - "flot": "0.8.3", - "font-awesome": "4.2.0", - "html5shiv": "3.7.2", - "respond": "1.4.2", - "google-code-prettify": "1.0.3" - }, - "devDependencies": { - "angular-mocks": "1.2.23", - "jasmine-jquery": "2.0.3" - }, - "resolutions": { - "es5-shim": "4.0.3" - } -} Index: Gruntfile.js IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- Gruntfile.js (date 1458814406000) +++ Gruntfile.js (date 1467359537000) @@ -1,5 +1,5 @@ /* - * Copyright 2014 Hippo B.V. (http://www.onehippo.com) + * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,372 +17,374 @@ module.exports = function (grunt) { - var userhome = require('userhome'); + var userhome = require('userhome'); - // display execution time of each task - require('time-grunt')(grunt); + // display execution time of each task + require('time-grunt')(grunt); - // load all grunt tasks automatically - require('load-grunt-tasks')(grunt); + // load all grunt tasks automatically + require('load-grunt-tasks')(grunt); - var cfg = { - tmpDir: '.tmp', - demoRepoDir: 'hippo-theme-demo', - demoSrc: 'demo/src', - demoDist: 'demo/dist' - }; + var cfg = { + tmpDir: '.tmp', + demoRepoDir: 'hippo-theme-demo', + demoSrc: 'demo/src', + demoDist: 'demo/dist' + }; - cfg.tmpRepoDir = userhome(cfg.tmpDir, cfg.demoDist, cfg.demoRepoDir); + cfg.tmpRepoDir = userhome(cfg.tmpDir, cfg.demoDist, cfg.demoRepoDir); - grunt.initConfig({ - // Configuration - cfg: cfg, - userhome: userhome, + grunt.initConfig({ + // Configuration + cfg: cfg, + userhome: userhome, - // Watch for file changes and run corresponding tasks - watch: { - options: { - livereload: true - }, - less: { - files: ['src/**/*.less'], - tasks: ['lintspaces:less', 'less'] - }, - html: { - files: ['<%= cfg.demoSrc %>/**/*.html'] - }, - js: { - files: ['src/**/*.js', '!**/*.spec.js'], - tasks: ['concat:dist', 'uglify:dist'] - }, - demoJs: { - files: ['<%= cfg.demoSrc %>/js/**/*.js'] - }, - images: { - files: ['src/images/**/*.{png,jpg,gif}'], - tasks: ['imagemin'] - } - }, + // Watch for file changes and run corresponding tasks + watch: { + options: { + livereload: true + }, + less: { + files: ['src/**/*.less'], + tasks: ['lintspaces:less', 'less'] + }, + html: { + files: ['<%= cfg.demoSrc %>/**/*.html'] + }, + js: { + files: ['src/**/*.js', '!**/*.spec.js'], + tasks: ['concat:dist', 'uglify:dist'] + }, + demoJs: { + files: ['<%= cfg.demoSrc %>/js/**/*.js'] + }, + images: { + files: ['src/images/**/*.{png,jpg,gif}'], + tasks: ['imagemin'] + } + }, - // clean target (distribution) folder - clean: { + // clean target (distribution) folder + clean: { - bower: [ 'components/**' ], + npm: ['node_modules/**'], - dist: [ 'dist/**/*' ], + dist: ['dist/**/*'], - demo: ['<%= cfg.demoDist %>' ] + demo: ['<%= cfg.demoDist %>'] - }, + }, - // Check if JS files are according to conventions specified in .jshintrc - jshint: { - all: [ - 'src/**/*.js', - '!**/*.spec.js' - ], - options: { - 'jshintrc': true, - reporter: require('jshint-stylish') - } - }, + // Check if JS files are according to conventions specified in .jshintrc + jshint: { + all: [ + 'src/**/*.js', + '!**/*.spec.js' + ], + options: { + 'jshintrc': true, + reporter: require('jshint-stylish') + } + }, - // Concat files - concat: { - options: { - stripBanners: true - }, - dist: { - src: [ - 'src/js/main.js', - 'src/shared/**/*.js', - '!src/shared/**/*.spec.js' - ], - dest: 'dist/js/main.js' - } - }, + // Concat files + concat: { + options: { + stripBanners: true + }, + dist: { + src: [ + 'src/js/main.js', + 'src/shared/**/*.js', + '!src/shared/**/*.spec.js' + ], + dest: 'dist/js/main.js' + } + }, - // Minify JS files - uglify: { - options: { - preserveComments: 'some' - }, - dist: { - files: { - 'dist/js/main.min.js': ['dist/js/main.js'] - } - } - }, + // Minify JS files + uglify: { + options: { + preserveComments: 'some' + }, + dist: { + files: { + 'dist/js/main.min.js': ['dist/js/main.js'] + } + } + }, - // Check if Less fils have correct spaces - lintspaces: { - less: { - src: [ - 'src/**/*.less' - ], - options: { - indentation: 'spaces', - spaces: 4, - ignores: ['js-comments'] - } - } - }, + // Check if Less fils have correct spaces + lintspaces: { + less: { + src: [ + 'src/**/*.less' + ], + options: { + indentation: 'spaces', + spaces: 4, + ignores: ['js-comments'] + } + } + }, - // Compile LessCSS to CSS. - less: { - src: { - files: { - 'dist/css/main.css': 'src/less/main.less' - } - } - }, + // Compile LessCSS to CSS. + less: { + src: { + files: { + 'dist/css/main.css': 'src/less/main.less' + } + } + }, - // Minify CSS files - cssmin: { - options: { - report: 'min' - }, - dist: { - files: { - 'dist/css/main.min.css': ['dist/css/main.css'] - } - } - }, + // Minify CSS files + cssmin: { + options: { + report: 'min' + }, + dist: { + files: { + 'dist/css/main.min.css': ['dist/css/main.css'] + } + } + }, - // Minify images - imagemin: { - dist: { + // Minify images + imagemin: { + dist: { - files: [{ + files: [ + { - expand: true, - cwd: 'src/images', - src: ['**/*.{png,jpg,gif}'], - dest: 'dist/images/' + expand: true, + cwd: 'src/images', + src: ['**/*.{png,jpg,gif}'], + dest: 'dist/images/' - }] - } + } + ] + } - }, + }, - // Copy files - copy: { - demo: { - files: [ - { - expand: true, - cwd: '<%= cfg.demoSrc %>', - src: ['**/*.html'], - dest: '<%= cfg.demoDist %>/' - }, - { - expand: true, - cwd: 'dist/images', - src: ['**/*'], - dest: '<%= cfg.demoDist %>/images/' - }, - { - expand: true, - cwd: 'dist/fonts', - src: ['**/*'], - dest: '<%= cfg.demoDist %>/fonts/' - } - ] - }, + // Copy files + copy: { + demo: { + files: [ + { + expand: true, + cwd: '<%= cfg.demoSrc %>', + src: ['**/*.html'], + dest: '<%= cfg.demoDist %>/' + }, + { + expand: true, + cwd: 'dist/images', + src: ['**/*'], + dest: '<%= cfg.demoDist %>/images/' + }, + { + expand: true, + cwd: 'dist/fonts', + src: ['**/*'], + dest: '<%= cfg.demoDist %>/fonts/' + } + ] + }, - fonts: { - files: [ - { - expand: true, + fonts: { + files: [ + { + expand: true, - cwd: 'components/bootstrap/fonts', + cwd: 'node_modules/bootstrap/fonts', - src: ['**/*'], - dest: 'dist/fonts/' - }, - { - expand: true, + src: ['**/*'], + dest: 'dist/fonts/' + }, + { + expand: true, - cwd: 'components/font-awesome/fonts', + cwd: 'node_modules/font-awesome/fonts', - src: ['**/*'], - dest: 'dist/fonts/' - } - ] - }, + src: ['**/*'], + dest: 'dist/fonts/' + } + ] + }, - toDemoRepo: { - files: [ - { - expand: true, - cwd: '<%= cfg.demoDist %>', - src: [ - '**/*' - ], - dest: '<%= cfg.tmpRepoDir %>' - } - ] - } - }, + toDemoRepo: { + files: [ + { + expand: true, + cwd: '<%= cfg.demoDist %>', + src: [ + '**/*' + ], + dest: '<%= cfg.tmpRepoDir %>' + } + ] + } + }, - useminPrepare: { - options: { - dest: '<%= cfg.demoDist %>' - }, + useminPrepare: { + options: { + dest: '<%= cfg.demoDist %>' + }, - html: '<%= cfg.demoSrc %>/index.html' - }, + html: '<%= cfg.demoSrc %>/index.html' + }, - usemin: { - options: { - assetsDirs: ['<%= cfg.demoDist %>'] - }, + usemin: { + options: { + assetsDirs: ['<%= cfg.demoDist %>'] + }, - html: ['<%= cfg.demoDist %>/index.html'] - }, + html: ['<%= cfg.demoDist %>/index.html'] + }, - // Testing with karma - karma: { - options: { - configFile: 'karma.conf.js', - autoWatch: true - }, + // Testing with karma + karma: { + options: { + configFile: 'karma.conf.js', + autoWatch: true + }, - single: { - singleRun: true, - browsers: ['PhantomJS'] - }, + single: { + singleRun: true, + browsers: ['PhantomJS'] + }, - continuous: { - singleRun: false, - browsers: ['PhantomJS'] - } - }, + continuous: { + singleRun: false, + browsers: ['PhantomJS'] + } + }, - connect: { - options: { - port: 9000, - hostname: '0.0.0.0', - open: 'http://localhost:9000/#/' - }, - demo: { - options: { - livereload: 35729, - base: [ - '<%= cfg.demoSrc %>', - '.' - ] - } - }, - dist: { - options: { - base: [ - '<%= cfg.demoDist %>' - ], - keepalive: true - } - } - }, + connect: { + options: { + port: 9000, + hostname: '0.0.0.0', + open: 'http://localhost:9000/#/' + }, + demo: { + options: { + livereload: 35729, + base: [ + '<%= cfg.demoSrc %>', + '.' + ] + } + }, + dist: { + options: { + base: [ + '<%= cfg.demoDist %>' + ], + keepalive: true + } + } + }, - // Execute commands, in this case to commit the demo to our github page: onehippo.github.io - shell: { - options: { - stdout: true, - stderr: true - }, + // Execute commands, in this case to commit the demo to our github page: onehippo.github.io + shell: { + options: { + stdout: true, + stderr: true + }, - cloneDemo: { - command: 'rm -R <%= userhome(cfg.tmpDir) %> && mkdir -p <%= cfg.tmpRepoDir %> && cd <%= cfg.tmpRepoDir %> && git clone git@github.com:onehippo/hippo-theme-demo.git .' - }, + cloneDemo: { + command: 'rm -R <%= userhome(cfg.tmpDir) %> && mkdir -p <%= cfg.tmpRepoDir %> && cd <%= cfg.tmpRepoDir %> && git clone git@github.com:onehippo/hippo-theme-demo.git .' + }, - commitDemo: { - command: [ - 'echo <%= cfg.tmpRepoDir %>', - 'git add .', - 'git commit -m "New build"' - ].join('&&'), - options: { - execOptions: { - cwd: '<%= cfg.tmpRepoDir %>' - } - } - }, + commitDemo: { + command: [ + 'echo <%= cfg.tmpRepoDir %>', + 'git add .', + 'git commit -m "New build"' + ].join('&&'), + options: { + execOptions: { + cwd: '<%= cfg.tmpRepoDir %>' + } + } + }, - pushDemo: { - command: 'git push origin gh-pages', - options: { - execOptions: { - cwd: '<%= cfg.tmpRepoDir %>' - } - } - } - }, + pushDemo: { + command: 'git push origin gh-pages', + options: { + execOptions: { + cwd: '<%= cfg.tmpRepoDir %>' + } + } + } + }, - // Angular Documentation - ngdocs: { - options: { - dest: '<%= cfg.demoDist %>/docs', - scripts: ['angular.js'], - html5Mode: false, - startPage: '/api', - title: 'Hippo Theme' - }, + // Angular Documentation + ngdocs: { + options: { + dest: '<%= cfg.demoDist %>/docs', + scripts: ['angular.js'], + html5Mode: false, + startPage: '/api', + title: 'Hippo Theme' + }, - api: { - title: 'API reference', - src: ['src/shared/**/*.js'], - api: true - } - } - }); + api: { + title: 'API reference', + src: ['src/shared/**/*.js'], + api: true + } + } + }); - // default - grunt.registerTask('default', [ - 'build:demo' - ]); + // default + grunt.registerTask('default', [ + 'build:demo' + ]); - // build dist - grunt.registerTask('build:dist', 'Build the distribution', [ - 'jshint', - 'lintspaces:less', - 'clean:dist', - 'imagemin', - 'copy:fonts', - 'less', - 'concat:dist', - 'uglify:dist', - 'cssmin:dist' - ]); + // build dist + grunt.registerTask('build:dist', 'Build the distribution', [ + 'jshint', + 'lintspaces:less', + 'clean:dist', + 'imagemin', + 'copy:fonts', + 'less', + 'concat:dist', + 'uglify:dist', + 'cssmin:dist' + ]); - // build demo - grunt.registerTask('build:demo', 'Build and test the demo for github page', [ - 'build:dist', - 'clean:demo', - 'test', - 'useminPrepare', - 'concat:generated', - 'uglify:generated', - 'cssmin:generated', - 'copy:demo', - 'usemin', - 'ngdocs' - ]); + // build demo + grunt.registerTask('build:demo', 'Build and test the demo for github page', [ + 'build:dist', + 'clean:demo', + 'test', + 'useminPrepare', + 'concat:generated', + 'uglify:generated', + 'cssmin:generated', + 'copy:demo', + 'usemin', + 'ngdocs' + ]); - // server with demo page - grunt.registerTask('server:demo', 'Build, test, and show the demo continuously', [ - 'build:demo', - 'connect:demo', - 'watch' - ]); + // server with demo page + grunt.registerTask('server:demo', 'Build, test, and show the demo continuously', [ + 'build:demo', + 'connect:demo', + 'watch' + ]); - grunt.registerTask('server:dist', 'Build, test, and show the demo continuously', [ - 'build:demo', - 'connect:dist' - ]); + grunt.registerTask('server:dist', 'Build, test, and show the demo continuously', [ + 'build:demo', + 'connect:dist' + ]); - // test - grunt.registerTask('test', 'Test the source code', [ - 'karma:single' - ]); + // test + grunt.registerTask('test', 'Test the source code', [ + 'karma:single' + ]); - grunt.registerTask('test:continuous', 'Test the source code continuously', [ - 'karma:continuous' - ]); + grunt.registerTask('test:continuous', 'Test the source code continuously', [ + 'karma:continuous' + ]); - // publish - grunt.registerTask('publish', 'Publish the demo online', [ - 'build:demo', - 'shell:cloneDemo', - 'copy:toDemoRepo', - 'shell:commitDemo', - 'shell:pushDemo' - ]); + // publish + grunt.registerTask('publish', 'Publish the demo online', [ + 'build:demo', + 'shell:cloneDemo', + 'copy:toDemoRepo', + 'shell:commitDemo', + 'shell:pushDemo' + ]); }; Index: karma.conf.js IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- karma.conf.js (date 1458814406000) +++ karma.conf.js (date 1467359537000) @@ -1,5 +1,5 @@ /* - * Copyright 2014 Hippo B.V. (http://www.onehippo.com) + * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,65 +13,65 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// Tests exist alongside the component they are testing with no separate test directory required; the build process should be sophisticated enough to handle this. -// via https://github.com/ngbp/ng-boilerplate#philosophy +// Tests exist alongside the component they are testing with no separate test directory required; the build process +// should be sophisticated enough to handle this. via https://github.com/ngbp/ng-boilerplate#philosophy module.exports = function (config) { - var hippo = { + var hippo = { - bowerComponents : 'components' + npmDir: 'node_modules' - }; + }; - config.set({ - basePath: '', - frameworks: ['jasmine'], + config.set({ + basePath: '', + frameworks: ['jasmine'], - // files to load in the browser - files: [ - // external sources - 'http://maps.google.com/maps/api/js?sensor=false&language=en-US', - 'http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0.2/src/markerclusterer_compiled.js', + // files to load in the browser + files: [ + // external sources + 'http://maps.google.com/maps/api/js?sensor=false&language=en-US', + 'http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0.2/src/markerclusterer_compiled.js', - hippo.bowerComponents + '/underscore/underscore.js', + hippo.npmDir + '/underscore/underscore.js', - // components + // components - hippo.bowerComponents + '/jquery/dist/jquery.js', - hippo.bowerComponents + '/jasmine-jquery/lib/jasmine-jquery.js', - hippo.bowerComponents + '/angular/angular.js', - hippo.bowerComponents + '/angular-mocks/angular-mocks.js', - hippo.bowerComponents + '/angular-bootstrap/**/*.js', - hippo.bowerComponents + '/underscore/underscore.js', - hippo.bowerComponents + '/angular-ui-tree/dist/angular-ui-tree.js', + hippo.npmDir + '/jquery/dist/jquery.js', + hippo.npmDir + '/jasmine-jquery/lib/jasmine-jquery.js', + hippo.npmDir + '/angular/lib/angular.js', + hippo.npmDir + '/angular-mocks/angular-mocks.js', + hippo.npmDir + '/angular-ui-bootstrap/**/*.js', + hippo.npmDir + '/underscore/underscore.js', + hippo.npmDir + '/Angular-NestedSortable/dist/angular-ui-tree.js', - 'src/js/main.js', - 'src/shared/**/*.js' - ], + 'src/js/main.js', + 'src/shared/**/*.js' + ], - // generate js files from html templates to expose them during testing - preprocessors: { - '**/*.html': 'ng-html2js' - }, + // generate js files from html templates to expose them during testing + preprocessors: { + '**/*.html': 'ng-html2js' + }, - // https://github.com/karma-runner/karma-ng-html2js-preprocessor#configuration - ngHtml2JsPreprocessor: { - // setting this option will create only a single module that contains templates - // from all the files, so you can load them all with module('foo') - //moduleName: 'hippo.templates' - }, + // https://github.com/karma-runner/karma-ng-html2js-preprocessor#configuration + ngHtml2JsPreprocessor: { + // setting this option will create only a single module that contains templates + // from all the files, so you can load them all with module('foo') + //moduleName: 'hippo.templates' + }, - // files to exclude - exclude: [], + // files to exclude + exclude: [], - // level of logging - // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG - logLevel: config.LOG_INFO, + // level of logging + // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG + logLevel: config.LOG_INFO, - port: 9876, - reporters: ['dots', 'junit'], + port: 9876, + reporters: ['dots', 'junit'], - junitReporter: { - outputDir: './target/surefire-reports/', - outputFile: 'TEST-karma-results.xml', - }, - }); + junitReporter: { + outputDir: './target/surefire-reports/', + outputFile: 'TEST-karma-results.xml', + }, + }); }; Index: maven-distribution.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- maven-distribution.xml (date 1458814406000) +++ maven-distribution.xml (date 1467359537000) @@ -1,6 +1,6 @@