Merge pull request #6907 from abiogenesis-now/jyao/intermediate-app-dev

[user-journeys] Content for the application developer persona
kubernetes · Jan 30, 2018 · 471ba62 · 471ba62
2 parents d3fe0bb + 29fa6b8
commit 471ba62
Show file tree

Hide file tree

Showing 18 changed files with 422 additions and 144 deletions.
diff --git a/_config.yml b/_config.yml
@@ -13,6 +13,7 @@ incremental: true
 safe: false
 lsi: false
 
+latest: "v1.9"
 defaults:
   -
     scope:

diff --git a/_data/glossary/annotation.yaml b/_data/glossary/annotation.yaml
@@ -1,6 +1,6 @@
 id: annotation
 name: Annotation
-full-link: docs/concepts/overview/working-with-objects/annotations
+full-link: /docs/concepts/overview/working-with-objects/annotations
 tags:
 - fundamental
 short-description: >

diff --git a/_data/glossary/application-developer.yaml b/_data/glossary/application-developer.yaml
@@ -1,5 +1,6 @@
 id: application-developer
 name: Application Developer
+full-link: docs/user-journeys/users/application-developer/foundational/
 related:
   - application-architect
 tags:

diff --git a/_data/glossary/cluster-operator.yaml b/_data/glossary/cluster-operator.yaml
@@ -1,5 +1,6 @@
 id: cluster-operator
 name: Cluster Operator
+full-link: docs/user-journeys/users/cluster-operator/foundational/
 aka:
   - Cluster Administrator
 related:

diff --git a/_data/glossary/code-contributor.yaml b/_data/glossary/code-contributor.yaml
@@ -1,5 +1,6 @@
 id: code-contributor
 name: Code Contributor
+full-link: docs/imported/community/devel/
 aka:
   - Community Developer
 tags:

diff --git a/_data/glossary/daemonset.yaml b/_data/glossary/daemonset.yaml
@@ -5,6 +5,6 @@ tags:
 - fundamental
 - workload
 short-description: >
-  Ensures a copy of a {% glossary_tooltip term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip term_id="cluster" %}.
+  Ensures a copy of a {% glossary_tooltip text="Pod" term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip text="cluster" term_id="cluster" %}.
 long-description: >
   Used to deploy system daemons such as log collectors and monitoring agents that typically must run on every {% glossary_tooltip term_id="node" %}.
diff --git a/_data/glossary/namespace.yaml b/_data/glossary/namespace.yaml
@@ -4,7 +4,7 @@ full-link: /docs/concepts/overview/working-with-objects/namespaces
 tags:
   - fundamental
 short-description: >
-  An abstraction used by Kubernetes to support multiple virtual clusters on the same physical {% glossary_tooltip term_id="cluster" %}.
+  An abstraction used by Kubernetes to support multiple virtual clusters on the same physical {% glossary_tooltip text="cluster" term_id="cluster" %}.
 long-description: >
   Namespaces are used to organize objects in a cluster and provide a way to divide cluster resources.
   Names of resources need to be unique within a namespace, but not across namespaces.
diff --git a/_data/glossary/persistent-volume.yaml b/_data/glossary/persistent-volume.yaml
@@ -10,7 +10,7 @@ tags:
 - core-object
 - storage
 short-description: >
-  An API object that represents a piece of storage in the cluster. Available as a general, pluggable resource that persists beyond the lifecycle of any individual {% glossary_tooltip term_id="pod" %}.
+  An API object that represents a piece of storage in the cluster. Available as a general, pluggable resource that persists beyond the lifecycle of any individual {% glossary_tooltip text="Pod" term_id="pod" %}.
 long-description: |
   PersistentVolumes (PVs) provide an API that abstracts details of how storage is provided from how it is consumed.
   PVs are used directly in scenarios where storage can be be created ahead of time (static provisioning).

diff --git a/_data/glossary/service-account.yaml b/_data/glossary/service-account.yaml
@@ -5,6 +5,6 @@ tags:
 - fundamental
 - core-object
 short-description: >
-  Provides an identity for processes that run in a Pod {% glossary_tooltip text="Pods" term_id="pod" %}.
+  Provides an identity for processes that run in a {% glossary_tooltip text="Pod" term_id="pod" %}.
 long-description: >
   When processes inside Pods access the cluster, they are authenticated by the API server as a particular service account, for example, `default`. When you create a Pod, if you do not specify a service account, it is automatically assigned the default service account in the same namespace {% glossary_tooltip text="Namespace" term_id="namespace" %}.
diff --git a/_data/user-personas/users/app-developer.yaml b/_data/user-personas/users/app-developer.yaml
@@ -3,41 +3,38 @@ name: Application Developer
 glossary_id: application-developer
 index: 0
 foundational:
-  - label: Set up a development environment
+  - label: Get started with a cluster
     icon: fa-television
     url: /docs/user-journeys/users/application-developer/foundational
-  - label: Deploy, scale, and update an application
+  - label: Deploy an application
     icon: fa-retweet
     url: /docs/user-journeys/users/application-developer/foundational#section-2
-  - label: Understand Kubernetes basics
+  - label: Understand basic Kubernetes architecture
     icon: fa-cog
     url: /docs/user-journeys/users/application-developer/foundational#section-3
   - label: Explore additional resources
     icon: fa-book
     url: /docs/user-journeys/users/application-developer/foundational#section-4
 intermediate:
