Merge "Bug fixes in results, tastcases and header file"
authorSerena Feng <feng.xiaowei@zte.com.cn>
Thu, 18 Jan 2018 06:58:27 +0000 (06:58 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 18 Jan 2018 06:58:27 +0000 (06:58 +0000)
1  2 
testapi/opnfv_testapi/ui/app.js
testapi/opnfv_testapi/ui/shared/header/header.html

Simple merge
@@@ -19,10 -19,9 +19,10 @@@ TestAP
              <li ng-class="{ active: header.isActive('/about')}"><a ui-sref="about">About</a></li>
              <li ng-class="{ active: header.isActive('/pods')}"><a ui-sref="pods">Pods</a></li>
              <li ng-class="{ active: header.isActive('/projects')}"><a ui-sref="projects">Projects</a></li>
 -              <li ng-class="{ active: header.isActive('/results')}"><a ui-sref="results">Results</a></li>
 +            <li ng-class="{ active: header.isActive('/results')}"><a ui-sref="results">Results</a></li>
 +            <li ng-class="{ active: header.isActive('/scenarios')}"><a ui-sref="scenarios">Scenarios</a></li>
            </ul>
-           <ul class="nav navbar-nav navbar-right">
+           <ul class="nav navbar-nav navbar-right" ng-class="{'hidden' : !authenticate}">
              <li ng-class="{ active: header.isActive('/profile')}" ng-if="auth.isAuthenticated"><a ui-sref="profile">Profile</a></li>
              <li ng-if="auth.isAuthenticated"><a href="" ng-click="auth.doSignOut()">Sign Out</a></li>
              <li ng-if="!auth.isAuthenticated"><a href="" ng-click="auth.doSignIn()">Sign In / Sign Up</a></li>