directives: ssh-key-dialog -> trigger credentials

This commit is contained in:
Jimmy Zelinskie 2015-04-16 14:58:25 -04:00
parent 2236270741
commit de3fa5f42d
6 changed files with 52 additions and 38 deletions

View file

@ -137,8 +137,8 @@
</td>
<td>
<span class="cor-options-menu">
<span class="cor-option" option-click="showSSHKeyModal(trigger)" ng-show="trigger.service == 'custom'">
<i class="fa fa-unlock-alt"></i> View SSH Key
<span class="cor-option" option-click="showTriggerCredentialsModal(trigger)" ng-show="trigger.service == 'custom'">
<i class="fa fa-unlock-alt"></i> View Credentials
</span>
<span class="cor-option" option-click="askRunTrigger(trigger)">
<i class="fa fa-chevron-right"></i> Run Trigger Now
@ -158,8 +158,8 @@
<!-- Dialogs -->
<!-- SSH key dialog -->
<div class="ssh-key-dialog" trigger="sshKeyModalTrigger" counter="sshKeyModalCounter"></div>
<!-- Trigger Credentials dialog -->
<div class="trigger-credentials-dialog" trigger="triggerCredentialsModalTrigger" counter="triggerCredentialsModalCounter"></div>
<!-- Delete Tag Confirm -->
<div class="cor-confirm-dialog"

View file

@ -118,7 +118,7 @@
The trigger has been successfully created, but the following first requires action:
<ul>
<li>You must give the following public key read access to the git repository.</li>
<li>You must POST to the following URL as your webhook endpoint.</li>
<li>You must set your repository to POST to the following URL to trigger a build.</li>
</ul>
For more information, refer to the <a href="http://docs.quay.io/guides/custom-trigger.html" target="_blank">Custom Git Triggers documentation</a>.
</div>

View file

@ -1,24 +0,0 @@
<!-- Modal message dialog -->
<div class="modal fade" id="sshkeymodal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">
Public SSH Key
</h4>
</div>
<div class="modal-body">
<div class="alert alert-info">
<p>In order for our builders to clone your repository, you must give the following public key read access to the git repository.</p>
<!-- TODO(jzelinskie): link to a specific article in the docs -->
<p>More information on using a custom triggers can be found <a href="http://docs.quay.io">in the docs</a>.</p>
</div>
<div class="copy-box" value="trigger.config.public_key"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Done</button>
</div>
</div> <!-- /.modal-content -->
</div> <!-- /.modal-dialog -->
</div> <!-- /.modal -->

View file

@ -0,0 +1,36 @@
<!-- Modal message dialog -->
<div class="modal fade" id="triggercredentialsmodal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">
Trigger Credentials
</h4>
</div>
<div class="modal-body">
<div class="alert alert-info">
<p>
In order to use this trigger, the following first requires action:
<ul>
<li>You must give the following public key read access to the git repository.</li>
<li>You must set your repository to POST to the following URL to trigger a build.</li>
</ul>
For more information, refer to the <a href="http://docs.quay.io/guides/custom-trigger.html" target="_blank">Custom Git Triggers documentation</a>.
</p>
</div>
<p>
SSH Public Key:
<div class="copy-box" value="trigger.config.public_key"></div>
</p>
<p>
Webhook Endpoint URL:
<div class="copy-box" value="trigger.config.webhook_url"></div>
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Done</button>
</div>
</div> <!-- /.modal-content -->
</div> <!-- /.modal-dialog -->
</div> <!-- /.modal -->