From 32696ea5f5f9ff81184445204b98d084946b8765 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Date: Thu, 8 Jun 2017 22:05:59 -0400 Subject: [PATCH 1/3] (3.x) Fixes for Wizard Issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes to: hide the back button only when ‘true’ is passed, remove trailing space on next and back buttons, reduce margin on cancel button when no back button Fixes #468 Fixes #469 Fixes #474 --- src/wizard/wizard-directive.js | 12 ++++++-- src/wizard/wizard.html | 33 +++++++++++++-------- styles/angular-patternfly.css | 4 +++ test/wizard/wizard-container-hide-back.html | 2 +- test/wizard/wizard.spec.js | 16 ++++++++++ 5 files changed, 52 insertions(+), 15 deletions(-) diff --git a/src/wizard/wizard-directive.js b/src/wizard/wizard-directive.js index b7d045075..e5f9686c5 100644 --- a/src/wizard/wizard-directive.js +++ b/src/wizard/wizard-directive.js @@ -399,9 +399,7 @@ angular.module('patternfly.wizard').directive('pfWizard', function ($window) { $scope.steps = []; $scope.context = {}; this.context = $scope.context; - $scope.hideHeader = $scope.hideHeader === 'true'; this.hideSidebar = $scope.hideSidebar === 'true'; - $scope.hideBaackButton = $scope.hideBackButton === 'true'; // If a step class is given use it for all steps if (angular.isDefined($scope.stepClass)) { @@ -702,6 +700,16 @@ angular.module('patternfly.wizard').directive('pfWizard', function ($window) { $scope.wizard = this; }, link: function ($scope) { + $scope.$watch('hideBackButton', function () { + $scope.hideBackButton = $scope.hideBackButton === 'true' || $scope.hideBackButton === true; + }); + $scope.$watch('hideHeader', function () { + $scope.hideHeader = $scope.hideHeader === 'true' || $scope.hideHeader === true; + }); + $scope.$watch('hideSidebar', function () { + $scope.hideSidebar = $scope.hideSidebar === 'true' || $scope.hideSidebar === true; + }); + $scope.$watch('wizardReady', function () { if ($scope.wizardReady) { $scope.goTo($scope.getEnabledSteps()[0]); diff --git a/src/wizard/wizard.html b/src/wizard/wizard.html index 40e1cb4c7..3e62fa8c6 100644 --- a/src/wizard/wizard.html +++ b/src/wizard/wizard.html @@ -29,21 +29,30 @@

{{loadingWizardTitle}}