-  - label: Setup a full-featured or production environment.
-    icon: fa-cube
+  - label: Learn additional workload patterns
+    icon: fa-cogs
     url: /docs/user-journeys/users/application-developer/intermediate
-  - label: Work with commonly used features, such as Service Discovery, Networking, and ReplicaSets.
-    icon: fa-pencil-square-o
+  - label: Deploy a production-ready workload
+    icon: fa-retweet
     url: /docs/user-journeys/users/application-developer/intermediate#section-2
-  - label: Understand key concepts, such as the API/Controller pattern, Schedulers, and Node Affinity.
-    icon: fa-cogs
+  - label: Improve your dev workflow with tooling
+    icon: fa-scissors
     url: /docs/user-journeys/users/application-developer/intermediate#section-3
-  - label: Additional resources.
+  - label: Explore additional resources
     icon: fa-book
     url: /docs/user-journeys/users/application-developer/intermediate#section-4
 advanced:
-  - label: Setup federated clusters.
-    icon: fa-cubes
+  - label: Deploy an application with advanced features
+    icon: fa-plus-square
     url: /docs/user-journeys/users/application-developer/advanced
-  - label: Deploy an application with advanced features, such as StatefulSets, DaemonSets, and Jobs.
-    icon: fa-share
+  - label: Extend the Kubernetes API
+    icon: fa-pencil-square-o
     url: /docs/user-journeys/users/application-developer/advanced#section-2
-  - label: Explore advanced topics, such as Storage Solutions, Custom Resources, and Pod Disruptions.
-    icon: fa-search
-    url: /docs/user-journeys/users/application-developer/advanced#section-3
-  - label: Additional resources.
+  - label: Explore additional resources
     icon: fa-book
-    url: /docs/user-journeys/users/application-developer/advanced#section-4
+    url: /docs/user-journeys/users/application-developer/advanced#section-3
diff --git a/_plugins/glossary_tags.rb b/_plugins/glossary_tags.rb
@@ -1,3 +1,4 @@
+require 'pry'
 # See /_plugins/README.md for full documentation of these custom Jekyll tags
 module Jekyll
   module GlossaryTags
@@ -89,7 +90,7 @@ def render(context)
           gsub(NESTED_MARKDOWN_LINKS, '\2').
           strip
 
-        "<a class='glossary-tooltip' href='#{external_link}'>" \
+        "<a class='glossary-tooltip' href='#{external_link}' target='_blank'>" \
         "#{@args[:text] || term_info["name"]}" \
         "<span class='tooltip-text'>" \
         "#{tooltip}" \

diff --git a/cn/docs/tutorials/kubernetes-basics/index.html b/cn/docs/tutorials/kubernetes-basics/index.html
@@ -38,7 +38,7 @@ <h2>Kubernetes 可以为您做些什么?</h2>
       </div>
     </div>
 
-    <div class="content__modules">
+    <div id="basics-modules" class="content__modules">
       <h2>Kubernetes 基础模块</h2>
       <div class="row">
         <div class="col-md-4">

diff --git a/css/style_user_journeys.css b/css/style_user_journeys.css
@@ -78,7 +78,17 @@ width:80%;
 
 .docstitle {
   margin-bottom:10px !important;
+}
+
+.emphasize-box {
+  background-color: #dde1e4;
+  margin: 2% 10%;
+  padding-top: 20px;
+  padding-bottom: 5px;
+}
 
+.emphasize-box li {
+  font-size: 14px !important;
 }
 
 .browsedocs {
@@ -724,8 +734,8 @@ font-size:24px;
   font-size:14px;
   letter-spacing:0.05em;
   line-height:22px;
-  width:70%;
-  margin-left:15%;
+  width:65%;
+  margin-left:17%;
 
 }
 
@@ -758,21 +768,21 @@ font-size:24px;
 
 .docsection1 li {
   margin-bottom: 0.75em;
-  margin-left: 2em;
+  margin-left: 3em;
   font-size: 16px;
   font-weight:300;
   line-height: 1.75em;
   letter-spacing: 0.1px;
 }
 
-.docsection1 ul li {
-  list-style: disc;
-}
-
 .docsection1 ol li {
   list-style: decimal;
 }
 
+.docsection1 ul li {
+  list-style: disc;
+}
+
 .docsection1 code {
     font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
 
@@ -850,3 +860,32 @@ font-size:24px;
  font-size:16pt;
 
 }
+
+
+table {
+  width: 100%;
+  border: 1px solid #ccc;
+  border-spacing: 0;
+  margin-top: 30px;
+  margin-bottom: 30px;
+}
+
+thead, tr:nth-child(even) {
+  background-color: $light-grey;
+}
+
+thead {
+  background-color: #555;
+  color: white;
+}
+
+th, td {
+  padding: 8px;
+  text-align: left;
+  margin: 0;
+  border: 1px solid #ccc;
+}
+
+th {
+  font-weight: normal;
+}
diff --git a/docs/tutorials/kubernetes-basics/index.html b/docs/tutorials/kubernetes-basics/index.html
@@ -38,7 +38,7 @@ <h2>What can Kubernetes do for you?</h2>
       </div>
     </div>
 
-    <div class="content__modules">
+    <div id="basics-modules" class="content__modules">
       <h2>Kubernetes Basics Modules</h2>
       <div class="row">
         <div class="col-md-12">