Merge branch 'master-local' into master-dist

Author: patternfly-build

.travis.yml

@@ -17,7 +17,7 @@ before_install:
 install: true
 
 script:
-  - ./node_modules/patternfly-eng-release/scripts/_build.sh -a
+  - sh -x ./node_modules/patternfly-eng-release/scripts/_build.sh -a
 
 after_success:
   - ./scripts/publish-ghpages.sh -t docs

CHANGELOG.md

@@ -0,0 +1,17 @@
+## 4.0.0 (YYYY-MM-DD) *not released yet*
+
+Enhancements
+- Updated lodash dependency to 4.x
+- Updated angular-bootstrap dependency to 2.3.x
+- Dropped 1.3.x support for dependencies: angular, angular-animate, angular-sanitize, and angular-mocks
+- Removed jQuery dependency
+  - Switched to using "lib/patternfly/dist/js/patternfly-settings.js"
+  - Removed directives: pfSelect, pfDatepicker, pfDateTimepicker
+
+Bug Fixes
+- Update layout for sort, filter, and toolbar to match patternfly markup
+
+
+Breaking Changes
+- pfInlineNotification - pfNotificationRemove function added which ties the click event of the close button to a user specified function.  Previously, this used to be hardcoded to use the Notifications service, this is now optional.
+- pfListView - If defined, actionButton class will replace 'btn-default'. Previously it was appended.  (Issue #434) 

Gruntfile.js

@@ -54,26 +54,20 @@ module.exports = function (grunt) {
       },
       copy: {
         docdata: {
-          cwd: 'lib/patternfly/dist',
+          cwd: 'node_modules/patternfly/dist',
           src: ['fonts/*', 'img/*'],
           dest: 'docs',
           expand: true
         },
         fa: {
-          cwd: 'lib/patternfly/',
+          cwd: 'node_modules/patternfly/',
           src: ['components/font-awesome/**'],
           dest: 'docs',
           expand: true
         },
-        styles: {
-          cwd: 'styles/',
-          src: ['*.css', '!*.min.css'],
-          dest: 'dist/styles',
-          expand: true
-        },
         img: {
           cwd: 'misc/',
-          src: 'patternfly-orb.svg',
+          src: ['patternfly-orb.svg', '*.png'],
           dest: 'docs/img',
           expand: true
         },
@@ -82,13 +76,30 @@ module.exports = function (grunt) {
           src: ['**'],
           dest: 'dist/docs',
           expand: true
+        },
+        distimg: {
+          cwd: 'misc',
+          src: ['canvas-dot-grid.png'],
+          dest: 'dist/imgs',
+          expand: true
+        }
+      },
+      less: {
+        patternfly: {
+          files: {
+            'dist/styles/angular-patternfly.css': 'styles/angular-patternfly.less'
+          },
+          options: {
+            paths: ['src/less/'],
+            strictMath: true
+          }
         }
       },
       cssmin: {
         target: {
           files: [{
             expand: true,
-            cwd: 'styles',
+            cwd: 'dist/styles',
             src: ['*.css', '!*.min.css'],
             dest: 'dist/styles',
             ext: '.min.css'
@@ -124,30 +135,37 @@ module.exports = function (grunt) {
           title: 'Angular Patternfly Documentation',
           dest: 'docs',
           image: 'misc/logo-alt.svg',
-          scripts: ['lib/jquery/dist/jquery.js',
-            'lib/bootstrap/dist/js/bootstrap.js',
-            'lib/patternfly-bootstrap-combobox/js/bootstrap-combobox.js',
-            'lib/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
-            'lib/moment/moment.js',
-            'lib/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
-            'lib/bootstrap-select/js/bootstrap-select.js',
-            'lib/patternfly-bootstrap-treeview/src/js/bootstrap-treeview.js',
-            'lib/c3/c3.js',
-            'lib/d3/d3.js',
-            'lib/patternfly/dist/js/patternfly.js',
-            'lib/angular/angular.js',
-            'lib/angular-sanitize/angular-sanitize.js',
-            'lib/angular-animate/angular-animate.js',
-            'lib/angular-bootstrap/ui-bootstrap-tpls.js',
+          scripts: [
+            'node_modules/jquery/dist/jquery.js',
+            'node_modules/components-jqueryui/jquery-ui.min.js',
+            'node_modules/datatables.net/js/jquery.dataTables.js',
+            'node_modules/datatables.net-select/js/dataTables.select.js',
+            'node_modules/moment/moment.js',
+            'node_modules/c3/c3.js',
+            'node_modules/d3/d3.js',
+            'node_modules/patternfly/dist/js/patternfly-settings.js',
+            'node_modules/patternfly/dist/js/patternfly-settings-colors.js',
+            'node_modules/patternfly/dist/js/patternfly-settings-charts.js',
+            'node_modules/angular/angular.js',
+            'node_modules/angular-dragdrop/src/angular-dragdrop.js',
+            'node_modules/angular-datatables/dist/angular-datatables.min.js',
+            'node_modules/angular-datatables/dist/plugins/select/angular-datatables.select.min.js',
+            'node_modules/angular-sanitize/angular-sanitize.js',
+            'node_modules/angular-animate/angular-animate.js',
+            'node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js',
             'misc/angular-bootstrap-prettify.js',
-            'lib/lodash/lodash.min.js',
+            'node_modules/lodash/lodash.min.js',
             'dist/angular-patternfly.js',
-            'lib/angular-ui-router/release/angular-ui-router.min.js',
+            'node_modules/angular-ui-router/release/angular-ui-router.min.js',
             'node_modules/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js'],
           html5Mode: false,
           template: 'grunt-ngdocs-index.tmpl',
-          styles: ['node_modules/patternfly/dist/css/patternfly.css', 'node_modules/patternfly/dist/css/patternfly-additions.css',
-            'dist/styles/angular-patternfly.css', 'misc/ng-docs.css', 'misc/examples.css']
+          styles: ['node_modules/datatables.net-dt/css/jquery.dataTables.css',
+            'node_modules/patternfly/dist/css/patternfly.css',
+            'node_modules/patternfly/dist/css/patternfly-additions.css',
+            'dist/styles/angular-patternfly.css',
+            'misc/ng-docs.css',
+            'misc/examples.css']
         },
 
         all: ['src/**/*.js']
@@ -200,11 +218,21 @@ module.exports = function (grunt) {
           src: ['modals/**/*.html'],
           dest: 'templates/modals.js'
         },
+        'patternfly.select': {
+          cwd: 'src/',
+          src: ['select/**/*.html'],
+          dest: 'templates/select.js'
+        },
         'patternfly.sort': {
           cwd: 'src/',
           src: ['sort/**/*.html'],
           dest: 'templates/sort.js'
         },
+        'patternfly.table': {
+          cwd: 'src/',
+          src: ['table/**/*.html'],
+          dest: 'templates/table.js'
+        },
         'patternfly.toolbars': {
           cwd: 'src/',
           src: ['toolbars/**/*.html'],
@@ -219,6 +247,11 @@ module.exports = function (grunt) {
           cwd: 'src/',
           src: ['wizard/**/*.html'],
           dest: 'templates/wizard.js'
+        },
+        'patternfly.canvas': {
+          cwd: 'src/',
+          src: ['canvas-view/**/*.html'],
+          dest: 'templates/canvas.js'
         }
       },
       // ng-annotate tries to make the code safe for minification automatically
@@ -251,8 +284,12 @@ module.exports = function (grunt) {
           files: ['Gruntfile.js'],
           tasks: ['eslint']
         },
+        test: {
+          files: ['test/**/*.js'],
+          tasks: ['test']
+        },
         all: {
-          files: ['Gruntfile.js', 'src/**/*.js', 'src/**/*.html', 'styles/**/*.css'],
+          files: ['Gruntfile.js', 'src/**/*.js', 'src/**/*.html', 'styles/**/*.css', '**/*.less'],
           tasks: ['build'],
           options: {
             livereload: 35722
@@ -261,7 +298,7 @@ module.exports = function (grunt) {
       }
     });
 
-    grunt.registerTask('copymain', ['copy:docdata', 'copy:fa', 'copy:styles', 'copy:img']);
+    grunt.registerTask('copymain', ['copy:docdata', 'copy:fa', 'copy:img', 'copy:distimg']);
 
     // You can specify which modules to build as arguments of the build task.
     grunt.registerTask('build', 'Create bootstrap build files', function () {
@@ -281,13 +318,13 @@ module.exports = function (grunt) {
         concatSrc = 'src/**/*.js';
       }
 
-      grunt.task.run(['clean', 'lint', 'test', 'ngtemplates', 'concat', 'ngAnnotate', 'uglify:build', 'cssmin', 'copymain', 'ngdocs', 'clean:templates']);
+      grunt.task.run(['clean', 'lint', 'test', 'ngtemplates', 'concat', 'ngAnnotate', 'uglify:build', 'less', 'cssmin', 'copymain', 'ngdocs', 'clean:templates']);
     });
 
     // Runs all the tasks of build with the exception of tests
     grunt.registerTask('deploy', 'Prepares the project for deployment. Does not run unit tests', function () {
       var concatSrc = 'src/**/*.js';
-      grunt.task.run(['clean', 'lint', 'ngtemplates', 'concat', 'ngAnnotate', 'uglify:build', 'cssmin', 'copymain', 'ngdocs', 'clean:templates']);
+      grunt.task.run(['clean', 'lint', 'ngtemplates', 'concat', 'ngAnnotate', 'uglify:build', 'less', 'cssmin', 'copymain', 'ngdocs', 'clean:templates']);
     });
 
     grunt.registerTask('default', ['build']);

README.md

@@ -21,18 +21,14 @@ You have to install required software before you're able to use grunt:
   Angular Patternfly stays up to date with the Node LTS [Release Schedule](https://github.com/nodejs/LTS#lts_schedule). If you're using Angular Patternfly downstream, we suggest the use of an actively supported version of Node/NPM, although prior versions of Node may work. 
 
 * Install npm - If npm is not already installed with Node.js, you have to install it manually. Find more information on [NPM](https://www.npmjs.org/)
-* Install Bower globally - Find more information on [Bower](http://bower.io/)
 
-        npm install -g bower
 * Install Grunt globally - Find more information on [Grunt](http://gruntjs.com/)
 
         npm install -g grunt-cli
+
 * Install npm dependencies with:
 
         npm install
-* Install bower dependencies with:
-
-        bower install
 
 You should have your environment ready now.
 
@@ -52,8 +48,8 @@ Note:
 
 1. Add Angular and Angular-PatternFly as dependencies for your project and you'll receive all the libraries you'll need:
 
-        $ bower install angular --save
-        $ bower install angular-patternfly --save
+        $ npm install angular --save
+        $ npm install angular-patternfly --save
 
 2. Add the core Patternfly CSS and script includes to your HTML file(s):
 
@@ -62,29 +58,29 @@ Note:
 3. Add the following CSS include to your HTML file(s):
 
         <!-- Angular-PatternFly Styles -->
-        <link rel="stylesheet" href="bower_components/angular-patternfly/dist/styles/angular-patternfly.min.css" />
+        <link rel="stylesheet" href="node_modules/angular-patternfly/dist/styles/angular-patternfly.min.css" />
 
 4. Add the following script includes to your HTML file(s), adjusting where necessary to pull in only what you need:
 
         <!-- Angular -->
-        <script src="bower_components/angular/angular.min.js"></script>
+        <script src="node_modules/angular-patternfly/node_modules/angular/angular.min.js"></script>
 
         <!-- Angular-Bootstrap -->
-        <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
-        <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+        <script src="node_modules/angular-patternfly/node_modules/angular-ui-bootstrap/dist/ui-bootstrap.js"></script>
+        <script src="node_modules/angular-patternfly/node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
 
         <!-- Angular-Sanitize -->
-        <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
+        <script src="node_modules/angular-patternfly/node_modules/angular-sanitize/angular-sanitize.min.js"></script>
 
         <!-- Angular-PatternFly  -->
-        <script src="bower_components/angular-patternfly/dist/angular-patternfly.min.js"></script>
+        <script src="node_modules/angular-patternfly/dist/angular-patternfly.min.js"></script>
 
         <!-- C3, D3 - Charting Libraries. Only required if you are using the 'patternfly.charts' module-->
-        <script src="bower_components/patternfly/components/c3/c3.min.js"></script>
-        <script src="bower_components/patternfly/components/d3/d3.min.js"></script>
+        <script src="node_modules/angular-patternfly/node_modules/patternfly/node_modules/c3/c3.min.js"></script>
+        <script src="node_modules/angular-patternfly/node_modules/patternfly/node_modules/d3/d3.min.js"></script>
 
 5. (optional) The 'patternfly.charts' module is not a dependency in the default angular 'patternfly' module.
-   In order to use patternfly charts you must add 'patternfly.charts' as a dependency in your application:
+   In order to use patternfly charts you must add it as a dependency in your application:
 
         my-app.module.js:
 
@@ -93,6 +89,61 @@ Note:
           'patternfly.charts'
         ]);
 
+6. (optional) The 'patternfly.table' module is not a dependency in the default angular 'patternfly' module.
+   In order to use pfTableView, you must add 'patternfly.table' as a dependency in your application:
+
+        my-app.module.js:
+
+        angular.module('myApp', [
+          'patternfly',
+          'patternfly.table'
+        ]);
+
+   Add the following CSS includes to your HTML file(s):
+
+        <!-- Place before any patternfly css -->
+        <link rel="stylesheet" href="node_modules/datatables.net-dt/css/jquery.dataTables.css" />
+
+   Add the following Javascript includes to your HTML file(s):
+
+        <script src="node_modules/jquery/dist/jquery.js"></script>
+        <script src="node_modules/datatables.net/js/jquery.dataTables.js"></script>
+        <script src="node_modules/datatables.net-select/js/dataTables.select.js"></script>
+        <script src="node_modules/angular-datatables/dist/angular-datatables.min.js"></script>
+        <script src="node_modules/angular-datatables/dist/plugins/select/angular-datatables.select.min.js"></script>
+
+7. (optional) The 'patternfly.canvas' module is not a dependency in the default angular 'patternfly' module.
+   In order to use pfCanvasEditor or pfCanvas, you must add 'patternfly.canvas' as a dependency in your application:
+
+        my-app.module.js:
+
+        angular.module('myApp', [
+          'patternfly',
+          'patternfly.canvas'
+        ]);
+
+   Add the following Javascript includes to your HTML file(s):
+
+        <!-- jquery before angular.js -->
+        <script src="node_modules/jquery/dist/jquery.js"></script>
+        <script src="node_modules/components-jqueryui/jquery-ui.min.js"></script>
+
+        <script src="node_modules/angular/angular.js"></script>
+
+        <!-- angular-dragdrop after angular.js -->
+        <script src="node_modules/angular-dragdrop/src/angular-dragdrop.js"></script>
+
+   Also, the canvas background grid image is located in 'node_modules/angular-patternfly/dist/imgs/canvas-dot-grid.png'
+   please copy this image to your application's main images directory and reference it by overridding the '.canvas' css
+   class:
+
+         <style>
+             .canvas {
+                 background-image: url('/myapp/imgs/canvas-dot-grid.png');
+                 background-repeat: repeat;
+             }
+         </style>
+
 ### Using with Webpack
 
 In order to use Angular-Patternfly in a Webpack-bundled application there are some things you need to keep in mind:
@@ -144,7 +195,7 @@ grunt ngdocs:view --port=8002
 
 ## Releasing
 
-Angular PatternFly is released through Bower. To release a new version version of Angular PatternFly, edit `bower.json` and `package.json` accordingly.
+Angular PatternFly is released through Bower and npm. To release a new version version of Angular PatternFly, edit `bower.json` and `package.json` accordingly.
 
 Update the version listed in `bower.json` by editing the file and changing the line: