From echatellier@users.forge.codelutin.com Fri Jun 20 11:44:35 2014
From: echatellier@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r241 -
	trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
Date: Fri, 20 Jun 2014 11:44:35 +0200
Message-ID: <20140620094435.A0A0F18073E@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3433532770274202596=="

--===============3433532770274202596==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/config=
uration-input.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuratio=
n-input.jsp	2014-06-20 09:38:28 UTC (rev 240)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuratio=
n-input.jsp	2014-06-20 09:44:35 UTC (rev 241)
@@ -767,48 +767,51 @@
         <div id=3D"tabs-filters" class=3D"tab-pane" ng-controller=3D"Configu=
rationFilterController">
           <input type=3D"hidden" name=3D"mailFiltersJson" value=3D"{{mailFil=
ters}}" />
          =20
-          <div class=3D"panel panel-default">
-            <div class=3D"panel-heading" ng-repeat-start=3D"mailFolder in ma=
ilFolders">
-              <h4 class=3D"panel-title">
-                <a data-toggle=3D"collapse" data-parent=3D"#accordion" href=
=3D"#mailFilerAccordion{{$index}}">
-                  Filtre du dossier {{mailFolder.name}}
-                </a>
-              </h4>
-            </div>
-            <div id=3D"mailFilerAccordion{{$index}}" class=3D"panel-collapse=
 collapse" ng-repeat-end>
-              <div class=3D"panel-body">
-                <table class=3D"table table-hover table-bordered">
-                  <thead>
-                    <tr>
-                      <th>Filtre</th>
-                      <th>Dossier</th>
-                      <th/>
-                    </tr>
-                  </thead>
-                  <tbody ui-sortable=3D"sortableOptions" ng-model=3D"rootFol=
derMailFilters[mailFolder.topiaId]">
-                    <tr ng-repeat=3D"mailFilter in rootFolderMailFilters[mai=
lFolder.topiaId]">
-                      <td>{{mailFilter.expression}}</td>
-                      <td>{{mailFilter.mailFolder.$fullPath}}</td>
-                      <td><a class=3D"btn btn-danger btn-xs" ng-click=3D"rem=
oveFilter(mailFolder, mailFilter)">
-                          <span class=3D"glyphicon glyphicon-remove"></span>
-                        </a></td>
-                    </tr>
-                  </tbody>
-                </table>
-               =20
-                <div role=3D"form">
-                  <div class=3D"form-group">
-                    <label for=3D"filterField">Filtre</label>
-                    <input type=3D"text" class=3D"form-control" id=3D"folder=
Field" ng-model=3D"newFilter.expression">
+          <div class=3D"panel-group" id=3D"accordionFilters">
+
+            <div class=3D"panel panel-default" ng-repeat=3D"mailFolder in ma=
ilFolders">
+              <div class=3D"panel-heading">
+                <h4 class=3D"panel-title">
+                  <a data-toggle=3D"collapse" data-parent=3D"#accordionFilte=
rs" href=3D"#mailFilerAccordion{{$index}}">
+                    Filtre du dossier {{mailFolder.name}}
+                  </a>
+                </h4>
+              </div>
+              <div id=3D"mailFilerAccordion{{$index}}" class=3D"panel-collap=
se collapse">
+                <div class=3D"panel-body">
+                  <table class=3D"table table-hover table-bordered">
+                    <thead>
+                      <tr>
+                        <th>Filtre</th>
+                        <th>Dossier</th>
+                        <th/>
+                      </tr>
+                    </thead>
+                    <tbody ui-sortable=3D"sortableOptions" ng-model=3D"rootF=
olderMailFilters[mailFolder.topiaId]">
+                      <tr ng-repeat=3D"mailFilter in rootFolderMailFilters[m=
ailFolder.topiaId]">
+                        <td>{{mailFilter.expression}}</td>
+                        <td>{{mailFilter.mailFolder.$fullPath}}</td>
+                        <td><a class=3D"btn btn-danger btn-xs" ng-click=3D"r=
emoveFilter(mailFolder, mailFilter)">
+                            <span class=3D"glyphicon glyphicon-remove"></spa=
n>
+                          </a></td>
+                      </tr>
+                    </tbody>
+                  </table>
+                 =20
+                  <div role=3D"form">
+                    <div class=3D"form-group">
+                      <label for=3D"filterField">Filtre</label>
+                      <input type=3D"text" class=3D"form-control" id=3D"fold=
erField" ng-model=3D"newFilter.expression">
+                    </div>
+                    <div class=3D"form-group">
+                      <label for=3D"folderField">Dossier</label>
+                      <select class=3D"form-control" ng-model=3D"newFilter.m=
ailFolder" ng-options=3D"mailFolder.$fullPath for mailFolder in flatMailFolde=
rs[mailFolder.topiaId]"></select>
+                    </div>
                   </div>
-                  <div class=3D"form-group">
-                    <label for=3D"folderField">Dossier</label>
-                    <select class=3D"form-control" ng-model=3D"newFilter.mai=
lFolder" ng-options=3D"mailFolder.$fullPath for mailFolder in flatMailFolders=
[mailFolder.topiaId]"></select>
-                  </div>
+                  <button type=3D"button" class=3D"btn btn-success" ng-disab=
led=3D"!newFilter.expression || !newFilter.mailFolder" ng-click=3D"addNewFilt=
er(mailFolder)">
+                    <i class=3D"glyphicon glyphicon-plus"></i> Ajouter
+                  </button>
                 </div>
-                <button type=3D"button" class=3D"btn btn-success" ng-disable=
d=3D"!newFilter.expression || !newFilter.mailFolder" ng-click=3D"addNewFilter=
(mailFolder)">
-                  <i class=3D"glyphicon glyphicon-plus"></i> Ajouter
-                </button>
               </div>
             </div>
           </div>


--===============3433532770274202596==--