Author: echatellier Date: 2014-06-20 11:44:35 +0200 (Fri, 20 Jun 2014) New Revision: 241 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/241 Log: Fix filters accordion 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-06-20 09:38:28 UTC (rev 240) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 09:44:35 UTC (rev 241) @@ -767,48 +767,51 @@ <div id="tabs-filters" class="tab-pane" ng-controller="ConfigurationFilterController"> <input type="hidden" name="mailFiltersJson" value="{{mailFilters}}" /> - <div class="panel panel-default"> - <div class="panel-heading" ng-repeat-start="mailFolder in mailFolders"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#mailFilerAccordion{{$index}}"> - Filtre du dossier {{mailFolder.name}} - </a> - </h4> - </div> - <div id="mailFilerAccordion{{$index}}" class="panel-collapse collapse" ng-repeat-end> - <div class="panel-body"> - <table class="table table-hover table-bordered"> - <thead> - <tr> - <th>Filtre</th> - <th>Dossier</th> - <th/> - </tr> - </thead> - <tbody ui-sortable="sortableOptions" ng-model="rootFolderMailFilters[mailFolder.topiaId]"> - <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> - <td>{{mailFilter.expression}}</td> - <td>{{mailFilter.mailFolder.$fullPath}}</td> - <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> - <span class="glyphicon glyphicon-remove"></span> - </a></td> - </tr> - </tbody> - </table> - - <div role="form"> - <div class="form-group"> - <label for="filterField">Filtre</label> - <input type="text" class="form-control" id="folderField" ng-model="newFilter.expression"> + <div class="panel-group" id="accordionFilters"> + + <div class="panel panel-default" ng-repeat="mailFolder in mailFolders"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordionFilters" href="#mailFilerAccordion{{$index}}"> + Filtre du dossier {{mailFolder.name}} + </a> + </h4> + </div> + <div id="mailFilerAccordion{{$index}}" class="panel-collapse collapse"> + <div class="panel-body"> + <table class="table table-hover table-bordered"> + <thead> + <tr> + <th>Filtre</th> + <th>Dossier</th> + <th/> + </tr> + </thead> + <tbody ui-sortable="sortableOptions" ng-model="rootFolderMailFilters[mailFolder.topiaId]"> + <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> + <td>{{mailFilter.expression}}</td> + <td>{{mailFilter.mailFolder.$fullPath}}</td> + <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> + <span class="glyphicon glyphicon-remove"></span> + </a></td> + </tr> + </tbody> + </table> + + <div role="form"> + <div class="form-group"> + <label for="filterField">Filtre</label> + <input type="text" class="form-control" id="folderField" ng-model="newFilter.expression"> + </div> + <div class="form-group"> + <label for="folderField">Dossier</label> + <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> + </div> </div> - <div class="form-group"> - <label for="folderField">Dossier</label> - <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> - </div> + <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> + <i class="glyphicon glyphicon-plus"></i> Ajouter + </button> </div> - <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> - <i class="glyphicon glyphicon-plus"></i> Ajouter - </button> </div> </div> </div>