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

Make the setup trigger dialog more clear on what the pull credentials actually mean

Browse source
This commit is contained in:
Joseph Schorr 2014-08-06 16:01:19 -04:00
parent d1c9108570
commit 09286d6234
2 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/css/quay.css
View file

@ -4101,10 +4101,6 @@ pre.command:before {
margin-top: 10px; margin-top: 10px;
} }
.trigger-option-section .entity-search-element .twitter-typeahead {
width: 370px;
}
.trigger-option-section .entity-search-element input { .trigger-option-section .entity-search-element input {
width: 100%; width: 100%;
} }

21
static/directives/setup-trigger-dialog.html
View file

@ -45,12 +45,14 @@
</div> </div>
</div> </div>
<table style="width: 100%;" ng-show="pullRequirements"> <div ng-show="pullRequirements">
<table style="width: 100%;">
<tr> <tr>
<td style="width: 114px"> <td style="width: 162px">
<div class="context-tooltip" data-title="The credentials used by the builder when pulling images from Quay.io" bs-tooltip> <span class="context-tooltip" data-title="The credentials given to 'docker pull' in the builder for pulling images"
Pull Credentials: style="margin-bottom: 10px" bs-tooltip>
</div> docker pull Credentials:
</span>
</td> </td>
<td> <td>
<div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;"> <div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;">
@ -58,7 +60,7 @@
</div> </div>
<div class="btn-group btn-group-sm" ng-if="isNamespaceAdmin(repository.namespace)"> <div class="btn-group btn-group-sm" ng-if="isNamespaceAdmin(repository.namespace)">
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
ng-class="publicPull ? 'active btn-info' : ''" ng-click="setPublicPull(true)">Public</button> ng-class="publicPull ? 'active btn-info' : ''" ng-click="setPublicPull(true)">None</button>
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
ng-class="publicPull ? '' : 'active btn-info'" ng-click="setPublicPull(false)"> ng-class="publicPull ? '' : 'active btn-info'" ng-click="setPublicPull(false)">
<i class="fa fa-wrench"></i> <i class="fa fa-wrench"></i>
@ -67,9 +69,10 @@
</div> </div>
</td> </td>
</tr> </tr>
</table>
<table style="width: 100%;">
<tr ng-show="!publicPull"> <tr ng-show="!publicPull">
<td>
</td>
<td> <td>
<div class="entity-search" namespace="repository.namespace" <div class="entity-search" namespace="repository.namespace"
placeholder="'Select robot account for pulling...'" placeholder="'Select robot account for pulling...'"
@ -95,6 +98,8 @@
</div> </div>
</div> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
ng-disabled="!trigger.$ready || (!publicPull && !pullEntity) || checkingPullRequirements || activating" ng-disabled="!trigger.$ready || (!publicPull && !pullEntity) || checkingPullRequirements || activating"