vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

appLinkTarget needs to be lazy

Browse source
This commit is contained in:
Joseph Schorr 2015-06-25 13:03:08 -04:00
parent dde8d32984
commit 0d133b0fa4
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
static/directives/new-header-bar.html
View file

@ -5,7 +5,7 @@
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
&equiv; &equiv;
</button> </button>
<a class="navbar-brand" ng-href="{{ user.anonymous ? '/' : '/repository/' }}" target="{{ appLinkTarget }}"> <a class="navbar-brand" ng-href="{{ user.anonymous ? '/' : '/repository/' }}" target="{{ appLinkTarget() }}">
<span id="quay-logo" ng-style="{'background-image': 'url(' + getEnterpriseLogo() + ')'}"></span> <span id="quay-logo" ng-style="{'background-image': 'url(' + getEnterpriseLogo() + ')'}"></span>
</a> </a>
<span class="user-tools visible-xs" style="float: right;"> <span class="user-tools visible-xs" style="float: right;">
@ -19,29 +19,29 @@
<div class="collapse navbar-collapse navbar-ex1-collapse"> <div class="collapse navbar-collapse navbar-ex1-collapse">
<!-- Not signed in --> <!-- Not signed in -->
<ul class="nav navbar-nav navbar-links" ng-if="user.anonymous"> <ul class="nav navbar-nav navbar-links" ng-if="user.anonymous">
<li><a ng-href="/tour/" target="{{ appLinkTarget }}" quay-section="tour">Tour</a></li> <li><a ng-href="/tour/" target="{{ appLinkTarget() }}" quay-section="tour">Tour</a></li>
<li><a ng-href="/tutorial/" target="{{ appLinkTarget }}" quay-section="tutorial">Tutorial</a></li> <li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}" quay-section="tutorial">Tutorial</a></li>
<li quay-require="['BILLING']"><a ng-href="/plans/" target="{{ appLinkTarget }}" quay-section="plans">Pricing</a></li> <li quay-require="['BILLING']"><a ng-href="/plans/" target="{{ appLinkTarget() }}" quay-section="plans">Pricing</a></li>
<li><a href="http://docs.quay.io/" target="_blank">Docs</a></li> <li><a href="http://docs.quay.io/" target="_blank">Docs</a></li>
</ul> </ul>
<!-- Signed in --> <!-- Signed in -->
<ul class="nav navbar-nav navbar-links" ng-if="!user.anonymous"> <ul class="nav navbar-nav navbar-links" ng-if="!user.anonymous">
<li><a ng-href="/repository/" target="{{ appLinkTarget }}" quay-section="repository">Repositories</a></li> <li><a ng-href="/repository/" target="{{ appLinkTarget() }}" quay-section="repository">Repositories</a></li>
<li><a ng-href="/tutorial/" target="{{ appLinkTarget }}" quay-section="tutorial">Tutorial</a></li> <li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}" quay-section="tutorial">Tutorial</a></li>
<li><a href="http://docs.quay.io/" target="_blank">Docs</a></li> <li><a href="http://docs.quay.io/" target="_blank">Docs</a></li>
</ul> </ul>
<!-- Phone --> <!-- Phone -->
<ul class="nav navbar-nav navbar-right visible-xs" ng-switch on="user.anonymous"> <ul class="nav navbar-nav navbar-right visible-xs" ng-switch on="user.anonymous">
<li ng-switch-when="false"> <li ng-switch-when="false">
<a href="/user/{{ user.username }}?tab=settings" class="user-view" target="{{ appLinkTarget }}"> <a href="/user/{{ user.username }}?tab=settings" class="user-view" target="{{ appLinkTarget() }}">
<span class="avatar" size="32" data="user.avatar"></span> <span class="avatar" size="32" data="user.avatar"></span>
{{ user.username }} {{ user.username }}
</a> </a>
</li> </li>
<li ng-switch-default> <li ng-switch-default>
<a class="user-view" href="/signin/" target="{{ appLinkTarget }}">Sign in</a> <a class="user-view" href="/signin/" target="{{ appLinkTarget() }}">Sign in</a>
</li> </li>
</ul> </ul>
@ -123,7 +123,7 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="/user/{{ user.username }}?tab=settings" target="{{ appLinkTarget }}"> <a href="/user/{{ user.username }}?tab=settings" target="{{ appLinkTarget() }}">
Account Settings Account Settings
</a> </a>
</li> </li>
@ -132,7 +132,7 @@
</ul> </ul>
</li> </li>
<li ng-switch-default> <li ng-switch-default>
<a class="user-view" href="/signin/" target="{{ appLinkTarget }}">Sign in</a> <a class="user-view" href="/signin/" target="{{ appLinkTarget() }}">Sign in</a>
</li> </li>
</ul> </ul>
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->

11
static/js/directives/ui/header-bar.js
View file

@ -110,10 +110,15 @@ angular.module('quay').directive('headerBar', function () {
}; };
$scope.appLinkTarget = function() { $scope.appLinkTarget = function() {
if ($("div[ng-view]").length === 0) { if ($scope._appLinkTarget) {
return "_self"; return $scope._appLinkTarget;
} }
return "";
if ($("div[ng-view]").length === 0) {
return $scope._appLinkTarget = "_self";
}
return $scope._appLinkTarget = "";
}; };
$scope.getEnterpriseLogo = function() { $scope.getEnterpriseLogo = function() {