(html) Review the toolbar of dialog boxes

This commit is contained in:
Francis Lachapelle
2015-08-03 14:44:11 -04:00
parent ab1cd36c77
commit ba6418fb93
3 changed files with 17 additions and 10 deletions

View File

@@ -15,7 +15,7 @@
<div class="pseudo-input-field sg-md-title"><var:string value="calendar.displayName"/></div>
</div>
<md-button class="md-icon-button" ng-click="close()">
<md-icon aria-label="Close dialog">close</md-icon>
<md-icon label:aria-label="Close">close</md-icon>
</md-button>
</div>
</md-toolbar>

View File

@@ -7,11 +7,16 @@
xmlns:label="OGo:label"
>
<md-dialog flex="50" flex-sm="100">
<md-toolbar class="sg-padded">
<md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
<div class="pseudo-input-container">
<label class="pseudo-input-label"><var:string label:value="Access Rights"/></label>
<div class="pseudo-input-field sg-md-title">{{acl.folder.name}}</div>
<md-toolbar>
<div class="md-toolbar-tools">
<md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
<div class="pseudo-input-container md-flex">
<label class="pseudo-input-label"><var:string label:value="Access Rights"/></label>
<div class="sg-md-title">{{acl.folder.name}}</div>
</div>
<md-button class="md-icon-button" ng-click="acl.closeModal()">
<md-icon aria-label="Close dialog">close</md-icon>
</md-button>
</div>
</md-toolbar>
<md-dialog-content>
@@ -69,6 +74,7 @@
md-items="user in acl.userFilter(acl.searchText)"
md-item-text="user.empty"
md-min-length="3"
md-delay="300"
md-no-cache="true"
label:md-floating-label="Add User">
<md-item-template>
@@ -82,8 +88,7 @@
</span>
</md-item-template>
</md-autocomplete>
<md-button ng-click="acl.closeModal()"><var:string label:value="Cancel"/></md-button>
<md-button class="md-primitive" ng-click="acl.saveModal()"><var:string label:value="Save"/></md-button>
<md-button ng-click="acl.saveModal()"><var:string label:value="Save"/></md-button>
</div>
</md-dialog>

View File

@@ -71,8 +71,10 @@
}
function selectUser(user) {
// Check if it is a different user
if (vm.selectedUser != user) {
if (vm.selectedUser == user) {
vm.selectedUser = null;
}
else {
vm.selectedUser = user;
vm.selectedUser.$rights();
}