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

Bring back email view in app configure

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-17 15:09:39 +02:00
parent 8810439ffc
commit 5c0a53e02a
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/app.html
View File

@@ -151,6 +151,7 @@
<div ng-click="setView('access')" ng-class="{ 'active': view === 'access' }">Access Control</div>
<div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources' }">Resources</div>
<div ng-click="setView('security')" ng-class="{ 'active': view === 'security' }">Security</div>
<div ng-click="setView('email')" ng-class="{ 'active': view === 'email' }">Email</div>
<div ng-click="setView('updates')" ng-class="{ 'active': view === 'updates' }">Updates</div>
<div ng-click="setView('backups')" ng-class="{ 'active': view === 'backups' }">Backups</div>
<div ng-click="setView('debug')" ng-class="{ 'active': view === 'debug' }">Debug</div>
@@ -421,13 +422,14 @@
<fieldset>
<form role="form" name="emailForm" ng-submit="email.submit()" autocomplete="off">
<!-- recvmail currently only works with cloudron email -->
<div class="form-group" ng-class="{ 'has-error': !emailForm.mailboxName.$dirty && email.error.mailboxName }">
<div class="form-group">
<input type="checkbox" id="emailMailboxNameEnabled" ng-model="email.mailboxNameEnabled">
<label class="control-label" for="emailMailboxNameEnabled">Custom Mail FROM</label>
<p class="text-small">Addresses ending with '.app' are reserved.</p>
<div class="has-error" ng-show="email.error.mailboxName">{{ email.error.mailboxName }}</div>
<div class="input-group form-inline">
<input type="text" class="form-control" ng-required="email.mailboxNameEnabled" name="mailboxName" ng-model="email.mailboxName" uib-tooltip="App FROM email address. Addresses ending with '.app' are reserved." tooltip-class="long" ng-disabled="!email.mailboxNameEnabled">
<div class="input-group form-inline" ng-class="{ 'has-error': !emailForm.mailboxName.$dirty && email.error.mailboxName }">
<input type="text" class="form-control" ng-required="email.mailboxNameEnabled" name="mailboxName" ng-model="email.mailboxName" ng-disabled="!email.mailboxNameEnabled">
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" ng-disabled="!email.mailboxNameEnabled">
@@ -436,10 +438,9 @@
</div>
</div>
<p class="text-small">
<br/>
This app is configured to send mail using <a ng-href="/#/email/{{ app.domain }}">{{app.domain}}'s Outbound Email</a> settings.
</p>
<br/>
<p class="text-small">This app is configured to send mail using <a ng-href="/#/email/{{ app.domain }}">{{app.domain}}'s Outbound Email</a> settings.</p>
</div>
<input class="ng-hide" type="submit" ng-disabled="emailForm.$invalid || email.busy"/>
@@ -448,11 +449,7 @@
</div>
</div>
<div class="row">
<div class="col-md-6">
<span class="text-success text-bold" ng-show="email.success">Saved</span>
</div>
<div class="col-md-6 text-right">
<div class="col-md-12 text-right">
<button class="btn btn-outline btn-primary pull-right" ng-click="email.submit()" ng-disabled="email.$invalid || email.busy"><i class="fa fa-circle-notch fa-spin" ng-show="email.busy"></i> Save</button>
</div>
</div>