Author: echatellier Date: 2014-08-06 12:03:08 +0200 (Wed, 06 Aug 2014) New Revision: 478 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/478 Log: refs #5538: ajout de la partie web de la configuration des boites mail de type fax Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-08-06 08:46:09 UTC (rev 477) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-08-06 10:03:08 UTC (rev 478) @@ -1055,7 +1055,7 @@ <th>Serveur</th> <th>Port</th> <th>Utilisateur</th> - <th>Rejet</th> + <th>Options</th> <th/> </tr> </thead> @@ -1065,57 +1065,81 @@ <td>{{emailAccount.host}}</td> <td>{{emailAccount.port}}</td> <td>{{emailAccount.login}}</td> - <td>{{emailAccount.rejectAllowed ? 'Autorisé' : 'Non autorisé'}}</td> <td> + <span class="fa fa-fax" tooltip="Compte email ne recevant que des fax" ng-if="emailAccount.faxAccountType"></span> + <span class="fa fa-reply" tooltip="Le rejet des email est autorisé" ng-if="emailAccount.rejectAllowed"></span> + </td> + <td> <a class="btn btn-danger btn-xs" ng-click="removeEmailAccount($index)"> <span class="glyphicon glyphicon-remove"></span> </a></td> </tr> + <tr ng-if="!emailAccounts || emailAccounts.length == 0"> + <td class="emptyTable" colspan="6">Aucun compte email trouvé</td> + </tr> </tbody> </table> - <div class="form row" role="form" ng-form="addEmailAccountForm"> - <div class="form-group col-xs-1"> - <label for="emailAccountProtocol" class="control-label">Protocole:</label> - <!-- <input type="text" class="form-control" ng-model="newAccount.protocol" /> --> - <select id="emailAccountProtocol" ng-model="newAccount.protocol" ng-options="protocol as protocol for (protocol, port) in emailProtocolPorts"></select> - </div> - <div class="form-group col-xs-3"> - <label for="emailAccountHost" class="control-label">Serveur:</label> - <input id="emailAccountHost" name="newAccountHost" type="text" class="form-control" ng-model="newAccount.host" ng-minlength="1" /> - </div> - <div class="form-group col-xs-1" - ng-class="{'has-error': addEmailAccountForm.newAccountPort.$dirty && addEmailAccountForm.newAccountPort.$invalid, - 'has-success': addEmailAccountForm.newAccountPort.$dirty && addEmailAccountForm.newAccountPort.$valid}"> - <label for="emailAccountPort" class="control-label">Port:</label> - <input id="emailAccountPort" name="newAccountPort" type="text" class="form-control" ng-model="newAccount.port" ng-pattern="/^\d+$/" /> - </div> - <div class="form-group col-xs-2"> - <label for="emailAccountUser" class="control-label">Utilisateur:</label> - <input id="emailAccountUser" type="text" class="form-control" ng-model="newAccount.login"/> - </div> - <div class="form-group col-xs-2"> - <label for="emailAccountPassword" class="control-label">Mot de passe:</label> - <input id="emailAccountPassword" type="password" class="form-control" ng-model="newAccount.password"> - </div> - <div class="form-group col-xs-1"> - <label class="control-label">Rejet:</label> - <div class="checkbox"> - <label> - <input id="emailRejectAllowed" type="checkbox" ng-value="true" ng-model="newAccount.rejectAllowed"> Autorisé - </label> + <div role="form" ng-form="addEmailAccountForm"> + <fieldset> + <legend>Nouveau compte email</legend> + <div class="form row"> + <div class="form-group col-xs-1"> + <label for="emailAccountProtocol" class="control-label">Protocole:</label> + <!-- <input type="text" class="form-control" ng-model="newAccount.protocol" /> --> + <select id="emailAccountProtocol" ng-model="newAccount.protocol" ng-options="protocol as protocol for (protocol, port) in emailProtocolPorts"></select> + </div> + <div class="form-group col-xs-4"> + <label for="emailAccountHost" class="control-label">Serveur:</label> + <input id="emailAccountHost" name="newAccountHost" type="text" class="form-control" ng-model="newAccount.host" ng-minlength="1" /> + </div> + <div class="form-group col-xs-1" + ng-class="{'has-error': addEmailAccountForm.newAccountPort.$dirty && addEmailAccountForm.newAccountPort.$invalid, + 'has-success': addEmailAccountForm.newAccountPort.$dirty && addEmailAccountForm.newAccountPort.$valid}"> + <label for="emailAccountPort" class="control-label">Port:</label> + <input id="emailAccountPort" name="newAccountPort" type="text" class="form-control" ng-model="newAccount.port" ng-pattern="/^\d+$/" /> + </div> + <div class="form-group col-xs-3"> + <label for="emailAccountUser" class="control-label">Utilisateur:</label> + <input id="emailAccountUser" type="text" class="form-control" ng-model="newAccount.login"/> + </div> + <div class="form-group col-xs-3"> + <label for="emailAccountPassword" class="control-label">Mot de passe:</label> + <input id="emailAccountPassword" type="password" class="form-control" ng-model="newAccount.password"> + </div> </div> - </div> - <div class="form-group col-xs-2"> - <br /> - <button type="button" class="btn btn-info" ng-disabled="!newAccount.protocol || !newAccount.host || !newAccount.port || !newAccount.login || addEmailAccountForm.$invalid" - ng-click="checkEmailAccount()"> - <i class="fa fa-cogs"></i> Test - </button> - <button type="button" class="btn btn-success" ng-disabled="!newAccount.protocol || !newAccount.host || !newAccount.port || !newAccount.login || addEmailAccountForm.$invalid" ng-click="addEmailAccount()"> - <i class="fa fa-plus"></i> Ajouter - </button> - </div> + <div class="form row"> + <div class="form-group col-xs-5"> + <label class="control-label">Réception de fax:</label> + <div class="checkbox"> + <label> + <input id="emailRejectAllowed" type="checkbox" ng-value="true" ng-model="newAccount.faxAccountType"> + ce compte email recoit seulement des fax + </label> + </div> + </div> + <div class="form-group col-xs-5"> + <label class="control-label">Rejet:</label> + <div class="checkbox"> + <label tooltip="{{newAccount.faxAccountType ? 'Les fax ne peuvent pas être rejeté' : 'Suivant la configuration des filtres de routage, les mails de client inconnus peuvent être rejeté'}}"> + <input id="emailRejectAllowed" type="checkbox" ng-value="true" + ng-model="newAccount.rejectAllowed" ng-disabled="newAccount.faxAccountType"> + autoriser les mails de ce compte à pouvoir être rejeté + </label> + </div> + </div> + <div class="form-group col-xs-2"> + <br /> + <button type="button" class="btn btn-info" ng-disabled="!newAccount.protocol || !newAccount.host || !newAccount.port || !newAccount.login || addEmailAccountForm.$invalid" + ng-click="checkEmailAccount()"> + <i class="fa fa-cogs"></i> Test + </button> + <button type="button" class="btn btn-success" ng-disabled="!newAccount.protocol || !newAccount.host || !newAccount.port || !newAccount.login || addEmailAccountForm.$invalid" ng-click="addEmailAccount()"> + <i class="fa fa-plus"></i> Ajouter + </button> + </div> + </div> + </fieldset> </div> </div>