Skip to content

Commit

Permalink
Merge branch 'master' into master-dist
Browse files Browse the repository at this point in the history
  • Loading branch information
dlabrecq committed Aug 6, 2017
2 parents 2fff1f1 + 2daa06d commit 2a557b5
Show file tree
Hide file tree
Showing 38 changed files with 2,851 additions and 16 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: node_js
node_js:
- '6'

cache:
directories:
- node_modules

notifications:
email: false

node_js:
- '6'

env:
global:
- ENCRYPTION_LABEL: "a8c5e363dc84"
Expand All @@ -24,9 +24,10 @@ install: true
script:
- sh -x ./node_modules/patternfly-eng-release/scripts/_build.sh -x

before_script:
- npm prune
after_success:
- if [[ -s package.json ]]; then cp package.json dist; fi
- if [[ -s npm-shrinkwrap.json ]]; then cp package.json dist; fi
- npm prune
- npm run semantic-release
- npm run publish-travis

Expand Down
12 changes: 12 additions & 0 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,15 @@ export { ToolbarConfig } from './src/app/toolbar/toolbar-config';
export { ToolbarComponent } from './src/app/toolbar/toolbar.component';
export { ToolbarModule } from './src/app/toolbar/toolbar.module';
export { ToolbarView } from './src/app/toolbar/toolbar-view';

