refactor codes and applied comments

This commit is contained in:
Alexandre Cloutier
2014-10-21 14:44:48 -04:00
committed by Francis Lachapelle
parent c82143fd2e
commit 22faf5c285
9 changed files with 142 additions and 96 deletions

View File

@@ -67,32 +67,33 @@
<!-- modal for addressbook sharing options -->
<script type="text/ng-template" id="addressbookSharing.html">
<div id="modalACL">
<h2><var:string label:value="Sharing - "/>{{addressbook.name}}</h2>
<ul class="small-block-grid-2">
<h2><var:string label:value="Access rights - "/>{{addressbook.name}}</h2>
<ul>
<!-- left side -->
<li id="usersList">
<ul>
<li ng-repeat="user in users | orderBy:['userClass', 'displayName']" data-ng-click="selectUser(user)" data-ng-class="{_selected: user==selected}">
<li data-ng-repeat="user in users | orderBy:['userClass', 'displayName']" data-ng-click="selectUser(user)" data-ng-class="{_selected: user==selected}">
<span class="card-picture" data-ng-switch="user.userClass">
<i data-ng-switch-when="normal-user" class="icon-ion-ios7-person"><!-- normal-user --></i>
<i data-ng-switch-when="public-user" class="icon-ion-ios7-people"><!-- public-user --></i>
</span>
<span class="name">{{user.displayName}}</span>
<span class="subscriptionArea" data-ng-hide="user.userClass == 'public-user'">
<input type="checkbox" ng-model="user.isSubscribed" ng-checked="user.isSubscribed"
ng-disabled="!user.canSubscribeUser" ng-change="markUserAsDirty(user)" />
<input type="checkbox" data-ng-model="user.isSubscribed" data-ng-checked="user.isSubscribed"
data-ng-disabled="!user.canSubscribeUser" data-ng-change="markUserAsDirty(user)" />
<span><var:string label:value="Subscribe User"/></span>
</span>
</li>
</ul>
<form ng-submit="addUser(userToAdd)" class="addContactsToolbar">
<form data-ng-submit="addUser(userToAdd)" class="addContactsToolbar">
<table id="bottomTable">
<tr>
<td id="td_1"><i class="icon-ion-search"><!-- search --></i>
<input type="search" ng-model="userToAdd" label:placeholder="Add..." typeahead-wait-ms="1000"
typeahead="user as user.cn for user in User.$filter($viewValue) | filter:$viewValue" class="form-control" /></td>
<input type="search" data-ng-model="userToAdd" label:placeholder="email address" typeahead-wait-ms="500"
typeahead="user as user.cn for user in User.$filter($viewValue) | filter:$viewValue"
class="form-control" /></td>
<td id="td_2"><button type="submit" ><var:string label:value="Add User"/></button>
<button type="button" ng-disabled="userIsReadOnly()" data-ng-click="removeUser()"><var:string label:value="Remove User"/></button></td>
<button type="button" data-ng-disabled="userIsReadOnly()" data-ng-click="removeUser()"><var:string label:value="Remove User"/></button></td>
</tr>
</table>
</form>
@@ -105,23 +106,23 @@
<div class="calendarUserRights">
<ul>
<li data-ng-show="displayUserRights()">
<input type="checkbox" ng-checked="userSelected.aclOptions.canCreateObjects"
ng-model="userSelected.aclOptions.canCreateObjects" ng-change="markUserAsDirty()" />
<input type="checkbox" data-ng-checked="userSelected.aclOptions.canCreateObjects"
data-ng-model="userSelected.aclOptions.canCreateObjects" data-ng-change="markUserAsDirty()" />
<var:string label:value="This person can add cards to this addressbook."/></li>
<li data-ng-show="displayUserRights()" ng-model="displayUserRights">
<input type="checkbox" ng-checked="userSelected.aclOptions.canEditObjects"
ng-model="userSelected.aclOptions.canEditObjects" ng-change="markUserAsDirty()" />
<li data-ng-show="displayUserRights()" data-ng-model="displayUserRights">
<input type="checkbox" data-ng-checked="userSelected.aclOptions.canEditObjects"
ng-model="userSelected.aclOptions.canEditObjects" data-ng-change="markUserAsDirty()" />
<var:string label:value="This person can edit the cards of this addressbook."/></li>
<li data-ng-show="displayUserRights()" ng-model="displayUserRights">
<input type="checkbox" ng-checked="userSelected.aclOptions.canEraseObjects"
ng-model="userSelected.aclOptions.canEraseObjects" ng-change="markUserAsDirty()" />
<li data-ng-show="displayUserRights()" data-ng-model="displayUserRights">
<input type="checkbox" data-ng-checked="userSelected.aclOptions.canEraseObjects"
data-ng-model="userSelected.aclOptions.canEraseObjects" data-ng-change="markUserAsDirty()" />
<var:string label:value="This person can erase cards from this addressbook."/></li>
<li data-ng-hide="!userSelected.displayName">
<input type="checkbox" ng-checked="userSelected.aclOptions.canViewObjects"
ng-model="userSelected.aclOptions.canViewObjects" ng-change="markUserAsDirty()" />
<input type="checkbox" data-ng-checked="userSelected.aclOptions.canViewObjects"
data-ng-model="userSelected.aclOptions.canViewObjects" data-ng-change="markUserAsDirty()" />
<var:string label:value="This person can read the cards of this addressbook."/></li>
</ul>
</div>