Merge branch '_bump_next-v4.0.0-alpha.3-local' into branch-4.0-dev-dist

patternfly · Feb 23, 2017 · 4045e3c · 4045e3c
2 parents a35c783 + 1f6931f
commit 4045e3c
Show file tree

Hide file tree

Showing 174 changed files with 210,464 additions and 21,222 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,16 +21,3 @@ script:
 
 after_success:
   - ./scripts/publish-ghpages.sh -t docs
-
-# OpenShift expects its deployment branch to be "master-dist". This can be changed using:
-# rhc app-configure patternfly/angular --deployment-branch master-dist
-deploy:
-  provider: openshift
-  user: "$OPENSHIFT_USER"
-  password: "$OPENSHIFT_PWD"
-  domain: "patternfly"
-  app: angular
-  skip_cleanup: true
-  on: # The branch and repo that triggered the build
-    branch: master
-    condition: $TRAVIS_REPO_SLUG = "patternfly/angular-patternfly"
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -65,15 +65,9 @@ module.exports = function (grunt) {
           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'
@@ -126,6 +137,7 @@ module.exports = function (grunt) {
           image: 'misc/logo-alt.svg',
           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',
@@ -135,6 +147,7 @@ module.exports = function (grunt) {
             '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',
@@ -143,7 +156,8 @@ module.exports = function (grunt) {
             'misc/angular-bootstrap-prettify.js',
             'node_modules/lodash/lodash.min.js',
             'dist/angular-patternfly.js',
-            'node_modules/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/datatables.net-dt/css/jquery.dataTables.css',
@@ -233,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
@@ -270,7 +289,7 @@ module.exports = function (grunt) {
           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
@@ -279,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 () {
@@ -299,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']);

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 This project will provide a set of common AngularJS directives for use with the PatternFly reference implementation.
 
 * Web site: https://www.patternfly.org
-* API Docs: http://angular-patternfly.rhcloud.com/#/api
+* API Docs: http://www.patternfly.org/angular-patternfly/#/api
 * Build Status: https://travis-ci.org/patternfly/angular-patternfly.svg?branch=master
 
 ## Getting started
@@ -80,7 +80,7 @@ Note:
         <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:
 
@@ -89,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:

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-patternfly",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.3",
   "authors": [
     "Red Hat"
   ],
@@ -39,13 +39,15 @@
   "dependencies": {
     "angular": "1.5.*",
     "angular-animate": "1.5.*",
-    "angular-sanitize": "1.5.*",
     "angular-bootstrap": "2.2.x",
-    "lodash": "4.x",
+    "angular-dragdrop": "1.0.13",
     "angular-datatables": "^0.5.6",
+    "angular-drag-and-drop-lists": "2.0.0",
+    "angular-sanitize": "1.5.*",
     "datatables.net": "^1.10.12",
     "datatables.net-select": "~1.2.0",
-    "patternfly": "~4.0.0-alpha.2"
+    "lodash": "4.x",
+    "patternfly": "~4.0.0-alpha.3"
   },
   "devDependencies": {
     "angular-mocks": "1.5.*",