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

Merge pull request #2650 from alecmerdler/fix-external-notification

Browse source 
Fix External Notification Modal UI
This commit is contained in:
Alec Merdler 2017-05-18 23:12:19 -07:00 committed by GitHub
commit 86bcbd1225
2 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
static/css/directives/ui/create-external-notification.css
View file

@ -66,4 +66,10 @@
.create-external-notification-element .help-text { .create-external-notification-element .help-text {
margin-top: 10px; margin-top: 10px;
color: #aaa; color: #aaa;
} }
#authorizeEmailModal .loading-container {
display: flex;
justify-content: center;
margin: 20px;
}

62
static/directives/create-external-notification.html
View file

@ -191,43 +191,47 @@
</button> </button>
</div> </div>
</form> </form>
</div>
<!-- Authorize email dialog --> <!-- Authorize email dialog -->
<div class="modal" tabindex="-1" role="dialog" id="authorizeEmailModal"> <div class="modal" tabindex="-1" role="dialog" id="authorizeEmailModal">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" ng-click="cancelEmailAuth()">
&times;
</button>
<h4 class="modal-title">E-mail authorization</h4> <h4 class="modal-title">E-mail authorization</h4>
</div> </div>
<div class="modal-content">
<div class="modal-body" style="padding: 4px; padding-left: 20px;">
<button type="button" class="close" ng-click="cancelEmailAuth()" style="padding: 4px;">
&times;
</button>
<!-- Authorize e-mail view --> <div class="modal-body" style="padding: 4px; padding-left: 20px;">
<div ng-show="status == 'authorizing-email-sent'"> <!-- Authorize e-mail view -->
An e-mail has been sent to <code>{{ currentConfig.email }}</code>. Please click the link contained <div ng-if="status == 'authorizing-email-sent'">
in the e-mail. An e-mail has been sent to <code>{{ ::currentConfig.email }}</code>. Please click the link contained
<br><br> in the e-mail.
<span class="cor-loader-inline"></span>
</div>
<!-- Authorize e-mail view -->
<div ng-show="status == 'unauthorized-email'">
The e-mail address <code>{{ currentConfig.email }}</code> has not been authorized to receive
notifications from this repository. Please click "Send Authorization E-mail" below to start
the authorization process.
</div>
</div> </div>
<!-- Auth e-mail button bar --> <!-- Authorize e-mail view -->
<div class="modal-footer" ng-if="status == 'unauthorized-email'"> <div ng-if="status == 'unauthorized-email'">
<button type="button" class="btn btn-success" ng-click="sendAuthEmail()"> The e-mail address <code>{{ ::currentConfig.email }}</code> has not been authorized to receive
Send Authorization E-mail notifications from this repository. Please click "Send Authorization E-mail" below to start
</button> the authorization process.
<button type="button" class="btn btn-default" ng-click="cancelEmailAuth()" ng-disabled="creating">Cancel</button>
</div> </div>
</div> </div>
<!-- Auth e-mail button bar -->
<div class="modal-footer" ng-if="status == 'unauthorized-email'">
<button type="button" class="btn btn-success" ng-click="sendAuthEmail()">
Send Authorization E-mail
</button>
<button type="button" class="btn btn-default" ng-click="cancelEmailAuth()" ng-disabled="creating">Cancel</button>
</div>
<!-- Loading -->
<div ng-if="status != 'unauthorized-email'"
class="loading-container">
<span class="cor-loader-inline"></span>
</div>
</div> </div>
</div> </div>
</div> </div>