From 257dde1d5edab8e83cd42cc907b00982068d1882 Mon Sep 17 00:00:00 2001
From: Eric Zhao <sczyh16@gmail.com>
Date: Thu, 8 Nov 2018 16:59:00 +0800
Subject: [PATCH] Some improvements for Sentinel dashboard

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
---
 .../csp/sentinel/dashboard/view/ParamFlowRuleController.java  | 2 +-
 .../webapp/resources/app/views/dialog/flow-rule-dialog.html   | 4 ++--
 .../src/main/webapp/resources/app/views/flow.html             | 2 +-
 .../src/main/webapp/resources/app/views/metric.html           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ParamFlowRuleController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ParamFlowRuleController.java
index 7b897fdd..817fdafc 100644
--- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ParamFlowRuleController.java
+++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ParamFlowRuleController.java
@@ -239,7 +239,7 @@ public class ParamFlowRuleController {
     }
 
     private <R> Result<R> unsupportedVersion() {
-        return Result.ofFail(4041, "Sentinel client version not supported for parameter flow control");
+        return Result.ofFail(4041, "Sentinel client not supported for parameter flow control (unsupported version or dependency absent)");
     }
 
     private final SentinelVersion version020 = new SentinelVersion().setMinorVersion(2);
diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html b/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html
index f7d049a8..6ade264a 100755
--- a/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html
+++ b/sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html
@@ -38,7 +38,7 @@
 
           <div ng-if="!flowRuleDialog.showAdvanceButton">
             <div class="form-group">
-              <label class="col-sm-2 control-label">流控模式</label>
+              <label class="col-sm-2 control-label" title="调用关系流控模式">流控模式</label>
               <div class="col-sm-9">
                 <div class="form-control highlight-border" align="center">
                   <input type="radio" name="strategy" value="0" ng-model='currentRule.strategy' />&nbsp;直接&nbsp;&nbsp;
@@ -63,7 +63,7 @@
           </div>
           <div ng-if="currentRule.grade==1 && !flowRuleDialog.showAdvanceButton">
             <div class="form-group">
-              <label class="col-sm-2 control-label">流控方式</label>
+              <label class="col-sm-2 control-label">流控效果</label>
               <div class="col-sm-9">
                 <div class="form-control highlight-border" align="center">
                   <input type="radio" name="controlBehavior" value="0" checked ng-model='currentRule.controlBehavior' />&nbsp;快速失败&nbsp;&nbsp;
diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/flow.html b/sentinel-dashboard/src/main/webapp/resources/app/views/flow.html
index 36a48421..a349c9aa 100755
--- a/sentinel-dashboard/src/main/webapp/resources/app/views/flow.html
+++ b/sentinel-dashboard/src/main/webapp/resources/app/views/flow.html
@@ -46,7 +46,7 @@
                   单机阈值
                 </td>
                 <td style="width: 10%;">
-                  流控方式
+                  流控效果
                 </td>
                 <!--<td style="width: 8%;">-->
                 <!--状态-->
diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html b/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html
index af48fcf0..ed08eb74 100755
--- a/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html
+++ b/sentinel-dashboard/src/main/webapp/resources/app/views/metric.html
@@ -15,9 +15,9 @@
             <i class="fa fa-sort-amount-desc" aria-hidden="true" ng-show="isDescOrder"></i>
             {{metricTypeDesc}}&nbsp;实时监控
           </span>
-          <button class="btn btn-danger" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setDescOrder()"
+          <button class="btn btn-outline-primary" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setDescOrder()"
             ng-if="!isDescOrder">降序</button>
-          <button class="btn btn-danger" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setAscOrder()"
+          <button class="btn btn-outline-primary" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="setAscOrder()"
             ng-if="isDescOrder">升序</button>
 
           <input class="form-control witdh-200" placeholder="关键字" ng-model="serviceQuery" ng-change="searchService()" style="margin-right: 20px;">