功能优化

.vuepress/components/InstallBanner.vue

@@ -14,7 +14,7 @@
               <transition-group name="lightSpeed" tag="div" class="row">
                 <div class="col-md-6" key="f1" v-show="f1">
                     <!-- InfoBox Center  <Start> -->
-                    <div class="cs-infobox-left mt-4 feature">
+                    <div class="cs-infobox-left mt-4 feature box">
                         <img src="/landing/images/icn3.svg" alt="" class="img-fluid">
                         <div class="text-primary-install-banner">广泛验证</div>
                         <li>每天有超过
@@ -81,7 +81,7 @@
                         <div class="text-primary-install-banner">在线答疑</div>
                         <div>
                           <div style="text-align: center;">
-                            <p><Qq></Qq></p>
+                            <!-- <Qq><Qq></Qq></p> -->
                             <img src="/images/kuboard_qq.png" alt="Kubernetes安装：QQ群在线答疑" style="width: 120px;"/>
                           </div>
                         </div>
@@ -150,7 +150,7 @@ export default {
 .feature {
   text-align: left;
   padding: 1rem;
-  min-height: 260px;
+  min-height: 240px;
   z-index: 10;
   border: 1px solid #f2be45;
   border-radius: 5px;

.vuepress/components/InstallEnvCheck.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="border: solid 1px #E6A23C; background-color: rgb(253, 246, 236); padding: 1rem;">
+  <div style="border: solid 1px #f2be45; background-color: rgba(242, 190, 69, 0.1); padding: 1rem;">
     <div v-show="!envOk" key="not">
 
     <!-- <grid :rwd="{compact: 'stack'}">
@@ -9,7 +9,7 @@
 
       <p style="color: red">必须选中下面的 {{envCount}} 个勾选框才能继续</p>
 
-      <div style="overflow: hidden; background-color: rgba(255,229,100,0.3); padding: 20px 0 0 20px; margin-top: 1rem; margin-bottom: 20px; border: 1px solid #d7dae2;">
+      <div style="overflow: hidden; padding: 20px 0 0 20px; margin-top: 1rem; margin-bottom: 20px; border: 1px solid #d7dae2;">
       <b-form>
         <b-form-group label="选中后显示 安装 docker/kubelet 的文档">
           <b-form-checkbox-group id="checkbox-group-2" v-model="form.checked" name="flavour-2">

.vuepress/components/SharingBlock.vue

@@ -1,8 +1,8 @@
 <template>
-  <div>
+  <!-- <div>
     <slot></slot>
-  </div>
+  </!-->
-  <!-- <div style="border: solid 1px #E6A23C; background-color: rgb(253, 246, 236); padding: 1rem;">
+  <div style="border: solid 1px #f2be45; background-color: rgba(242, 190, 69, 0.1); padding: 1rem;">
     <div v-show="!authorized" key="not">
         <p style="color: red; font-weight: 500;">免费解锁全站文档：</p>
         <li>扫描二维码加微信获得验证码</li>
@@ -11,38 +11,56 @@
         <grid-item size="1/3" :rwd="{tablet: '1/1', compact: '1/1'}" style="padding: 0rem 0 1rem 1rem;">
 
       <div>
-
+        <p style="text-align: center;">
-        <p>
           <img src="/images/dz2.jpeg" style="width: 180px;"></img>
         </p>
         </div>
         </grid-item>
         <grid-item size="2/3" :rwd="{tablet: '1/1', compact: '1/1'}" style="padding: 1rem 1rem 1rem 1rem;">
-          <div style="display: inline-block; max-width: calc(100% - 2rem); overflow: hidden; line-height: 40px; background-color: rgba(255,229,100,0.3); padding: 1rem; margin-bottom: 20px; border: 1px solid #d7dae2;">
+          <div style="display: inline-block; width: 100%; overflow: hidden; line-height: 40px; background-color: rgba(255,229,100,0.3); padding: 1rem; margin-bottom: 20px; border: 1px solid #d7dae2;">
-            <el-form ref="envForm" style="text-align: left;" label-width="80px">
+            <b-form ref="envForm" style="text-align: left;" label-width="80px">
-              <el-form-item label="随机码：">
+              <b-form-group
-                <el-tag size="medium" effect="dark">{{code1}}{{code2}}</el-tag>
+                id="fieldset-1"
-              </el-form-item>
+                label="随机码："
-              <el-form-item prop="checked" class="env-form-item" label="验证码：">
+                label-cols-sm="4"
-                <el-input placeholder="Kuboard返回的验证码" v-model.number="authCode"></el-input>
+                label-cols-lg="3"
-              </el-form-item>
+                label-for="input-1"
-            </el-form>
+                style="text-align: left"
+              >
+                <b-badge size="medium" variant="dark">{{code1}}</b-badge>
+                <b-badge size="medium" variant="dark">{{code2}}</b-badge>
+              </b-form-group>
+              <b-form-group 
+                label-cols-sm="4"
+                label-cols-lg="3"
+                style="text-align: left"
+                label="验证码：">
+                <b-input placeholder="请输入验证码" v-model.number="authCode"></b-input>
+              </b-form-group>
+            </b-form>
           </div>
         </grid-item>
       </grid>
 
     </div>
     <div v-show="authorized" key="ok">
-      <el-alert
+      <b-alert
+        variant="success" show
         style="margin-bottom: 10px;"
-        title="已为您解锁全站完整文档，感谢配合。"
+      >
-        description="缓存清空后需重新输入验证码"
+        
-        effect="dark"
+        <h4 class="alert-heading">已为您解锁全站完整文档，感谢配合！</h4>
-        type="success">
+        <hr/>
-      </el-alert>
+        <li>
+          Kuboard - 快速在 Kubernetes 上落地微服务
+        </li>
+        <li>
+          清空浏览器缓存后需重新输入验证码
+        </li>
+      </b-alert>
       <slot></slot>
       </div>
-  </div> -->
+  </div>
 </template>
 
 <script>

.vuepress/public/landing.html

@@ -393,8 +393,8 @@
             <div class="floated-box">
                 <div class="container">
                     <div class="row">
-                        <div class="col-sm-12 text-center">
+                        <div class="col-sm-12 text-center" style="max-width: 720px; margin: auto;">
-                                <img src="landing/images/trend.png" alt="" class="img-fluid" style="border: solid 1px #eee;">
+                                <img src="landing/images/trend.png" alt="" class="img-fluid box-shadow" style="border: solid 2px #f2be45; padding: 2rem; background-color: #fff; border-radius: 6px;">
                             <!-- <a class="venobox vbox-item video-play" data-autoplay="true" data-vbtype="video" href="https://youtu.be/kubGCSj5y3k">
                                 <img src="landing/images/trend.png" alt="" class="img-fluid" style="border: solid 1px #eee;">
                                 <div class="vid-fixed-icn"><img src="landing/images/video-thumb.png" alt="" class="img-fluid"></div>

.vuepress/styles/palette.styl

@@ -4,3 +4,4 @@ $borderColor = #eaecef
 $codeBgColor = #606266
 
 
+$goldenColor = #f2be45

.vuepress/theme/components/JoinCommunity.vue

@@ -11,7 +11,7 @@
             <!-- 808894550 -->
           </div>
           <p style="margin-bottom: 0; margin-top: 10px;">
-            <img style="margin: auto; padding: 7px; width: 135px;" src="/images/kuboard_qq.png" alt="Kubernetes教程：QQ群在线答疑"/>
+            <img style="margin: auto; width: 150px;" src="/images/kuboard_qq.png" alt="Kubernetes教程：QQ群在线答疑"/>
           </p>
         </b-card>
       </grid-item>
@@ -37,7 +37,7 @@
                 <span>微信扫码</span>
                 <p style="margin-top: 10px; margin-bottom: 0; text-align: center;">
                   <!-- <img src="/images/dz.png" style="width: 150px;"></img> -->
-                  <img src="/images/dz2.jpeg" style="width: 150px;"></img>
+                  <img src="/images/qr-vip.jpeg" style="width: 150px;"></img>
                 </p>
               </div>
             </div>

.vuepress/theme/components/Page.vue

@@ -35,9 +35,9 @@
         </a>
       </p>
     </div> -->
-    <JoinCommunity></JoinCommunity>
+    <JoinCommunity style="padding: 1rem 2.5rem;"></JoinCommunity>
-    <PageEdit style="max-width: 1000px; margin-top: 2rem; background-color: #FFF;"/>
+    <PageEdit style="max-width: 1000px; padding: 1rem 2.5rem; margin-top: 2rem; background-color: #FFF;"/>
-    <PageNav v-bind="{ sidebarItems }" style="max-width: 1000px; padding: 1rem;"/>
+    <PageNav v-bind="{ sidebarItems }" style="max-width: 1000px; padding: 1rem 2.5rem;"/>
     <div class="page-nav" style="max-width: 1000px; padding-top:0; margin-top: 1rem;" v-show="!$frontmatter.lessAds && !$isSharing">
       <AdSensePageBottomInline/>
     </div>

guide/example/monitor.md

@@ -224,3 +224,21 @@ kubectl -n kube-system create secret generic etcd-certs --from-file=/etc/kuberne
 
 
   ![Kubernetes教程：在Kuboard中监控-查看链路追踪信息-APM](./monitor.assets/image-20190718121133160.png)
+
+## 直接访问全局监控
+
+如果想要直接访问全局监控的 Grafana 界面（通常并不需要这么做），url 如下所示：
+
+```
+http://任意节点IP:32567/eip-monitor/namespace/kube-system/service/monitor-grafana/port/3000/login
+```
+
+* 用户名为： `admin`
+* 密码为：  `jmx09KT23BClpa7xzs`
+
+::: warning Grafana密码
+* 全局监控的产品化程度已经比较高，但是，目前仍然为解决安装全局监控时，自定义 grafana 用户名和密码的问题。请使用者知晓。
+* 目前的建议是：
+  * 将 Kuboard 的访问通路做成相对私有化的方式，例如只能通过 vpn 访问
+  * 完成全局监控的安装之后，登录 grafana，并手工修改 grafana 密码
+:::

install/install-k8s.md

@@ -37,7 +37,7 @@ meta:
 
 ## 文档特点
 
-<div style="min-height: 700px;">
+<div style="min-height: 612px;">
   <InstallBanner version="v1.16.2" updateCount="65"/>
 </div>