Author: echatellier Date: 2014-06-27 17:23:36 +0200 (Fri, 27 Jun 2014) New Revision: 280 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/280 Log: Fix tooltip Add doc Fix rigths 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-27 15:02:46 UTC (rev 279) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-27 15:23:36 UTC (rev 280) @@ -124,6 +124,7 @@ <div class="form-group"> <label for="openAttachmentCommandField">Ouverture :</label> <input id="openAttachmentCommandField" type="text" class="form-control" ng-model="extensionCommand.openAttachmentCommand" placeholder="" /> + <p class="help-block">Utilisez <code>%f</code> pour representer le fichier en entrée de la commande</p> </div> </td> </tr> @@ -229,12 +230,14 @@ <a class="btn btn-success btn-xs" data-nodrag ng-click="toggle(this)" ng-disabled="!mailFolder.children || mailFolder.children.length == 0"> <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> - <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}} <span class="badge">{{mailFolder.$cumulativeCount}}</span></a> + <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}}</a> <a class="pull-right btn btn-info btn-xs" data-nodrag ng-click="newArchiveSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.hasArchiveFolder && !mailFolder.archiveFolder" tooltip="Créer un dossier d'archive"><span class="glyphicon glyphicon-plus"></span></a> - <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder"><span class="glyphicon glyphicon-plus"></span></a> - <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0" - tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes !'|| 'Supprimer ce dossier'}}"> - <span class="glyphicon glyphicon-remove"></span></a> + <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder" tooltip="Créer un sous-dossier"><span class="glyphicon glyphicon-plus"></span></a> + <span class="pull-right" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes et ne peut pas être supprimé !'|| 'Supprimer ce dossier'}}"> + <a class="btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </span> </div> <ol ui-tree-nodes="options" ng-model="mailFolder.children" ng-class="{hidden: !collapsed}"> <li ng-repeat="mailFolder in mailFolder.children" ui-tree-node ng-include="'nodes_renderer.html'"> @@ -718,7 +721,7 @@ <label><input type="checkbox" ng-model="readRightGroup" ng-checked="selectedMailFolder.readRightGroups.containsByTopiaId(group)" - ng-disabled="parentScopeValues.readRightGroups.containsByTopiaId(group)" + ng-disabled="parentScopeValues.readRightGroups.containsByTopiaId(group) || selectedMailFolder.writeRightGroups.containsByTopiaId(user)" ng-change="changeReadRightGroup(group)"> Lecture</label> <label><input type="checkbox" ng-model="writeRightGroup"