Merge 1f22680 into e608da2

Azure · Oct 1, 2018 · cdfcc3f · cdfcc3f
2 parents e608da2 + 1f22680
commit cdfcc3f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/client/src/app/site/site-summary/site-summary.component.html b/client/src/app/site/site-summary/site-summary.component.html
@@ -146,21 +146,20 @@
 
 </div>
 
-<div *ngIf="!bodyLoading" id="site-summary-body">
-  <div *ngIf="!showQuickstart && !this.isStandalone" id="site-summary-features">
-    <site-enabled-features [siteInput]="context?.site"></site-enabled-features>
-  </div>
-  <div *ngIf="showQuickstart" id="site-summary-quickstart">
-    <img src="image/quickstart.svg"/>
-    <h2>{{ 'quickstartMessage1' | translate }}</h2>
-    <h2>{{ 'quickstartMessage2' | translate }}</h2>
-    <a class="new-function" 
-      (click)="openQuickstartTab()"
-      tabindex="0"
-      (keydown)="onKeyPress($event, 'functionNew')">
-      <span load-image="image/add.svg" class="icon-small"></span>
-      {{ 'newFunction' | translate }}
-    </a>
-    <!-- <h2>Create a function using our new quickstart and we'll get you going in 5 minutes or less!</h2> -->
-  </div>
+<div id="site-summary-body">
+    <div *ngIf="!this.isStandalone" id="site-summary-features">
+      <site-enabled-features [siteInput]="context?.site"></site-enabled-features>
+    </div>
+    <div *ngIf="showQuickstart" id="site-summary-quickstart">
+      <img src="image/quickstart.svg"/>
+      <h2>{{ 'quickstartMessage1' | translate }}</h2>
+      <h2>{{ 'quickstartMessage2' | translate }}</h2>
+      <a class="new-function" 
+        (click)="openQuickstartTab()"
+        tabindex="0"
+        (keydown)="onKeyPress($event, 'functionNew')">
+        <span load-image="image/add.svg" class="icon-small"></span>
+        {{ 'newFunction' | translate }}
+      </a>
+    </div>
 </div>
diff --git a/client/src/app/site/site-summary/site-summary.component.scss b/client/src/app/site/site-summary/site-summary.component.scss
@@ -65,6 +65,7 @@
 
 #site-summary-features{
     width: 300px;
+    float: left;
 }
 
 #site-summary-quickstart{

diff --git a/client/src/app/site/site-summary/site-summary.component.ts b/client/src/app/site/site-summary/site-summary.component.ts
@@ -58,8 +58,7 @@ export class SiteSummaryComponent extends FeatureComponent<TreeViewInfo<SiteData
     public hideAvailability: boolean;
     public Resources = PortalResources;
     public showDownloadFunctionAppModal = false;
-    public showQuickstart: boolean;
-    public bodyLoading  = true;
+    public showQuickstart = false;
     public notifications: TopBarNotification[];
 
     private _viewInfo: TreeViewInfo<SiteData>;
@@ -180,10 +179,7 @@ export class SiteSummaryComponent extends FeatureComponent<TreeViewInfo<SiteData
 
                 if (r.functionInfo.length === 0 && !this.isStandalone && this.hasWriteAccess && r.runtime.startsWith('2.')) {
                     this.showQuickstart = true;
-                } else {
-                    this.showQuickstart = false;
                 }
-                this.bodyLoading = false;
 
                 if (!r.pingedScmSite) {
                     this.showComponentError({