// Wizard
export { WizardBase } from './src/app/wizard/wizard-base';
export { WizardComponent } from './src/app/wizard/wizard.component';
export { WizardConfig } from './src/app/wizard/wizard-config';
export { WizardEvent } from './src/app/wizard/wizard-event';
export { WizardModule } from './src/app/wizard/wizard.module';
export { WizardReviewComponent } from './src/app/wizard/wizard-review.component';
export { WizardStep } from './src/app/wizard/wizard-step';
export { WizardStepComponent } from './src/app/wizard/wizard-step.component';
export { WizardStepConfig } from './src/app/wizard/wizard-step-config';
export { WizardSubstepComponent } from './src/app/wizard/wizard-substep.component';
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"start:demo": "webpack-dev-server --config config/webpack.demo.js --progress --host 0.0.0.0 --port 8001 --profile --watch --content-base dist-demo",
"test": "karma start",
"transpile": "gulp transpile",
"semantic-release": "semantic-release pre && cp package.json dist && npm publish dist/ && semantic-release post",
"semantic-release": "semantic-release pre && npm publish dist/ && semantic-release post",
"semantic-release-build": "npm run build"
},
"license": "Apache-2.0",
Expand Down Expand Up @@ -67,10 +67,10 @@
"@angular/router": "^4.0.1",
"core-js": "2.4.1",
"moment": "2.17.1",
"ngx-bootstrap": "1.7.1",
"patternfly": "^3.24.0",
"ngx-bootstrap": "1.8.0",
"patternfly": "^3.26.1",
"rxjs": "5.0.1",
"zone.js": "0.7.7"
"zone.js": "0.8.4"
},
"devDependencies": {
"@types/jasmine": "2.5.43",
Expand Down Expand Up @@ -133,12 +133,13 @@
"mocha": "3.2.0",
"ng-router-loader": "2.1.0",
"npm-run-all": "4.0.2",
"nsp": "2.7.0",
"null-loader": "0.1.1",
"opt-cli": "1.5.1",
"optimize-js-plugin": "0.0.4",
"parse5": "2.2.3",
"patternfly-eng-publish": "0.0.4",
"patternfly-eng-release": "~3.25.1",
"patternfly-eng-release": "^3.26.3",
"phantomjs-prebuilt": "2.1.14",
"postcss": "6.0.6",
"postcss-loader": "1.3.3",
Expand Down
6 changes: 3 additions & 3 deletions patternfly-ng.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ import { SampleModule } from './src/app/sample/sample.module';
import { SearchHighlightModule } from './src/app/search-highlight/search-highlight.module';
import { SortModule } from './src/app/sort/sort.module';
import { ToolbarModule } from './src/app/toolbar/toolbar.module';
import { WizardModule } from './src/app/wizard/wizard.module';

@NgModule({
imports: [
FormsModule
],
declarations: [
],
exports: [
ActionModule,
EmptyStateModule,
Expand All @@ -28,7 +27,8 @@ import { ToolbarModule } from './src/app/toolbar/toolbar.module';
SampleModule,
SearchHighlightModule,
SortModule,
ToolbarModule
ToolbarModule,
WizardModule
]
})
export class PatternFlyNgModule {
Expand Down
2 changes: 0 additions & 2 deletions src/app/filter/filter-fields.component.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
padding-left: 0;
width: 275px;
}
.btn-default { font-size: 12px; }
.typeahead-input-container {
position: relative;
padding-right: 0;
Expand All @@ -26,7 +25,6 @@
background-color: @color-pf-white;
background-image: none;
color: @color-pf-black-500;
font-size: 12px;
font-style: italic;
font-weight: 400;
}
Expand Down
161 changes: 161 additions & 0 deletions src/app/wizard/examples/wizard-basic-example.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<pfng-wizard #wizard
[config]="wizardConfig"
(onCancel)="wizardExample.closeModal($event)"
(onNext)="nextClicked($event)"
(onStepChange)="stepChanged($event)">
<pfng-wizard-step [config]="step1Config">
<!-- Step 1A: Details -->
<pfng-wizard-substep [config]="step1aConfig" [reviewTemplate]="step1aReviewTemplate">
<form class="form-horizontal">
<div class="form-group required">
<label class="col-sm-2 control-label required-pf" for="name">Name</label>
<div class="col-sm-10">
<input class="form-control" id="name" name="name" type="text" required
[(ngModel)]="data.name"
(ngModelChange)="updateName()">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="description">Description (Optional)</label>
<div class="col-sm-10">
<textarea class="form-control" id="description" name="description" rows="2"
[(ngModel)]="data.description"></textarea>
</div>
</div>
</form>
</pfng-wizard-substep>
<!-- Step 1B: Settings -->
<pfng-wizard-substep [config]="step1bConfig" [reviewTemplate]="step1bReviewTemplate">
<form class="form-horizontal">
<div class="form-group required">
<label class="col-sm-2 control-label" for="lorem">Lorem</label>
<div class="col-sm-10">
<input class="form-control" id="lorem" name="lorem" type="text"
[(ngModel)]="data.lorem">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="ipsum">Ipsum</label>
<div class="col-sm-10">
<textarea class="form-control" id="ipsum" name="ipsum" rows="2"
[(ngModel)]="data.ipsum"></textarea>
</div>
</div>
</form>
</pfng-wizard-substep>
</pfng-wizard-step>
<pfng-wizard-step [config]="step2Config">
<!-- Step 2A: Details -->
<pfng-wizard-substep [config]="step2aConfig" [reviewTemplate]="step2aReviewTemplate">
<form class="form-horizontal">
<div class="form-group required">
<label class="col-sm-2 control-label" for="aliquam">Aliquam</label>
<div class="col-sm-10">
<input class="form-control" id="aliquam" name="aliquam" type="text"
[(ngModel)]="data.aliquam">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="fermentum">Fermentum</label>
<div class="col-sm-10">
<textarea class="form-control" id="fermentum" name="fermentum" rows="2"
[(ngModel)]="data.fermentum"></textarea>
</div>
</div>
</form>
</pfng-wizard-substep>
<!-- Step 2B: Settings -->
<pfng-wizard-substep [config]="step2bConfig" [reviewTemplate]="step2bReviewTemplate">
<form class="form-horizontal">
<div class="form-group required">
<label class="col-sm-2 control-label" for="consectetur">Consectetur</label>
<div class="col-sm-10">
<input class="form-control" id="consectetur" name="consectetur" type="text"
[(ngModel)]="data.consectetur">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="ipsum">Adipiscing</label>
<div class="col-sm-10">
<textarea class="form-control" id="adipiscing" name="adipiscing" rows="2"
[(ngModel)]="data.adipiscing"></textarea>
</div>
</div>
</form>
</pfng-wizard-substep>
</pfng-wizard-step>
<pfng-wizard-step [config]="step3Config">
<!-- Step 3A: Review -->
<pfng-wizard-substep [config]="step3aConfig">
<pfng-wizard-review></pfng-wizard-review>
</pfng-wizard-substep>
<!-- Step 3B: Deploy -->
<pfng-wizard-substep [config]="step3bConfig" (onShow)="startDeploy()">
<div class="wizard-pf-contents">
<div class="wizard-pf-process blank-slate-pf" *ngIf="!deployComplete">
<div class="spinner spinner-lg blank-slate-pf-icon"></div>
<h3 class="blank-slate-pf-main-action">Deployment in progress</h3>
<p class="blank-slate-pf-secondary-action">Lorem ipsum dolor sit amet, porta at suspendisse ac, ut wisi vivamus, lorem sociosqu eget nunc amet. </p>
</div>
<div class="wizard-pf-complete blank-slate-pf" *ngIf="deployComplete">
<div class="wizard-pf-success-icon"><span class="glyphicon glyphicon-ok-circle"></span></div>
<h3 class="blank-slate-pf-main-action">Deployment was successful</h3>
<p class="blank-slate-pf-secondary-action">Lorem ipsum dolor sit amet, porta at suspendisse ac, ut wisi vivamus, lorem sociosqu eget nunc amet. </p>
<button type="button" class="btn btn-lg btn-primary">View Deployment</button>
</div>
</div>
</pfng-wizard-substep>
</pfng-wizard-step>
</pfng-wizard>
<!-- Step 1A: Details -->
<ng-template #step1aReviewTemplate>
<form class="form">
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Name:</span>
<span class="wizard-pf-review-item-value">{{data.name}}</span>
</div>
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Description:</span>
<span class="wizard-pf-review-item-value">{{data.description}}</span>
</div>
</form>
</ng-template>
<!-- Step 1B: Settings -->
<ng-template #step1bReviewTemplate>
<form class="form">
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Lorem:</span>
<span class="wizard-pf-review-item-value">{{data.lorem}}</span>
</div>
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Ipsum:</span>
<span class="wizard-pf-review-item-value">{{data.ipsum}}</span>
</div>
</form>
</ng-template>
<!-- Step 2A: Details -->
<ng-template #step2aReviewTemplate>
<form class="form">
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Aliquam:</span>
<span class="wizard-pf-review-item-value">{{data.aliquam}}</span>
</div>
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Fermentum:</span>
<span class="wizard-pf-review-item-value">{{data.fermentum}}</span>
</div>
</form>
</ng-template>
<!-- Step 2B: Settings -->
<ng-template #step2bReviewTemplate>
<form class="form">
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Consectetur:</span>
<span class="wizard-pf-review-item-value">{{data.consectetur}}</span>
</div>
<div class="wizard-pf-review-item">
<span class="wizard-pf-review-item-label">Adipiscing:</span>
<span class="wizard-pf-review-item-value">{{data.adipiscing}}</span>
</div>
</form>
</ng-template>
Loading

0 comments on commit 2a557b5

Please sign in to comment.