From d5e09898a934d5c6b782d427c96afb92d593f454 Mon Sep 17 00:00:00 2001
From: lepdou <ledou.zhang@dianping.com>
Date: Mon, 9 May 2016 17:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/config.html     | 63 ++++++++++---------
 .../resources/static/scripts/PageCommon.js    |  4 ++
 .../app/ConfigBaseInfoController.js           |  2 +-
 .../app/ConfigNamespaceController.js          |  3 +
 .../resources/static/styles/common-style.css  | 33 ++++++++--
 5 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/config.html b/apollo-portal/src/main/resources/static/config.html
index f416431df..ec2b9629f 100644
--- a/apollo-portal/src/main/resources/static/config.html
+++ b/apollo-portal/src/main/resources/static/config.html
@@ -22,6 +22,7 @@
 
             <!--具体配置信息-->
             <div class="row config-info-container">
+
                 <!--tag导航-->
                 <div class="col-md-3" ng-controller="ConfigBaseInfoController">
                     <div id="treeview"></div>
@@ -124,6 +125,7 @@
                     </div>
                 </div>
 
+                <!--namespaces-->
                 <div class="col-md-9 config-item-container" ng-controller="ConfigNamespaceController">
                     <div ng-repeat="namespace in namespaces">
                         <div class="panel">
@@ -131,10 +133,10 @@
                                 <div class="row">
                                     <div class="col-md-4">
                                         <b>{{namespace.namespace.namespaceName}}</b>
-                                                <span class="label label-info" ng-show="namespace.itemModifiedCnt > 0">有修改,可发布
+                                                <span class="label label-primary" ng-show="namespace.itemModifiedCnt > 0">有修改
                                                 <span class="badge">{{namespace.itemModifiedCnt}}</span></span>
                                     </div>
-                                    <div class="col-md-7">
+                                    <div class="col-md-4">
                                         <div class="btn-toolbar" role="toolbar" aria-label="...">
                                             <div class="btn-group" role="group" aria-label="...">
                                                 <button type="button" data-toggle="modal" data-target="#releaseModal"
@@ -142,25 +144,26 @@
                                                         ng-disabled="namespace.isTextEditing"
                                                         ng-click="prepareReleaseNamespace(namespace)">发布
                                                 </button>
-                                                <!--<button type="button"-->
-                                                        <!--class="btn btn-default btn-sm J_tableview_btn">回滚-->
-                                                <!--</button>-->
-                                                <!--<button type="button"-->
-                                                        <!--class="btn btn-default btn-sm J_historyview_btn">-->
-                                                    <!--查看历史版本-->
-                                                <!--</button>-->
-                                            </div>
-                                            <div class="btn-group" role="group" aria-label="...">
-                                                <div class="btn-group" role="group">
-                                                    <!--<button type="button"-->
-                                                            <!--class="btn btn-default btn-sm J_tableview_btn">授权-->
-                                                    <!--</button>-->
-                                                    <a type="button" target="_blank"
-                                                       href="config/sync.html?#/appid={{pageContext.appId}}&env={{pageContext.env}}&clusterName={{pageContext.clusterName}}&namespaceName={{namespace.namespace.namespaceName}}"
-                                                       class="btn btn-default btn-sm J_tableview_btn">同步
-                                                    </a>
-                                                </div>
+                                                <button type="button"
+                                                class="btn btn-default btn-sm J_tableview_btn">回滚
+                                                </button>
+                                                <button type="button"
+                                                class="btn btn-default btn-sm J_historyview_btn">
+                                                查看历史版本
+                                                </button>
+                                                <button type="button"
+                                                class="btn btn-default btn-sm J_tableview_btn">授权
+                                                </button>
+                                                <a type="button" target="_blank"
+                                                   href="config/sync.html?#/appid={{pageContext.appId}}&env={{pageContext.env}}&clusterName={{pageContext.clusterName}}&namespaceName={{namespace.namespace.namespaceName}}"
+                                                   class="btn btn-default btn-sm J_tableview_btn">同步
+                                                </a>
                                             </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-md-3">
+                                        <div class="btn-toolbar" role="toolbar" aria-label="...">
                                             <div class="btn-group" role="group" aria-label="...">
                                                 <button type="button"
                                                         class="btn btn-default btn-sm J_tableview_btn"
@@ -170,27 +173,27 @@
                                                         class="btn btn-default btn-sm J_tableview_btn"
                                                         ng-click="switchView(namespace, 'table')">表格
                                                 </button>
-                                                <!--<button type="button"-->
-                                                        <!--class="btn btn-default btn-sm J_historyview_btn"-->
-                                                        <!--ng-click="switchView(namespace, 'history')">-->
-                                                    <!--更改日志-->
-                                                <!--</button>-->
+                                                <button type="button"
+                                                class="btn btn-default btn-sm J_historyview_btn"
+                                                ng-click="switchView(namespace, 'history')">
+                                                更改历史
+                                                </button>
                                             </div>
                                         </div>
                                     </div>
-
                                     <div class="col-md-1 text-right">
