From 009798acb166503d2372f33e2d8abdd624b6ddcb Mon Sep 17 00:00:00 2001
From: zhangle <zhanglea@ctrip.com>
Date: Tue, 6 Sep 2016 10:02:59 +0800
Subject: [PATCH] bugfix: nav search bar link

---
 .../main/resources/static/scripts/directive/directive.js | 9 +++------
 .../src/main/resources/static/views/common/nav.html      | 5 +----
 .../static/views/component/namespace-panel.html          | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/scripts/directive/directive.js b/apollo-portal/src/main/resources/static/scripts/directive/directive.js
index 5f188c133..a972ca93e 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/directive.js
@@ -43,14 +43,11 @@ directive_module.directive('apollonav', function ($compile, $window, toastr, App
 
             scope.jumpToConfigPage = function () {
                 if (selectedApp.appId) {
-                    var needReloadPage = false;
                     if ($window.location.href.indexOf("config.html") > -1) {
-                        needReloadPage = true;
-                    }
-                    $window.location.href = '/config.html?#appid=' + selectedApp.appId;
-
-                    if (needReloadPage) {
+                        $window.location.hash = "appid=" + selectedApp.appId;
                         $window.location.reload();
+                    }else {
+                        $window.location.href = '/config.html?#appid=' + selectedApp.appId;
                     }
                 }
             };
diff --git a/apollo-portal/src/main/resources/static/views/common/nav.html b/apollo-portal/src/main/resources/static/views/common/nav.html
index e8d741809..b3e375a0a 100644
--- a/apollo-portal/src/main/resources/static/views/common/nav.html
+++ b/apollo-portal/src/main/resources/static/views/common/nav.html
@@ -4,15 +4,12 @@
 
             <a class="navbar-brand logo" href="/"></a>
         </div>
-        <style>
-
-        </style>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 
             <ul class="nav navbar-nav navbar-right">
                 <li>
                     <a href="http://conf.ctripcorp.com/display/FRAM/Apollo" target="_blank">
-                    <span class="glyphicon glyphicon-question-sign"></span> Help
+                    <span class="glyphicon glyphicon-question-sign"></span>帮助
                 </a>
                 </li>
 
diff --git a/apollo-portal/src/main/resources/static/views/component/namespace-panel.html b/apollo-portal/src/main/resources/static/views/component/namespace-panel.html
index 1a02c0c14..25f3cf81b 100644
--- a/apollo-portal/src/main/resources/static/views/component/namespace-panel.html
+++ b/apollo-portal/src/main/resources/static/views/component/namespace-panel.html
@@ -31,7 +31,7 @@
 
                 </button>
                 <button type="button" class="btn btn-default btn-sm J_tableview_btn"
-                        data-tooltip="tooltip" data-placement="bottom" title="回滚配置"
+                        data-tooltip="tooltip" data-placement="bottom" title="回滚已发布配置"
                         ng-show="namespace.hasReleasePermission"
                         ng-click="preRollback(namespace)">
                     <img src="img/rollback.png">
-- 
Gitee