Merge pull request #3137 from tfiduccia/master

Text fixes and alignment for Add Cluster

app/styles/pages/_host.scss

@@ -79,7 +79,7 @@
   .cluster-driver-box {
     border: solid $light-grey 1px;
     padding: 15px 0px;
-    max-height: 150px;
+    max-height: 130px;
     text-decoration: none;
 
     &.small {

lib/global-admin/addon/clusters/new/select/template.hbs

@@ -1,10 +1,5 @@
 <div class="launch-cluster">
   <div class="row mb-20">
-    <div>
-      <label class="acc-label">
-        From exisiting
-      </label>
-    </div>
     <div class="row-same-height row-full-height">
       {{#link-to
          "clusters.new.launch"
@@ -13,7 +8,7 @@
       }}
         <div class="machine-driver custom-driver"></div>
         <div class="driver-content">
-          <h3>Bring your own nodes</h3>
+          <h3>{{t 'clusterNew.custom.label'}}</h3>
           <p class="help-block">
             {{t "clusterNew.custom.helpBlock"}}
           </p>
@@ -27,7 +22,7 @@
       }}
         <div class="machine-driver import-driver"></div>
         <div class="driver-content">
-          <h3>Import Existing</h3>
+          <h3>{{t 'clusterNew.import.label'}}</h3>
           <p class="help-block">
             {{t "clusterNew.import.helpBlock"}}
           </p>
@@ -36,6 +31,32 @@
     </div>
   </div>
 
