diff options
| author |   Michael Lando <ml636r@att.com> | 2017-07-20 01:29:49 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-07-20 01:30:06 +0300 |
| commit | 3c3c833897dbfc0e85feaf36086a505f990ecb76 (patch) | |
| tree | 8c308fbe7298aa65066ba0fc8a71e51d20d8e0de /catalog-ui/src | |
| parent | 30db4407bab8cfea48e278d29e55b11c6c0a528c (diff) | |
[SDC] 1710 rebase + pom modifications
Change-Id: I1f9c0a5201576c7a6b124f6a786db12c1a8cd7c0
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-ui/src')
| -rw-r--r-- | catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts | 7 | ||||
| -rw-r--r-- | catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html | 6 | ||||
| -rw-r--r-- | catalog-ui/src/app/view-models/workspace/workspace-view-model.ts | 2 | ||||
| -rw-r--r-- | catalog-ui/src/assets/styles/images/welcome/002.png | bin | 854953 -> 224306 bytes | |||
| -rw-r--r-- | catalog-ui/src/index.html | 39 | ||||
| -rw-r--r-- | catalog-ui/src/main.ts | 4 |
6 files changed, 32 insertions, 26 deletions
diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts index 6d4e6d3c68..37b9b9db9c 100644 --- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts +++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts @@ -48,6 +48,7 @@ export interface IOnboardVendorViewModelScope extends ng.IScope { topNavRootMenu:MenuItemGroup; user:IUserProperties; version:string; + isLoading: boolean; } export class OnboardVendorViewModel { @@ -63,6 +64,12 @@ export class OnboardVendorViewModel { private $q:ng.IQService, private cacheService:CacheService) { + this.$scope.isLoading = true; + + $.getScript("/onboarding/punch-outs_en.js", () => { + this.$scope.isLoading = false; + }); + this.$scope.vendorData = { breadcrumbs: { selectedKeys: [] diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html index 734fb93daf..56a36863e1 100644 --- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html +++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html @@ -1,10 +1,6 @@ <div class="sdc-catalog-container"> - <loader data-display="gui.isLoading"></loader> -<!-- - <ecomp-header menu-data="menuItems" version="{{version}}"></ecomp-header> ---> - + <loader ng-init="isLoading=true" data-display="isLoading"></loader> <div class="w-sdc-main-container"> <punch-out name="'onboarding/vendor'" data="vendorData" user="user" on-event="onVendorEvent"></punch-out> </div> diff --git a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts index ec8b04dbdb..f529e79fa7 100644 --- a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts @@ -636,7 +636,7 @@ export class WorkspaceViewModel { this.$scope.reload = (component:Component):void => { this.$state.go(this.$state.current.name,{id:component.uniqueId},{reload:true}); }; - + }; private initAfterScope = ():void => { diff --git a/catalog-ui/src/assets/styles/images/welcome/002.png b/catalog-ui/src/assets/styles/images/welcome/002.png Binary files differindex e76c480ad8..d4fdae694a 100644 --- a/catalog-ui/src/assets/styles/images/welcome/002.png +++ b/catalog-ui/src/assets/styles/images/welcome/002.png diff --git a/catalog-ui/src/index.html b/catalog-ui/src/index.html index c41532e01c..3a66d4da45 100644 --- a/catalog-ui/src/index.html +++ b/catalog-ui/src/index.html @@ -1,26 +1,29 @@ <!doctype html> <html> <head> - <meta charset="utf-8"> - <title>SDC</title> - <base href="/"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - - <link rel="icon" type="image/x-icon" href="favicon.ico"> + <meta charset="utf-8"> + <title>SDC</title> + <base href="/"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <link rel="icon" type="image/x-icon" href="favicon.ico"> + </head> <body data-ng-class="bodyClass"> - <!--<h1>Index.html</h1>--> - <app-root>Loading...</app-root> - <!--<h2>Before ui-view</h2>--> - <div ui-view style="height:100%"></div> - <!--<h2>After ui-view</h2>--> - <script type="text/javascript" src="/sdc1/scripts/inline.bundle.js"></script> - <script type="text/javascript" src="/sdc1/scripts/polyfills.bundle.js"></script> - <script type="text/javascript" src="/sdc1/scripts/vendor.bundle.js"></script> - <script type="text/javascript" src="/dcae/dcae-bundle.js"></script> - <script type="text/javascript" src="/sdc1/scripts/main.bundle.js"></script> - <script type="text/javascript" src="/sdc1/scripts/styles.bundle.js"></script></body> - <script type="text/javascript" src="/onboarding/punch-outs_en.js" async></script> +<!--<h1>Index.html</h1>--> +<app-root>Loading...</app-root> +<!--<h2>Before ui-view</h2>--> +<div ui-view style="height:100%"></div> +<!--<h2>After ui-view</h2>--> +<script src="/sdc1/scripts/inline.bundle.js"></script> +<script src="/sdc1/scripts/polyfills.bundle.js"></script> +<script src="/sdc1/scripts/vendor.bundle.js"></script> +<script src="/dcae/dcae-bundle.js" async></script> +<script id="main-bundle" src="/sdc1/scripts/main.bundle.js"></script> +<script src="/sdc1/scripts/styles.bundle.js"></script> + +</body> </html> + diff --git a/catalog-ui/src/main.ts b/catalog-ui/src/main.ts index 20e4352901..9d25a34169 100644 --- a/catalog-ui/src/main.ts +++ b/catalog-ui/src/main.ts @@ -38,10 +38,10 @@ if (__ENV__==='prod') { // Ugliy fix because the cookie recieved from webseal change his value after some seconds. declare var __ENV__: string; -let timeout:number = 5000; +let timeout:number = 0; if (__ENV__==='dev'){ timeout=0; -} +} window.setTimeout(()=>{ platformBrowserDynamic().bootstrapModule(AppModule).then(platformRef => { const upgrade = platformRef.injector.get(UpgradeModule) as UpgradeModule; |
