Fix various text

This commit is contained in:
Girish Ramakrishnan
2018-06-07 19:42:08 -07:00
parent a58d9d1497
commit 55fb3b3b55
3 changed files with 10 additions and 11 deletions

View File

@@ -197,7 +197,7 @@
<h1 ng-hide="appstoreLogin.register">Login to Cloudron.io</h1>
</div>
<div class="col-md-12 text-center">
<p>This account will provide you access to the Cloudron App Store</p>
<p>This account is used to access the App Store and manage your subscription</p>
</div>
<div class="col-md-12" style="margin-bottom: 10px;">
<small class="text-danger" ng-show="appstoreLogin.error.generic">{{ appstoreLogin.error.generic }}</small>
@@ -209,7 +209,7 @@
<input type="password" style="display: none;">
<div class="form-group" ng-class="{ 'has-error': (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.generic }">
<label class="control-label">Email Address</label>
<label class="control-label">Email</label>
<input type="email" class="form-control" ng-model="appstoreLogin.email" id="inputAppstoreLoginEmail" name="email" required autofocus>
<div class="control-label" ng-show="(!appstoreLoginForm.email.$dirty && appstoreLogin.error.email) || (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.email">
<small class="text-danger" ng-show="appstoreLogin.error.email">{{ appstoreLogin.error.email }}</small>
@@ -242,14 +242,14 @@
<center>
<button type="submit" class="btn btn-lg btn-success" ng-disabled="appstoreLoginForm.$invalid || appstoreLogin.busy || !appstoreLogin.termsAccepted">
<i class="fa fa-circle-o-notch fa-spin" ng-show="appstoreLogin.busy"></i> <span ng-hide="appstoreLogin.register">Login</span><span ng-show="appstoreLogin.register">Sign up</span>
<i class="fa fa-circle-o-notch fa-spin" ng-show="appstoreLogin.busy"></i> <span ng-hide="appstoreLogin.register">Login</span><span ng-show="appstoreLogin.register">Create Account</span>
</button>
<br/>
<br/>
<a href="" ng-click="appstoreLogin.register = true" ng-hide="appstoreLogin.register">Don't have an account yet?</a>
<a href="" ng-click="appstoreLogin.register = false" ng-show="appstoreLogin.register">Already have an account?</a>
<a href="" ng-click="appstoreLogin.register = true" ng-hide="appstoreLogin.register">Don't have an account yet? Sign up</a>
<a href="" ng-click="appstoreLogin.register = false" ng-show="appstoreLogin.register">Already have an account? Log in</a>
</center>
</form>

View File

@@ -17,9 +17,10 @@
If this domain is already configured to handle email with some other provider, it will overwrite those records.
</div>
<div ng-hide="hasSubscription">
<h4 class="text-danger">
The Cloudron Email Server is only part of the paid subscription.
</h4>
<br/>
<div class="text-danger">
A paid subscription is required to enable the Email Solution.
</div>
</div>
</div>
<div class="modal-footer">