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

add initial repair dialog with domain/backup selection

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-21 22:45:26 +02:00
parent 36c23227e5
commit 85be7acab2
3 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/views/app.html
View File

@@ -83,25 +83,56 @@
<!-- Modal domain collision -->
<div class="modal fade" id="domainCollisionsModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Domain Collision</h4>
</div>
<div class="modal-body">
<p>By default Cloudron does not overwrite DNS records which exist outside of Cloudron.</p>
<p>The following domains already exist outside of Cloudron:</p>
<ul>
<li ng-repeat="domain in location.domainCollisions">{{ domain.subdomain + '.' + domain.domain }}</li>
</ul>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" ng-click="location.submit(true)">Overwrite existing DNS Records</button>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Domain Collision</h4>
</div>
<div class="modal-body">
<p>By default Cloudron does not overwrite DNS records which exist outside of Cloudron.</p>
<p>The following domains already exist outside of Cloudron:</p>
<ul>
<li ng-repeat="domain in location.domainCollisions">{{ domain.subdomain + '.' + domain.domain }}</li>
</ul>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" ng-click="location.submit(true)">Overwrite existing DNS Records</button>
</div>
</div>
</div>
</div>
<!-- Modal repair -->
<div class="modal fade" id="repairModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Repair {{ app.fqdn }}</h4>
</div>
<div class="modal-body">
<p>TBD info about error and potential solution</p>
<!-- show this if alternate domains may need to be disabled -->
<div>
<p ng-repeat="alternateDomain in repair.optionalDomains">
<label class="control-label"><input type="checkbox" ng-model="alternateDomain.enabled"> {{ alternateDomain.subdomain }}.{{ alternateDomain.domain }}</label>
</p>
</div>
<!-- show this for restore -->
<div>
<label class="control-label">Restore from Backup:</label>
<select class="form-control" ng-model="repair.backupId">
<option ng-repeat="backup in repair.backups" value="{{ backup.id }}">{{ backup.creationTime | prettyDate }} - v{{ backup.version }}</option>
</select>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" ng-click="repair.submit()" ng-disabled="repair.busy"><i class="fa fa-circle-notch fa-spin" ng-show="repair.busy"></i> Repair</button>
</div>
</div>
</div>
</div>
<!-- Modal update app -->
<div class="modal fade" id="updateModal" tabindex="-1" role="dialog">
@@ -660,6 +691,7 @@
<div class="col-md-12">
<label class="control-label">Repair</label>
<p>If the app is not responding, try restarting the app.</p>
<button class="btn btn-success" ng-click="repair.show()" ng-show="app.error">Repair App</button>
<button class="btn btn-danger pull-right" ng-click="debug.stopAppTask(app.taskId)" ng-show="app.taskId">Cancel Current Task</button>
<button class="btn btn-danger pull-right" ng-click="debug.restartApp()" ng-disabled="app.taskId || debug.appIsRestarting"><i class="fa fa-circle-notch fa-spin" ng-show="debug.appIsRestarting"></i> Restart App</button>
</div>