Merge branch 'master' into SHIBUI-692

TIER · Aug 7, 2018 · 5509385 · 5509385
2 parents a7a1ce7 + 903b7e0
commit 5509385
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -45,8 +45,8 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
         },
         {
             id: 'summary',
-            label: 'FINISH SUMMARY AND VALIDATION',
-            index: null,
+            label: 'Finished!',
+            index: 5,
             initialValues: [],
             schema: 'assets/schema/provider/metadata-provider-summary.schema.json'
         }

diff --git a/ui/src/app/metadata/resolver/container/confirm-copy.component.html b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
@@ -22,8 +22,8 @@
                 </li>
                 <li class="nav-item">
                     <h3 class="tag tag-primary">
-                        <span class="index"><i class="fa fa-fw fa-check fa-lg"></i></span>
-                        <ng-container i18n="@@label--finish-summary-validation">FINISH SUMMARY AND VALIDATION</ng-container>
+                        <span class="index"><i class="fa fa-fw fa-check"></i></span>
+                        <ng-container i18n="@@label--finish-summary-validation">Finished!</ng-container>
                     </h3>
                 </li>
                 <li class="nav-item">

diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.html b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
@@ -12,7 +12,7 @@ <h3 class="tag tag-primary">
                     <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information"
                         role="button">
                         <span class="label pull-left" i18n="@@label--finish-validate">
-                            FINISH AND VALIDATE
+                            Finished!
                         </span>
                         <span class="direction pull-right">
                             <i class="fa fa-fw fa-arrow-circle-right d-block fa-2x"></i>

diff --git a/ui/src/assets/schema/provider/metadata-provider-summary.schema.json b/ui/src/assets/schema/provider/metadata-provider-summary.schema.json
@@ -2,10 +2,10 @@
     "type": "object",
     "properties": {
         "enabled": {
-            "title": "Enable Metadata Provider",
-            "description": "Enable Metadata Provider",
+            "title": "Enable Metadata Provider upon saving?",
+            "description": "Enable Metadata Provider upon saving?",
             "type": "boolean",
-            "default": true
+            "default": false
         }
     }
-}
+}