Merge pull request #2165 from coreos-inc/typo-and-link-fixes

Typo and link fixes
This commit is contained in:
josephschorr 2016-11-30 14:00:16 -05:00 committed by GitHub
commit 244bf2a070
6 changed files with 10 additions and 8 deletions

View file

@ -13,7 +13,7 @@
<div class="expandable" ng-class="{'expanded': isBackIncompat || (!signupForm.namespaceField.$error.required && signupForm.namespaceField.$invalid)}">
<div class="co-alert co-alert-warning thin" ng-show="isBackIncompat">
Usernames with dots or dashes are incompatible with Docker verion 1.8 or older
Usernames with dots or dashes are incompatible with Docker version 1.8 or older
</div>
<div class="co-alert co-alert-danger thin" ng-show="!signupForm.namespaceField.$error.required && signupForm.namespaceField.$invalid">
Usernames must be alphanumeric and be at least four characters in length

View file

@ -11,7 +11,7 @@
}]);
function ErrorViewCtrl($scope, ApiService, $routeParams, UserService) {
$scope.info = window.__error_info || {};
$scope.info = window.__error_info;
$scope.code = window.__error_code || 404;
}
}());

View file

@ -48,7 +48,9 @@ function($rootScope, $interval, UserService, ApiService, StringBuilderService, P
'password_required': {
'level': 'error',
'message': 'In order to begin pushing and pulling repositories, a password must be set for your account',
'page': '/user?tab=password'
'page': function(metadata) {
return '/user/' + UserService.currentUser()['username'] + '?tab=settings';
}
},
'over_private_usage': {
'level': 'error',

View file

@ -2,9 +2,9 @@
<!-- 404 -->
<div class="err404" ng-if="code == 404">
<h2>404: Not Found</h2>
<h3 ng-if="!info.for_repo && !info.namespace_exists">The resource you're looking for doesn't exists</h3>
<h3 ng-if="info && !info.namespace_exists">Namespace <strong>{{ info.namespace }}</strong> doesn't exists</h3>
<h3 ng-if="info && info.for_repo && info.namespace_exists">The repository you're looking for doesn't exists</h3>
<h3 ng-if="!info.for_repo && !info.namespace_exists">The resource you're looking for doesn't exist</h3>
<h3 ng-if="info && !info.namespace_exists">Namespace <strong>{{ info.namespace }}</strong> doesn't exist</h3>
<h3 ng-if="info && info.for_repo && info.namespace_exists">The repository you're looking for doesn't exist</h3>
<img src="/static/img/40x/quay-logo-404.svg">

View file

@ -45,7 +45,7 @@
<span class="namespace-input" binding="org.name" is-back-incompat="isBackIncompat" namespace-title="Organization name"></span>
</span>
<span class="co-alert co-alert-warning thin" ng-show="isBackIncompat">
Organization names with dots or dashes are incompatible with Docker verion 1.8 or older
Organization names with dots or dashes are incompatible with Docker version 1.8 or older
</span>
<span class="co-alert co-alert-danger thin" ng-show="!newOrgForm.namespaceField.$error.required && newOrgForm.namespaceField.$invalid">
Organization names must be alphanumeric and be at least four characters in length

View file

@ -30,7 +30,7 @@
Usernames must be alphanumeric and be at least four characters in length
</span>
<span class="username-status" ng-show="state == 'confirmed' && isBackIncompat">
<i class="fa fa-exclamation-triangle"></i> Note: Usernames with dots or dashes are incompatible with Docker verion 1.8 or older
<i class="fa fa-exclamation-triangle"></i> Note: Usernames with dots or dashes are incompatible with Docker version 1.8 or older
</span>
</form>
</div>