jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixes to import UI

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-02-07 10:22:52 -08:00
parent 49975a521b
commit 8600019079
3 changed files with 80 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/app.html
View File

@@ -145,7 +145,7 @@
<h4 class="modal-title">Import Backup</h4>
</div>
<div class="modal-body">
<p class="text-danger">Any data generated between now and the last known backup will be irrevocably lost.
<p class="text-info">Any data generated between now and the last known backup will be irrevocably lost.
It is recommended to create a backup of the current data before attempting an import.
</p>
@@ -177,8 +177,8 @@
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.bucket }" ng-show="s3like(importBackup.provider) || importBackup.provider === 'gcs'">
<label class="control-label" for="inputimportBackupBucket">Bucket name</label>
<input type="text" class="form-control" ng-model="importBackup.bucket" id="inputimportBackupBucket" name="bucket" ng-disabled="importBackup.busy" ng-required="s3like(importBackup.provider)">
<label class="control-label" for="inputImportBackupBucket">Bucket name</label>
<input type="text" class="form-control" ng-model="importBackup.bucket" id="inputImportBackupBucket" name="bucket" ng-disabled="importBackup.busy" ng-required="s3like(importBackup.provider)">
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.prefix }" ng-show="importBackup.provider !== 'filesystem' && importBackup.provider !== ''">
@@ -187,13 +187,13 @@
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.region }" ng-show="importBackup.provider === 's3'">
<label class="control-label" for="inputimportBackupS3Region">Region</label>
<select class="form-control" name="region" id="inputimportBackupS3Region" ng-model="importBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 's3'"></select>
<label class="control-label" for="inputImportBackupS3Region">Region</label>
<select class="form-control" name="region" id="inputImportBackupS3Region" ng-model="importBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 's3'"></select>
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.region }" ng-show="importBackup.provider === 'digitalocean-spaces'">
<label class="control-label" for="inputimportBackupDORegion">Region</label>
<select class="form-control" name="region" id="inputimportBackupDORegion" ng-model="importBackup.endpoint" ng-options="a.value as a.name for a in doSpacesRegions" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'digitalocean-spaces'"></select>
<label class="control-label" for="inputImportBackupDORegion">Region</label>
<select class="form-control" name="region" id="inputImportBackupDORegion" ng-model="importBackup.endpoint" ng-options="a.value as a.name for a in doSpacesRegions" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'digitalocean-spaces'"></select>
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.region }" ng-show="importBackup.provider === 'exoscale-sos'">
@@ -212,13 +212,13 @@
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.accessKeyId }" ng-show="s3like(importBackup.provider)">
<label class="control-label" for="inputimportBackupAccessKeyId">Access key id</label>
<input type="text" class="form-control" ng-model="importBackup.accessKeyId" id="inputimportBackupAccessKeyId" name="accessKeyId" ng-disabled="importBackup.busy" ng-required="s3like(importBackup.provider)">
<label class="control-label" for="inputImportBackupAccessKeyId">Access key id</label>
<input type="text" class="form-control" ng-model="importBackup.accessKeyId" id="inputImportBackupAccessKeyId" name="accessKeyId" ng-disabled="importBackup.busy" ng-required="s3like(importBackup.provider)">
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.secretAccessKey }" ng-show="s3like(importBackup.provider)">
<label class="control-label" for="inputimportBackupSecretAccessKey">Secret access key</label>
<input type="text" class="form-control" ng-model="importBackup.secretAccessKey" id="inputimportBackupSecretAccessKey" name="secretAccessKey" ng-disabled="importBackup.busy" ng-required="s3like(importBackup.provider)">
<label class="control-label" for="inputImportBackupSecretAccessKey">Secret access key</label>
<input type="text" class="form-control" ng-model="importBackup.secretAccessKey" id="inputImportBackupSecretAccessKey" name="secretAccessKey" ng-disabled="importBackup.busy" ng-required="s3like(importBackup.provider)">
</div>
<div class="form-group" ng-class="{ 'has-error': importBackup.error.gcsKeyInput }" ng-show="importBackup.provider === 'gcs'">
@@ -880,7 +880,9 @@
<p>Use this to migrate an app from another Cloudron. The other app must have the same package version and access
control stratey as this one.
</p>
<button class="btn btn-primary pull-right" class="btn-primary" ng-click="importBackup.show()" ng-disabled="importBackup.busy"><i class="fa fa-circle-notch fa-spin" ng-show="backups.busy"></i> Import Backup</button>
<button class="btn btn-primary pull-right" class="btn-primary" ng-click="importBackup.show()" ng-disabled="app.taskId">
<i class="fa fa-circle-notch fa-spin" ng-show="backups.busy"></i> Import Backup
</button>
</div>
</div>
<hr/>