From 3c3c833897dbfc0e85feaf36086a505f990ecb76 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Thu, 20 Jul 2017 01:29:49 +0300 Subject: [SDC] 1710 rebase + pom modifications Change-Id: I1f9c0a5201576c7a6b124f6a786db12c1a8cd7c0 Signed-off-by: Michael Lando --- .../onboard-vendor/onboard-vendor-view-model.ts | 7 ++++ .../onboard-vendor/onboard-vendor-view.html | 6 +--- .../view-models/workspace/workspace-view-model.ts | 2 +- .../src/assets/styles/images/welcome/002.png | Bin 854953 -> 224306 bytes catalog-ui/src/index.html | 39 +++++++++++---------- catalog-ui/src/main.ts | 4 +-- 6 files changed, 32 insertions(+), 26 deletions(-) (limited to 'catalog-ui/src') 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 @@
- - - +
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 index e76c480ad8..d4fdae694a 100644 Binary files a/catalog-ui/src/assets/styles/images/welcome/002.png and b/catalog-ui/src/assets/styles/images/welcome/002.png differ 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 @@ - - SDC - - - - + + SDC + + + + + - - Loading... - -
- - - - - - - - + +Loading... + +
+ + + + + + + + + + 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; -- cgit 1.2.3-korg