Commit 9c0fe442 by zhangle

bugfix: nav search bar link

parent 5935296f
...@@ -43,14 +43,11 @@ directive_module.directive('apollonav', function ($compile, $window, toastr, App ...@@ -43,14 +43,11 @@ directive_module.directive('apollonav', function ($compile, $window, toastr, App
scope.jumpToConfigPage = function () { scope.jumpToConfigPage = function () {
if (selectedApp.appId) { if (selectedApp.appId) {
var needReloadPage = false;
if ($window.location.href.indexOf("config.html") > -1) { if ($window.location.href.indexOf("config.html") > -1) {
needReloadPage = true; $window.location.hash = "appid=" + selectedApp.appId;
}
$window.location.href = '/config.html?#appid=' + selectedApp.appId;
if (needReloadPage) {
$window.location.reload(); $window.location.reload();
}else {
$window.location.href = '/config.html?#appid=' + selectedApp.appId;
} }
} }
}; };
......
...@@ -4,15 +4,12 @@ ...@@ -4,15 +4,12 @@
<a class="navbar-brand logo" href="/"></a> <a class="navbar-brand logo" href="/"></a>
</div> </div>
<style>
</style>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li> <li>
<a href="http://conf.ctripcorp.com/display/FRAM/Apollo" target="_blank"> <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> </a>
</li> </li>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</button> </button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" <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-show="namespace.hasReleasePermission"
ng-click="preRollback(namespace)"> ng-click="preRollback(namespace)">
<img src="img/rollback.png"> <img src="img/rollback.png">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment