From 872e53aa8425b67f51d5a11fb66a7cb82cf38b30 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Thu, 22 Oct 2020 13:12:08 -0700
Subject: [PATCH] Move appReadme vs helm readme, other catalog tweaks

---
 assets/translations/en-us.yaml     | 10 +++++-----
 pages/c/_cluster/apps/install.vue  | 21 ++++++++++++---------
 pages/c/_cluster/logging/index.vue |  6 +++++-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/assets/translations/en-us.yaml b/assets/translations/en-us.yaml
index 1f42759363..80d0cccf29 100644
--- a/assets/translations/en-us.yaml
+++ b/assets/translations/en-us.yaml
@@ -258,12 +258,12 @@ catalog:
       install: Install {name}
       installGeneric: Install Chart
     section:
-      appReadme: Read Me
+      appReadme: README
       readme: Helm README
       chartOptions: Chart Options
       valuesYaml: Values YAML
-      helm: Helm Options
-    appReadmeGeneric: This chart doesn't have a Rancher-specific readme.  Review the Helm README to learn more about the available configuration options and their usage.
+      helm: Helm Deploy Options
+    appReadmeGeneric: This chart doesn't have a Rancher-specific README.  Review the Helm README to learn more about the available configuration options and their usage.
     project: Install into Project
     helm:
       atomic: Atomic
@@ -1754,8 +1754,8 @@ typeLabel:
     }
   catalog.cattle.io.clusterrepo: |-
     {count, plural,
-      one { Repository }
-      other { Repositories }
+      one { Chart Repository }
+      other { Chart Repositories }
     }
   catalog.cattle.io.repo: |-
     {count, plural,
diff --git a/pages/c/_cluster/apps/install.vue b/pages/c/_cluster/apps/install.vue
index 00eb53eac2..86435f086b 100644
--- a/pages/c/_cluster/apps/install.vue
+++ b/pages/c/_cluster/apps/install.vue
@@ -280,7 +280,7 @@ export default {
       nameDisabled:        false,
       openApi:             true,
       resetValues:         false,
-      selectedTabName:     'readme',
+      selectedTabName:     'appReadme',
       showPreview:         false,
       showDiff:            false,
       showValuesComponent: true,
@@ -766,8 +766,7 @@ export default {
         </div>
       </div>
       <div class="description">
-        <Markdown v-if="versionInfo && versionInfo.appReadme" v-model="versionInfo.appReadme" class="md md-desc" />
-        <p v-else-if="chart.description">
+        <p>
           {{ chart.description }}
         </p>
       </div>
@@ -835,8 +834,9 @@ export default {
           :default-tab="selectedTabName"
           @changed="tabChanged($event)"
         >
-          <Tab v-if="showReadme" name="readme" :label="t('catalog.install.section.readme')" :weight="100">
-            <Markdown v-if="showReadme" ref="readme" v-model="versionInfo.readme" class="md readme" />
+          <Tab name="appReadme" :label="t('catalog.install.section.appReadme')" :weight="100">
+            <Markdown v-if="versionInfo && versionInfo.appReadme" v-model="versionInfo.appReadme" class="md md-desc" />
+            <Markdown v-else :value="t('catalog.install.appReadmeGeneric')" class="md md-desc" />
           </Tab>
 
           <template v-if="valuesComponent && showValuesComponent">
@@ -911,7 +911,11 @@ export default {
             />
           </Tab>
 
-          <Tab name="helm" :label="t('catalog.install.section.helm')" :weight="-1">
+          <Tab v-if="showReadme" name="readme" :label="t('catalog.install.section.readme')" :weight="-1">
+            <Markdown v-if="showReadme" ref="readme" v-model="versionInfo.readme" class="md readme" />
+          </Tab>
+
+          <Tab name="helm" :label="t('catalog.install.section.helm')" :weight="-2">
             <div><Checkbox v-if="existing" v-model="cleanupOnFail" :label="t('catalog.install.helm.cleanupOnFail')" /></div>
             <div><Checkbox v-if="!existing" v-model="crds" :label="t('catalog.install.helm.crds')" /></div>
             <div><Checkbox v-model="hooks" :label="t('catalog.install.helm.hooks')" /></div>
@@ -1001,7 +1005,7 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-  $desc-height: 150px;
+  $desc-height: 100px;
   $padding: 5px;
 
   .md {
@@ -1031,7 +1035,7 @@ export default {
 
     .logo-container {
       height: $desc-height;
-      width: $sideways-tabs-width;
+      width: $desc-height;
       text-align: center;
     }
 
@@ -1041,7 +1045,6 @@ export default {
       background-color: white;
       border: $padding solid white;
       border-radius: calc( 3 * var(--border-radius));
-      margin: 0 auto;
       position: relative;
     }
 
diff --git a/pages/c/_cluster/logging/index.vue b/pages/c/_cluster/logging/index.vue
index 1e6fe725bb..55f0196e98 100644
--- a/pages/c/_cluster/logging/index.vue
+++ b/pages/c/_cluster/logging/index.vue
@@ -8,10 +8,13 @@ import {
   FLOW, CONFIGURED_PROVIDERS, CLUSTER_FLOW, CLUSTER_OUTPUT, OUTPUT, NAMESPACE
 } from '@/config/table-headers';
 import ChartHeading from '@/components/ChartHeading';
+import TypeDescription from '@/components/TypeDescription';
 
 export default {
   middleware: InstallRedirect(NAME, CHART_NAME),
-  components: { ChartHeading, SortableTable },
+  components: {
+    ChartHeading, SortableTable, TypeDescription
+  },
   async fetch() {
     const getAllOrDefault = (type) => {
       const hasAccess = this.$store.getters[`cluster/schemaFor`](type);
@@ -86,6 +89,7 @@ export default {
 
 <template>
   <div class="logging">
+    <TypeDescription resource="logging" />
     <ChartHeading :label="t('logging.overview.poweredBy')" url="https://github.com/banzaicloud/logging-operator" />
     <div class="spacer" />
     <div v-if="hasClusterFlowAccess">