setup: have a single error object

This commit is contained in:
Girish Ramakrishnan
2019-05-22 11:10:41 -07:00
parent 28845d6f33
commit bffe6327a0
2 changed files with 11 additions and 11 deletions

View File

@@ -57,6 +57,7 @@
<div class="row">
<div class="col-md-10 col-md-offset-1 text-center">
<h1>Cloudron Setup</h1>
<p class="has-error text-center" ng-show="error.setup">{{ error.setup }}</p>
<h3>Provide a domain for your Cloudron</h3>
<p>Apps will be installed on subdomains of this domain</p>
</div>
@@ -75,7 +76,7 @@
<div class="row">
<div class="col-md-10 col-md-offset-1">
<h3 class="text-center">Domain Configuration</h3>
<p class="has-error text-center" ng-show="dnsCredentials.error">{{ dnsCredentials.error }}</p>
<p class="has-error text-center" ng-show="error.dnsCredentials">{{ error.dnsCredentials }}</p>
<br/>
<div class="form-group">
@@ -172,10 +173,10 @@
<br/>
<h3>Owner verification</h3>
<p>Provide the EC2 instance id to verify you have access to this server.</p>
<div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.instanceId.$dirty && (dnsCredentialsForm.instanceId.$invalid || error) }">
<div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.instanceId.$dirty && (dnsCredentialsForm.instanceId.$invalid || error.ami) }">
<input type="text" class="form-control" ng-model="instanceId" id="inputInstanceId" name="instanceId" placeholder="AWS EC2 instance id" ng-maxlength="20" ng-minlength="10" ng-required="provider === 'ami'" autocomplete="off">
</div>
<p>&nbsp;<span ng-show="error" class="text-danger">{{ error }}</span></p>
<p>&nbsp;<span ng-show="error" class="text-danger">{{ error.ami }}</span></p>
</div>
<p class="small text-info" ng-show="needsPort80(dnsCredentials.provider, dnsCredentials.tlsConfig.provider)">Let's Encrypt requires your server to be reachable on port 80</p>