+
+
+  {{#if (gt (get (get providerGroups "rkeGroup") "length") 0)}}
+    <div class="row">
+      <div class="col span-12">
+        <div>
+          <label class="acc-label">
+            {{t "clusterNew.driverLabels.infra"}}
+          </label>
+        </div>
+        {{#each (get providerGroups "rkeGroup") as |provider|}}
+          {{#link-to
+             "clusters.new.launch"
+             provider.name
+             class=(concat "col span-2 cluster-driver-box small span-height full-height" provider.name)
+          }}
+            <div class="machine-driver {{if provider.genericIcon "generic"}} {{provider.name}}"></div>
+            <div class="driver-content">
+              <p class="driver-name">{{driver-name provider.name}}</p>
+            </div>
+          {{/link-to}}
+        {{/each}}
+      </div>
+    </div>
+  {{/if}}
+  
   {{#if (gt (get (get providerGroups "cloudGroup") "length") 0)}}
     <div class="row">
       <div class="col span-12">
@@ -71,30 +92,6 @@
       </div>
     </div>
   {{/if}}
-
-  {{#if (gt (get (get providerGroups "rkeGroup") "length") 0)}}
-    <div class="row">
-      <div class="col span-12">
-        <div>
-          <label class="acc-label">
-            {{t "clusterNew.driverLabels.infra"}}
-          </label>
-        </div>
-        {{#each (get providerGroups "rkeGroup") as |provider|}}
-          {{#link-to
-             "clusters.new.launch"
-             provider.name
-             class=(concat "col span-2 cluster-driver-box small span-height full-height" provider.name)
-          }}
-            <div class="machine-driver {{if provider.genericIcon "generic"}} {{provider.name}}"></div>
-            <div class="driver-content">
-              <p class="driver-name">{{driver-name provider.name}}</p>
-            </div>
-          {{/link-to}}
-        {{/each}}
-      </div>
-    </div>
-  {{/if}}
 </div>
 
 <div class="footer-actions mt-20">

lib/shared/addon/components/cluster-driver/driver-rke/template.hbs

@@ -15,7 +15,7 @@
 
 {{#unless clusterTemplateCreate}}
   {{#if (or model.clusterTemplateRevisions model.clusterTemplateRevision)}}
-    <section class="cluster-template-select mb-20">
+    <section class="cluster-template-select mb-5">
       <div class="row">
         <div class="col span-6">
           <label class="acc-label" for="use-existing-cluster-template">
@@ -51,13 +51,13 @@
     <ul class="tab-nav">
       {{#if pasteOrUpload}}
         <li>
-          <button class="btn bg-transparent" {{action "cancel"}}>
+          <button class="btn btn-sm bg-transparent" {{action "cancel"}}>
             {{t "clusterNew.advanced.cancel"}}
           </button>
         </li>
       {{else}}
         <li>
-          <button class="btn bg-transparent" {{action "showPaste"}}>
+          <button class="btn btn-sm bg-transparent" {{action "showPaste"}}>
             {{t "clusterNew.advanced.yaml"}} <span class="icon icon-copy"></span>
           </button>
         </li>

lib/shared/addon/components/cru-node-pools/component.js

@@ -26,6 +26,7 @@ const headers = [
     name:           'deleteNotReadyAfterSecs',
     sort:           ['deleteNotReadyAfterSecs'],
     translationKey: 'clusterNew.rke.nodes.deleteNotReadyAfterSecs',
+    width:          150,
   },
   {
     name:           'etcd',

translations/en-us.yaml

@@ -900,9 +900,9 @@ clustersPage:
     label: Disk
   select:
     provider:
-      label: "Create Cluster - Select Cluster Provider"
+      label: "Add Cluster - Select Cluster Type"
     template:
-      label: "Create Cluster - Select Cluster Template"
+      label: "Add Cluster - Select Cluster Template"
 
 clusterRibbonNav:
   title: Recent Clusters
@@ -2517,7 +2517,7 @@ clusterNew:
     cloud: In a hosted Kubernetes provider
     custom: From my own existing nodes
     import: Import existing cluster
-    infra: From nodes in an infrastructure provider
+    infra: From new nodes in an infrastructure provider
     noCloud: There are no cluster drivers enabled.
     noInfra: There are no node drivers enabled.
   externalError: 'Component could not be loaded. Check URL.'
@@ -2534,7 +2534,7 @@ clusterNew:
     title: Cluster Options
   kubernetesOptions:
     title: Kubernetes Options
-    detail: Customize the cluster that will be created
+    detail: Customize the kubernetes cluster options
   security:
     title: Security Options
     detail: Customize the Service Account and Access Scopes
@@ -3273,7 +3273,7 @@ clusterNew:
       hostnamePrefix: Name Prefix
       count: Count
       template: Template
-      deleteNotReadyAfterSecs: Recreate Unreachable After
+      deleteNotReadyAfterSecs: Auto Replace
       deleteNotReadyAfterSecsTooltip: "Should Rancher recreate nodes that have been marked as unreachable by Kubernetes after a timeout? <br /> Note: Values larger than 0 can result in increased costs."
     detected: |
       {count, plural,
@@ -3390,20 +3390,20 @@ clusterNew:
       help: Available for Kubernetes 1.14 with Flannel network provider.
       disabled: Not support {plugin} network provider.
     advanced:
-      label: Advanced Cluster Options
-      detail: Customize advanced options
+      label: Advanced Options
+      detail: Customize advanced cluster options
     authorizedEndpoint:
-      title: Authorized Cluster Endpoint
+      title: Authorized Endpoint
       detail: "Enabling the authorized cluster endpoint allows direct communication with the cluster, bypassing the Rancher API proxy. Authorized endpoints can be retrieved by generating a kubeconfig for the cluster."
       label: Authorized Cluster Endpoint
   custom:
-    label: Custom
+    label: From existing nodes
     shortLabel: Custom
-    helpBlock: You can bring any nodes you want to Rancher and use them to create a cluster. These nodes include on-premise bare metal servers, cloud-hosted virtual machines, or on-premise virtual machines.
+    helpBlock: Create a new Kubernetes cluster out of existing bare-metal servers or virtual machines.
   import:
-    label: Imported
+    label: Import an existing cluster
     shortLabel: Imported
-    helpBlock: Users can import an existing Kubernetes cluster into Rancher. Rancher does not automate the provisioning, scaling, or upgrade of imported clusters. All other Rancher features, including management of cluster, policy, and workloads, are available for imported clusters.
+    helpBlock: Import an existing Kubernetes cluster.  The provider that created it will continue to manage the provisioning and configuration of the cluster.
     command:
       instructionsAdminRole: "<b>Note:</b> If you want to import a Google Kubernetes Engine (GKE) cluster (or any cluster that does not supply you with a kubectl configuration file with the ClusterRole <b>cluster-admin</b> bound to it), you need to bind the ClusterRole <b>cluster-admin</b> using the command below.<br/><br/>Replace <b>[USER_ACCOUNT]</b> with your Google account address (you can retrieve this using <b>gcloud config get-value account</b>). If you are not importing a Google Kubernetes Engine cluster, replace <b>[USER_ACCOUNT]</b> with the executing user configured in your kubectl configuration file."
       instructions: "Run the kubectl command below on an existing Kubernetes cluster running a supported Kubernetes version to import it into {appName}:"