diff --git a/styles/angular-patternfly.css b/styles/angular-patternfly.css index 5d975ef7d..39580af1b 100644 --- a/styles/angular-patternfly.css +++ b/styles/angular-patternfly.css @@ -480,3 +480,7 @@ accordion > .panel-group .panel-open .panel-title > a:before { border-color: #bbb; color: #bbb; } + +.wizard-pf-footer .btn-cancel.wizard-pf-cancel-no-back { + margin-right: 0; +} diff --git a/test/wizard/wizard-container-hide-back.html b/test/wizard/wizard-container-hide-back.html index 992728654..31ce87bcc 100755 --- a/test/wizard/wizard-container-hide-back.html +++ b/test/wizard/wizard-container-hide-back.html @@ -7,7 +7,7 @@ next-callback="nextCallback" back-callback="backCallback" current-step="currentStep" - hide-back-button="true" + hide-back-button="{{hideBackButton}}" wizard-done="deployComplete || deployInProgress" loading-secondary-information="secondaryLoadInformation">
diff --git a/test/wizard/wizard.spec.js b/test/wizard/wizard.spec.js index a1423dd62..822562ade 100644 --- a/test/wizard/wizard.spec.js +++ b/test/wizard/wizard.spec.js @@ -263,7 +263,15 @@ describe('Directive: pfWizard', function () { expect(sidebarPanel.length).toBe(3); }); + it('should show the back button when not specified', function () { + setupWizard('test/wizard/wizard-container.html'); + + var backButton = element.find('.wizard-pf-footer #backButton'); + expect(backButton.length).toBe(1); + }); + it('should hide the back button when specified', function () { + $scope.hideBackButton = true; setupWizard('test/wizard/wizard-container-hide-back.html'); $timeout.flush(); $timeout.flush(); @@ -271,4 +279,12 @@ describe('Directive: pfWizard', function () { var backButton = element.find('.wizard-pf-footer #backButton'); expect(backButton.length).toBe(0); }); + + it('should not hide the back button when specified', function () { + $scope.hideBackButton = false; + setupWizard('test/wizard/wizard-container-hide-back.html'); + + var backButton = element.find('.wizard-pf-footer #backButton'); + expect(backButton.length).toBe(1); + }); }); From 31924e39971a96e7ee9dbbd4c04320e0d419b604 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Date: Fri, 8 Dec 2017 13:56:21 -0500 Subject: [PATCH 2/3] Bump patternfly version to 3.31.1 (#689) This patternfly version includes SASS support. Fixes for wizard and accordion to work with this version of patternfly --- bower.json | 2 +- package.json | 2 +- src/wizard/wizard-directive.js | 12 ++++++------ src/wizard/wizard-step.html | 2 +- src/wizard/wizard.html | 7 ++++--- styles/angular-patternfly.css | 6 ++++++ 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/bower.json b/bower.json index c413743af..9adc98aac 100644 --- a/bower.json +++ b/bower.json @@ -44,7 +44,7 @@ "angular-bootstrap": "0.14.x", "lodash": "3.x", "jquery": "2.x", - "patternfly": "~3.25.0" + "patternfly": "~3.31.1" }, "devDependencies": { "angular-mocks": "1.3.0 - 1.5.*", diff --git a/package.json b/package.json index 3fed1278e..6c7d28cd6 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "angular-ui-bootstrap": "0.14.x", "jquery": "^2.2.4", "lodash": "3.x", - "patternfly": "~3.25.0" + "patternfly": "~3.31.1" }, "devDependencies": { "express": "3.4.4", diff --git a/src/wizard/wizard-directive.js b/src/wizard/wizard-directive.js index e5f9686c5..8b7d29986 100644 --- a/src/wizard/wizard-directive.js +++ b/src/wizard/wizard-directive.js @@ -64,10 +64,10 @@
-
+
-
+
@@ -76,10 +76,10 @@

Wizards should make use of substeps consistently throughout (either using them or not using them). This is an example only.

-
+
-
+
@@ -94,10 +94,10 @@
-
+
-
+
diff --git a/src/wizard/wizard-step.html b/src/wizard/wizard-step.html index e77492c1e..bbabd247c 100644 --- a/src/wizard/wizard-step.html +++ b/src/wizard/wizard-step.html @@ -1,4 +1,4 @@ -
+
  • diff --git a/src/wizard/wizard.html b/src/wizard/wizard.html index 3e62fa8c6..375003354 100644 --- a/src/wizard/wizard.html +++ b/src/wizard/wizard.html @@ -1,9 +1,9 @@
diff --git a/styles/angular-patternfly.css b/styles/angular-patternfly.css index 39580af1b..2ece255f4 100644 --- a/styles/angular-patternfly.css +++ b/styles/angular-patternfly.css @@ -426,6 +426,12 @@ accordion > .panel-group .panel-default .panel-title > a:before { accordion > .panel-group .panel-open .panel-title > a:before { content: "\f107"; } +uib-accordion > .panel-group .panel-default .panel-title > a:before { + content: "\f105"; +} +uib-accordion > .panel-group .panel-open .panel-title > a:before { + content: "\f107"; +} .navbar-brand-txt { line-height: 34px; From 35385c34639831479e522e78ed80f0829185eff4 Mon Sep 17 00:00:00 2001 From: Dan Labrecque Date: Fri, 8 Dec 2017 14:57:29 -0500 Subject: [PATCH 3/3] chore(release): bump version number to 3.26.0 --- bower.json | 2 +- npm-shrinkwrap.json | 173 ++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 3 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 npm-shrinkwrap.json diff --git a/bower.json b/bower.json index 9adc98aac..7dfc4ca43 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-patternfly", - "version": "3.25.0", + "version": "3.26.0", "authors": [ "Red Hat" ], diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json new file mode 100644 index 000000000..8f91687c5 --- /dev/null +++ b/npm-shrinkwrap.json @@ -0,0 +1,173 @@ +{ + "name": "angular-patternfly", + "version": "3.26.0", + "dependencies": { + "angular": { + "version": "1.5.11", + "from": "angular@>=1.3.0 <1.6.0", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.5.11.tgz" + }, + "angular-animate": { + "version": "1.5.11", + "from": "angular-animate@>=1.3.0 <1.6.0", + "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.5.11.tgz" + }, + "angular-drag-and-drop-lists": { + "version": "2.0.0", + "from": "angular-drag-and-drop-lists@2.0.0", + "resolved": "https://registry.npmjs.org/angular-drag-and-drop-lists/-/angular-drag-and-drop-lists-2.0.0.tgz" + }, + "angular-sanitize": { + "version": "1.5.11", + "from": "angular-sanitize@>=1.3.0 <1.6.0", + "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.5.11.tgz" + }, + "angular-ui-bootstrap": { + "version": "0.14.3", + "from": "angular-ui-bootstrap@>=0.14.0 <0.15.0", + "resolved": "https://registry.npmjs.org/angular-ui-bootstrap/-/angular-ui-bootstrap-0.14.3.tgz" + }, + "jquery": { + "version": "2.2.4", + "from": "jquery@>=2.2.4 <3.0.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz" + }, + "lodash": { + "version": "3.10.1", + "from": "lodash@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" + }, + "patternfly": { + "version": "3.31.1", + "from": "patternfly@>=3.31.1 <3.32.0", + "resolved": "https://registry.npmjs.org/patternfly/-/patternfly-3.31.1.tgz", + "dependencies": { + "bootstrap": { + "version": "3.3.7", + "from": "bootstrap@>=3.3.7 <3.4.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz" + }, + "bootstrap-datepicker": { + "version": "1.6.4", + "from": "bootstrap-datepicker@>=1.6.4 <1.7.0", + "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.6.4.tgz" + }, + "bootstrap-sass": { + "version": "3.3.7", + "from": "bootstrap-sass@>=3.3.7 <4.0.0", + "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz" + }, + "bootstrap-select": { + "version": "1.12.4", + "from": "bootstrap-select@>=1.12.2 <2.0.0", + "resolved": "https://registry.npmjs.org/bootstrap-select/-/bootstrap-select-1.12.4.tgz" + }, + "bootstrap-slider": { + "version": "9.10.0", + "from": "bootstrap-slider@>=9.9.0 <10.0.0", + "resolved": "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-9.10.0.tgz" + }, + "bootstrap-switch": { + "version": "3.3.4", + "from": "bootstrap-switch@>=3.3.4 <3.4.0", + "resolved": "https://registry.npmjs.org/bootstrap-switch/-/bootstrap-switch-3.3.4.tgz" + }, + "bootstrap-touchspin": { + "version": "3.1.1", + "from": "bootstrap-touchspin@>=3.1.1 <3.2.0", + "resolved": "https://registry.npmjs.org/bootstrap-touchspin/-/bootstrap-touchspin-3.1.1.tgz" + }, + "c3": { + "version": "0.4.18", + "from": "c3@>=0.4.11 <0.5.0", + "resolved": "https://registry.npmjs.org/c3/-/c3-0.4.18.tgz" + }, + "d3": { + "version": "3.5.17", + "from": "d3@>=3.5.17 <3.6.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz" + }, + "datatables.net": { + "version": "1.10.16", + "from": "datatables.net@>=1.10.15 <2.0.0", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.16.tgz" + }, + "datatables.net-bs": { + "version": "1.10.16", + "from": "datatables.net-bs@>=1.10.9", + "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.16.tgz" + }, + "datatables.net-colreorder": { + "version": "1.3.3", + "from": "datatables.net-colreorder@>=1.3.2 <1.4.0", + "resolved": "https://registry.npmjs.org/datatables.net-colreorder/-/datatables.net-colreorder-1.3.3.tgz" + }, + "datatables.net-colreorder-bs": { + "version": "1.3.3", + "from": "datatables.net-colreorder-bs@>=1.3.2 <1.4.0", + "resolved": "https://registry.npmjs.org/datatables.net-colreorder-bs/-/datatables.net-colreorder-bs-1.3.3.tgz" + }, + "datatables.net-select": { + "version": "1.2.3", + "from": "datatables.net-select@>=1.2.0 <1.3.0", + "resolved": "https://registry.npmjs.org/datatables.net-select/-/datatables.net-select-1.2.3.tgz" + }, + "drmonty-datatables-colvis": { + "version": "1.1.2", + "from": "drmonty-datatables-colvis@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/drmonty-datatables-colvis/-/drmonty-datatables-colvis-1.1.2.tgz" + }, + "eonasdan-bootstrap-datetimepicker": { + "version": "4.17.47", + "from": "eonasdan-bootstrap-datetimepicker@>=4.17.47 <5.0.0", + "resolved": "https://registry.npmjs.org/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.47.tgz" + }, + "font-awesome": { + "version": "4.7.0", + "from": "font-awesome@>=4.7.0 <5.0.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz" + }, + "font-awesome-sass": { + "version": "4.7.0", + "from": "font-awesome-sass@>=4.7.0 <5.0.0", + "resolved": "https://registry.npmjs.org/font-awesome-sass/-/font-awesome-sass-4.7.0.tgz" + }, + "google-code-prettify": { + "version": "1.0.5", + "from": "google-code-prettify@>=1.0.5 <1.1.0", + "resolved": "https://registry.npmjs.org/google-code-prettify/-/google-code-prettify-1.0.5.tgz" + }, + "jquery": { + "version": "3.2.1", + "from": "jquery@>=3.2.1 <3.3.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz" + }, + "jquery-match-height": { + "version": "0.7.2", + "from": "jquery-match-height@>=0.7.2 <0.8.0", + "resolved": "https://registry.npmjs.org/jquery-match-height/-/jquery-match-height-0.7.2.tgz" + }, + "moment": { + "version": "2.14.1", + "from": "moment@>=2.14.1 <2.15.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz" + }, + "moment-timezone": { + "version": "0.4.1", + "from": "moment-timezone@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz" + }, + "patternfly-bootstrap-combobox": { + "version": "1.1.7", + "from": "patternfly-bootstrap-combobox@>=1.1.7 <1.2.0", + "resolved": "https://registry.npmjs.org/patternfly-bootstrap-combobox/-/patternfly-bootstrap-combobox-1.1.7.tgz" + }, + "patternfly-bootstrap-treeview": { + "version": "2.1.5", + "from": "patternfly-bootstrap-treeview@>=2.1.0 <2.2.0", + "resolved": "https://registry.npmjs.org/patternfly-bootstrap-treeview/-/patternfly-bootstrap-treeview-2.1.5.tgz" + } + } + } + } +} diff --git a/package.json b/package.json index 6c7d28cd6..13616e67e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "author": "Red Hat", "name": "angular-patternfly", - "version": "3.25.0", + "version": "3.26.0", "license": "Apache-2.0", "description": "Angular extension of the PatternFly project.", "keywords": [