Merge branch 'master' into pagesnew
This commit is contained in:
commit
86447c0a99
52 changed files with 553 additions and 211 deletions
|
@ -240,7 +240,7 @@
|
|||
<tr>
|
||||
<td>Mail Sender:</td>
|
||||
<td>
|
||||
<input class="form-control" type="email" ng-model="config.DEFAULT_MAIL_SENDER"
|
||||
<input class="form-control" type="email" ng-model="config.MAIL_DEFAULT_SENDER"
|
||||
placeholder="E-mail address"></span>
|
||||
<div class="help-text">
|
||||
E-mail address from which all e-mails are sent. If not specified,
|
||||
|
|
|
@ -81,9 +81,19 @@
|
|||
</span>
|
||||
<input type="url" class="form-control" ng-model="currentConfig[field.name]" ng-switch-when="url" required>
|
||||
<input type="text" class="form-control" ng-model="currentConfig[field.name]" ng-switch-when="string" required>
|
||||
<input type="text" class="form-control" ng-model="currentConfig[field.name]" ng-switch-when="regex" required
|
||||
ng-pattern="getPattern(field)"
|
||||
placeholder="{{ field.placeholder }}">
|
||||
<div ng-switch-when="regex">
|
||||
<input type="text" class="form-control" ng-model="currentConfig[field.name]"
|
||||
ng-pattern="getPattern(field)"
|
||||
placeholder="{{ field.placeholder }}"
|
||||
ng-name="field.name"
|
||||
id="{{ field.name }}"
|
||||
required>
|
||||
|
||||
<div class="alert alert-warning" style="margin-top: 10px; margin-bottom: 10px"
|
||||
ng-if="field.regex_fail_message && hasRegexMismatch(createForm.$error, field.name)">
|
||||
<span ng-bind-html="field.regex_fail_message"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="entity-search" namespace="repository.namespace"
|
||||
placeholder="''"
|
||||
current-entity="currentConfig[field.name]"
|
||||
|
@ -91,7 +101,8 @@
|
|||
allowed-entities="['user', 'team', 'org']"
|
||||
ng-switch-when="entity"></div>
|
||||
|
||||
<div ng-if="getHelpUrl(field, currentConfig)" style="margin-top: 10px">
|
||||
<div ng-if="getHelpUrl(field, currentConfig)"
|
||||
style="margin-top: 10px; margin-bottom: 10px">
|
||||
See: <a href="{{ getHelpUrl(field, currentConfig) }}" target="_blank">{{ getHelpUrl(field, currentConfig) }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -32,6 +32,9 @@
|
|||
<i class="fa fa-download"></i>
|
||||
<a href="javascript:void(0)" ng-click="downloadCfg(shownRobot)">Download .dockercfg file</a>
|
||||
</span>
|
||||
<span class="download-cfg not-supported" ng-show="!isDownloadSupported()">
|
||||
.dockercfg download not supported in this browser
|
||||
</span>
|
||||
<div class="clipboard-copied-message" style="display: none">
|
||||
Copied
|
||||
</div>
|
||||
|
|
7
static/directives/quay-service-status-bar.html
Normal file
7
static/directives/quay-service-status-bar.html
Normal file
|
@ -0,0 +1,7 @@
|
|||
<div class="announcement inline" ng-show="indicator != 'none' && indicator != 'loading'">
|
||||
<div ng-repeat="incident in incidents">
|
||||
<span class="quay-service-status-indicator" ng-class="indicator"
|
||||
ng-if="indicator != 'loading'"></span>
|
||||
<a ng-href="{{ incident.shortlink }}" class="quay-service-status-description">{{ incident.name }}</a>
|
||||
</div>
|
||||
</div>
|
6
static/directives/quay-service-status.html
Normal file
6
static/directives/quay-service-status.html
Normal file
|
@ -0,0 +1,6 @@
|
|||
<span class="quay-service-status-element">
|
||||
<span class="quay-service-status-indicator" ng-class="indicator"
|
||||
ng-if="indicator != 'loading'"></span>
|
||||
<span class="cor-loader-inline" ng-if="indicator == 'loading'"></span>
|
||||
<a href="http://status.quay.io" class="quay-service-status-description">{{ description }}</a>
|
||||
</span>
|
Reference in a new issue