Fix some tabs and some spelling errors, prevent empty tokens, move the tooltips to the left.
This commit is contained in:
parent
faf6a5c497
commit
982fdd4c5f
3 changed files with 64 additions and 62 deletions
|
@ -486,6 +486,8 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
|
||||||
|
|
||||||
var permissionPost = Restangular.one('repository/' + namespace + '/' + name + '/tokens/');
|
var permissionPost = Restangular.one('repository/' + namespace + '/' + name + '/tokens/');
|
||||||
permissionPost.customPOST(friendlyName).then(function(newToken) {
|
permissionPost.customPOST(friendlyName).then(function(newToken) {
|
||||||
|
$scope.newToken.friendlyName = '';
|
||||||
|
$scope.createTokenForm.$setPristine();
|
||||||
$scope.tokens[newToken.code] = newToken;
|
$scope.tokens[newToken.code] = newToken;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -41,8 +41,8 @@
|
||||||
<h3>Using access tokens in place of users <span class="label label-info">Requires Admin Access</span></h3>
|
<h3>Using access tokens in place of users <span class="label label-info">Requires Admin Access</span></h3>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="description-overview">
|
<div class="description-overview">
|
||||||
There are many circumstances where it makes sense to <b>not</b> user a user's username and password (deployment scripts, etc).
|
There are many circumstances where it makes sense to <b>not</b> use a user's username and password (deployment scripts, etc).
|
||||||
To support this case, Quay allows the user of <b>access tokens</b> which can be created on a repository and have read and/or write
|
To support this case, Quay allows the use of <b>access tokens</b> which can be created on a repository and have read and/or write
|
||||||
permissions, without any passwords.
|
permissions, without any passwords.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -55,6 +55,7 @@
|
||||||
<dl class="dl-horizontal">
|
<dl class="dl-horizontal">
|
||||||
<dt>Username</dt><dd>$token</dd>
|
<dt>Username</dt><dd>$token</dd>
|
||||||
<dt>Password</dt><dd>(token value can be found by clicking on the token)</dd>
|
<dt>Password</dt><dd>(token value can be found by clicking on the token)</dd>
|
||||||
|
<dt>Email</dt><dd>This value is ignored, any value may be used.</dd>
|
||||||
</dl>
|
</dl>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">User Access Permissions
|
<div class="panel-heading">User Access Permissions
|
||||||
|
|
||||||
<i class="info-icon icon-info-sign" data-content="Allow any number of users to read, write or admin this repository"></i>
|
<i class="info-icon icon-info-sign" data-placement="left" data-content="Allow any number of users to read, write or administer this repository"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
|
|
||||||
|
@ -64,10 +64,10 @@
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">Access Token Permissions
|
<div class="panel-heading">Access Token Permissions
|
||||||
|
|
||||||
<i class="info-icon icon-info-sign" data-content="Grant permissions to this repository by creating unique tokens that can be used without entering account passwords<br><br>To use in docker:<br><dl class='dl-horizontal'><dt>Username</dt><dd>$token</dd><dt>Password</dt><dd>(token value)</dd></dl>"></i>
|
<i class="info-icon icon-info-sign" data-placement="left" data-content="Grant permissions to this repository by creating unique tokens that can be used without entering account passwords<br><br>To use in docker:<br><dl class='dl-horizontal'><dt>Username</dt><dd>$token</dd><dt>Password</dt><dd>(token value)</dd><dt>Email</dt><dd>(any value)</dd></dl>"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
|
<form name="createTokenForm" ng-submit="createToken()">
|
||||||
<table class="permissions">
|
<table class="permissions">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -90,23 +90,22 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span class="delete-ui" tabindex="0" title="Delete Token">
|
<span class="delete-ui" tabindex="0" title="Delete Token">
|
||||||
<span class="delete-ui-button" ng-click="deleteToken(token.code)"><button class="btn btn-danger">Delete</button></span>
|
<span class="delete-ui-button" ng-click="deleteToken(token.code)"><button class="btn btn-danger" type="button">Delete</button></span>
|
||||||
<i class="icon-remove"></i>
|
<i class="icon-remove"></i>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<form name="createTokenForm" ng-submit="createToken()">
|
|
||||||
<td>
|
<td>
|
||||||
<input class="form-control" placeholder="New token description" ng-model="newToken.friendlyName">
|
<input type="text" class="form-control" placeholder="New token description" ng-model="newToken.friendlyName"required>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<button type="submit" class="btn btn-sm btn-default">Create</button>
|
<button type="submit" ng-disabled="createTokenForm.$invalid" class="btn btn-sm btn-default">Create</button>
|
||||||
</td>
|
</td>
|
||||||
</form>
|
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -175,7 +174,7 @@
|
||||||
<h4 class="modal-title"><i class="icon-key"></i> {{ shownToken.friendlyName }}</h4>
|
<h4 class="modal-title"><i class="icon-key"></i> {{ shownToken.friendlyName }}</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body token-dialog-body">
|
<div class="modal-body token-dialog-body">
|
||||||
<div class="alert alert-info">The docker <u>username</u> is <b>$token</b> and the <u>password</u> is the token</div>
|
<div class="alert alert-info">The docker <u>username</u> is <b>$token</b> and the <u>password</u> is the token. You may use any value for email.</div>
|
||||||
<div class="well well-sm">
|
<div class="well well-sm">
|
||||||
<input id="token-view" class="token-view" type="text" value="{{ shownToken.code }}" onClick="this.select();" readonly>
|
<input id="token-view" class="token-view" type="text" value="{{ shownToken.code }}" onClick="this.select();" readonly>
|
||||||
</div>
|
</div>
|
||||||
|
|
Reference in a new issue