-                                        <a data-toggle="tooltip" data-placement="top" title="取消修改"
+                                        <a data-tooltip="tooltip" data-placement="bottom" title="取消修改"
                                            ng-show="namespace.isTextEditing" ng-click="toggleTextEditStatus(namespace)">
                                             <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
                                         </a>
-                                        <a data-toggle="tooltip" data-placement="top" title="修改配置"
+                                        <a data-tooltip="tooltip" data-placement="bottom" title="修改配置"
                                            ng-show="!namespace.isTextEditing && namespace.viewType == 'text'"
                                            ng-click="toggleTextEditStatus(namespace)">
                                             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
                                         </a>
                                         &nbsp;
-                                        <a data-toggle="modal" data-target="#commitModal"
+                                        <a data-tooltip="tooltip" data-placement="bottom" title="提交修改"
+                                           data-toggle="modal" data-target="#commitModal"
                                            ng-show="namespace.isTextEditing" ng-click="saveDraft(namespace)">
                                             <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
                                         </a>
@@ -199,7 +202,7 @@
                             </header>
 
                             <!--text view-->
-                            <textarea class="form-control" rows="{{namespace.itemCnt}}"
+                            <textarea class="form-control" rows="{{namespace.itemCnt}}" style="border-radius: 0px"
                                       ng-show="namespace.viewType == 'text'"
                                       ng-disabled="!namespace.isTextEditing" ng-model="namespace.text">
 {{namespace.text}}
diff --git a/apollo-portal/src/main/resources/static/scripts/PageCommon.js b/apollo-portal/src/main/resources/static/scripts/PageCommon.js
index 5d9e1e70e..ba338f75a 100644
--- a/apollo-portal/src/main/resources/static/scripts/PageCommon.js
+++ b/apollo-portal/src/main/resources/static/scripts/PageCommon.js
@@ -10,3 +10,7 @@ $(document).ready(function () {
                              zindex: '1000'
                          });
 });
+
+$(function () {
+    $('[data-toggle="tooltip"]').tooltip()
+});
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigBaseInfoController.js b/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigBaseInfoController.js
index 9c4113a3d..afe9ec040 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigBaseInfoController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigBaseInfoController.js
@@ -42,7 +42,7 @@ application_module.controller("ConfigBaseInfoController",
                                            navTree.push(node);
                                        });
                                        $('#treeview').treeview({
-                                                                   color: "#428bca",
+                                                                   color: "#797979",
                                                                    showBorder: true,
                                                                    data: navTree,
                                                                    levels: 99,
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigNamespaceController.js b/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigNamespaceController.js
index 5e2d8aab8..adf31e8e2 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigNamespaceController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/app/ConfigNamespaceController.js
@@ -33,6 +33,9 @@ application_module.controller("ConfigNamespaceController",
                                                        item.isTextEditing = false;
                                                    });
                                                }
+                                               setInterval(function () {
+                                                   $('[data-tooltip="tooltip"]').tooltip();
+                                               },2500);
 
                                            }, function (result) {
                                                toastr.error(AppUtil.errorMsg(result), "加载配置信息出错");
diff --git a/apollo-portal/src/main/resources/static/styles/common-style.css b/apollo-portal/src/main/resources/static/styles/common-style.css
index db1e7aaf8..251e4d4cb 100644
--- a/apollo-portal/src/main/resources/static/styles/common-style.css
+++ b/apollo-portal/src/main/resources/static/styles/common-style.css
@@ -15,17 +15,17 @@ a {
     cursor: pointer;
 }
 
-.i-20{
+.i-20 {
     height: 20px;
     width: 20px;
 }
 
-.i-25-20{
+.i-25-20 {
     height: 20px;
     width: 25px;
 }
 
-.i-15{
+.i-15 {
     height: 15px;
     width: 15px;
 }
@@ -109,6 +109,9 @@ table th {
     margin-top: 20px;
 }
 
+.node-treeview{
+    color: #797979;
+}
 .apps .apps-description {
     color: gray;
     font-family: "Apple Color Emoji";
@@ -150,7 +153,6 @@ table th {
 
 #config-info {
     min-height: 500px;
-    /*background-color: #ffffff;*/
 }
 
 #config-info .nav {
@@ -182,6 +184,24 @@ table th {
     padding-top: 19px;
 }
 
+.config-item-container .panel{
+    border-radius: 0px;
+}
+.config-item-container .panel-heading b {
+    font-size: 18px;
+}
+
+.config-item-container .panel-heading .badge {
+    padding: 1px 4px;
+    background: #ffffff;
+    color: #0f0f0f;
+}
+
+.config-item-container .form-control[disabled] {
+    background: #ffffff;
+    border: 0px;
+}
+
 .config-item-container .config-items {
     height: 500px;
     overflow: scroll;
@@ -195,10 +215,11 @@ table th {
     table-layout: fixed;
 }
 
-.namespace-view-table tr{
+.namespace-view-table tr {
     cursor: pointer;
 
 }
+
 .namespace-view-table td {
     word-wrap: break-word;
 }
@@ -258,7 +279,7 @@ table th {
     padding-bottom: 4px;
 }
 
-.list-group-item .btn-title{
+.list-group-item .btn-title {
     color: gray;
     font-family: "Apple Color Emoji";
     font-size: 16px;
-- 
GitLab