Some UI improvements

This commit is contained in:
Joseph Schorr 2014-12-26 19:18:00 -05:00
parent 1142b1bc18
commit 77278f0391
3 changed files with 138 additions and 64 deletions

View file

@ -1,7 +1,7 @@
<div class="config-file-field-element">
<span ng-show="uploadProgress == null">
<span ng-if="hasFile"><strong>{{ filename }}</strong> in the mounted config directory</span>
<span class="nofile" ng-if="!hasFile">File {{ filename }} not found in mounted config directory: </span>
<span ng-if="hasFile"><code>{{ filename }}</code></span>
<span class="nofile" ng-if="!hasFile"><code>{{ filename }}</code> not found in mounted config directory: </span>
<span ng-if="!hasFile">
<input type="file" ng-file-select="onFileSelect($files)">
</span>

View file

@ -56,9 +56,10 @@
<tr>
<td>User Creation:</td>
<td>
<label>
<input type="checkbox" ng-model="config.FEATURE_USER_CREATION">Enable User Creation
</label>
<div class="co-checkbox">
<input id="ftuc" type="checkbox" ng-model="config.FEATURE_USER_CREATION">
<label for="ftuc">Enable User Creation</label>
</div>
<div class="help-text">
If enabled, users can be created from the registry UI.
</div>
@ -67,9 +68,10 @@
<tr>
<td>Build Support:</td>
<td colspan="2">
<label>
<input type="checkbox" ng-model="config.FEATURE_BUILD_SUPPORT">Enable Dockerfile Build
</label>
<div class="co-checkbox">
<input id="ftbs" type="checkbox" ng-model="config.FEATURE_BUILD_SUPPORT">
<label for="ftbs">Enable Dockerfile Build</label>
</div>
<div class="help-text">
If enabled, users can submit Dockerfiles to be built and pushed by the Enterprise Registry.
</div>
@ -95,9 +97,9 @@
<td>Server hostname:</td>
<td>
<span class="config-string-field" binding="config.SERVER_HOSTNAME"
placeholder="Hostname (and optional port)"></span>
placeholder="Hostname (and optional port if non-standard)"></span>
<div class="help-text">
The HTTP host (and optionally the port number) of the location
The HTTP host (and optionally the port number if a non-standard HTTP/HTTPS port) of the location
where the registry will be accessible on the network
</div>
</td>
@ -105,28 +107,32 @@
<tr>
<td>SSL:</td>
<td>
<label>
<input type="checkbox" ng-model="config.PREFERRED_URL_SCHEME"
ng-true-value="https" ng-false-value="http">Enable SSL
</label>
<div class="help-text">
<div class="co-checkbox">
<input id="enable-ssl" type="checkbox" ng-model="config.PREFERRED_URL_SCHEME"
ng-true-value="https" ng-false-value="http">
<label for="enable-ssl">Enable SSL</label>
</div>
<div class="help-text" style="margin-bottom: 10px">
A valid SSL certificate and private key files are required to use this option.
</div>
</td>
</tr>
<tr ng-show="config.PREFERRED_URL_SCHEME == 'https'">
<td class="non-input">SSL certificate:</td>
<td>
<span class="config-file-field" filename="ssl.cert"></span>
<div class="help-text">
The certificate must be in PEM format.
</div
</td>
</tr>
<tr ng-show="config.PREFERRED_URL_SCHEME == 'https'">
<td class="non-input">SSL key:</td>
<td>
<span class="config-file-field" filename="ssl.key"></span>
<table class="config-table" ng-show="config.PREFERRED_URL_SCHEME == 'https'">
<tr>
<td class="non-input">Certificate:</td>
<td>
<span class="config-file-field" filename="ssl.cert"></span>
<div class="help-text">
The certificate must be in PEM format.
</div
</td>
</tr>
<tr>
<td class="non-input">Private key:</td>
<td>
<span class="config-file-field" filename="ssl.key"></span>
</td>
</tr>
</table>
</td>
</tr>
</table>
@ -342,9 +348,10 @@
<tr ng-show="config.DISTRIBUTED_STORAGE_CONFIG.local[0] == 'RadosGWStorage'">
<td>Is Secure:</td>
<td>
<label>
<input type="checkbox" ng-model="config.DISTRIBUTED_STORAGE_CONFIG.local[1].is_secure">Requires SSL
</label>
<div class="co-checkbox">
<input id="dsc-secure" type="checkbox" ng-model="config.DISTRIBUTED_STORAGE_CONFIG.local[1].is_secure">
<label for="dsc-secure">Requires SSL</label>
</div>
</td>
</tr>
<tr ng-show="config.DISTRIBUTED_STORAGE_CONFIG.local[0] == 'RadosGWStorage'">
@ -397,9 +404,10 @@
users to reset their passwords.</p>
</div>
<label>
<input type="checkbox" ng-model="config.FEATURE_MAILING">Enable E-mails
</label>
<div class="co-checkbox">
<input id="ftmail" type="checkbox" ng-model="config.FEATURE_MAILING">
<label for="ftmail">Enable E-mails</label>
</div>
<table class="config-table" ng-show="config.FEATURE_MAILING">
<tr>
@ -419,9 +427,10 @@
<tr>
<td>TLS:</td>
<td>
<label>
<input type="checkbox" ng-model="config.MAIL_USE_TLS">Use TLS
</label>
<div class="co-checkbox">
<input id="mut" type="checkbox" ng-model="config.MAIL_USE_TLS">
<label for="mut">Use TLS</label>
</div>
</td>
</tr>
<tr>
@ -438,9 +447,10 @@
<tr>
<td>Authentication:</td>
<td>
<label>
<input type="checkbox" ng-model="mapped.use_mail_auth">Requires Authentication
</label>
<div class="co-checkbox">
<input id="uma" type="checkbox" ng-model="mapped.use_mail_auth">
<label for="uma">Requires Authentication</label>
</div>
<table class="config-table" ng-show="mapped.use_mail_auth">
<tr>
@ -550,9 +560,10 @@
</p>
</div>
<label>
<input type="checkbox" ng-model="config.FEATURE_GITHUB_LOGIN">Enable Github Authentication
</label>
<div class="co-checkbox">
<input id="ftghl" type="checkbox" ng-model="config.FEATURE_GITHUB_LOGIN">
<label for="ftghl">Enable Github Authentication</label>
</div>
<table class="config-table" ng-show="config.FEATURE_GITHUB_LOGIN">
<tr>
@ -620,9 +631,10 @@
</p>
</div>
<label>
<input type="checkbox" ng-model="config.FEATURE_GOOGLE_LOGIN">Enable Google Authentication
</label>
<div class="co-checkbox">
<input id="ftgoa" type="checkbox" ng-model="config.FEATURE_GOOGLE_LOGIN">
<label for="ftgoa">Enable Google Authentication</label>
</div>
<table class="config-table" ng-show="config.FEATURE_GOOGLE_LOGIN">
<tr>
@ -668,9 +680,10 @@
</p>
</div>
<label>
<input type="checkbox" ng-model="config.FEATURE_GITHUB_BUILD">Enable Github Triggers
</label>
<div class="co-checkbox">
<input id="ftgb" type="checkbox" ng-model="config.FEATURE_GITHUB_BUILD">
<label for="ftgb">Enable Github Triggers</label>
</div>
<table class="config-table" ng-show="config.FEATURE_GITHUB_BUILD">
<tr>