amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-22 13:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Rename ng-templates to match names of .wox files

Browse Source
This commit is contained in:
Francis Lachapelle
2015-01-21 16:40:26 -05:00
parent 50b45678e3
commit b8ad85b2e2
10 changed files with 90 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UI/Common/UIxUserRightsEditor.m
View File

@@ -183,7 +183,7 @@
return response;
}
- (id <WOActionResults>) defaultAction
- (id <WOActionResults>) userRightsAction
{
id <WOActionResults> response;
NSDictionary *jsonResponse;

3
UI/Common/product.plist
View File

@@ -53,6 +53,7 @@
userRights = {
protectedBy = "ReadAcls";
pageName = "UIxUserRightsEditor";
actionName = "userRights";
};
saveUserRights = {
protectedBy = "Change Permissions";
@@ -64,7 +65,7 @@
pageName = "UIxAclEditor";
actionName = "acls";
};
aclsTemplate = {
UIxAclEditor = {
protectedBy = "ReadAcls";
pageName = "UIxAclEditor";
};

9
UI/Contacts/product.plist
View File

@@ -47,11 +47,11 @@
pageName = "UIxContactFoldersView";
actionName = "checkRights";
};
contactEditorTemplate = {
UIxContactEditorTemplate = {
protectedBy = "View";
pageName = "UIxContactEditorTemplate";
};
userFoldersTemplate = {
UIxContactsUserFolders = {
protectedBy = "View";
pageName = "UIxContactsUserFolders";
};
@@ -118,9 +118,14 @@
actionClass = "UIxContactFolderActions";
actionName = "import";
};
UIxContactsUserRightsEditor = {
protectedBy = "ReadAcls";
pageName = "UIxContactsUserRightsEditor";
};
userRights = {
protectedBy = "ReadAcls";
pageName = "UIxContactsUserRightsEditor";
actionName = "userRights";
};
saveUserRights = {
protectedBy = "Change Permissions";

10
UI/MailerUI/product.plist
View File

@@ -337,11 +337,11 @@
protectedBy = "View";
pageName = "UIxMailSearch";
};
viewerTemplate = {
protectedBy = "View";
pageName = "UIxMailViewTemplate";
};
editorTemplate = {
// viewerTemplate = {
// protectedBy = "View";
// pageName = "UIxMailViewTemplate";
// };
UIxMailEditor = {
protectedBy = "View";
pageName = "UIxMailEditor";
};

49
UI/Templates/ContactsUI/UIxContactFoldersView.wox
View File

@@ -65,50 +65,11 @@
<div data-ui-view="addressbooks" layout="row" class="view"><!-- addressbooks list --></div>
<!-- modal for addressbook sharing options -->
<script type="text/ng-template" id="userRights.html">
<div class="addressbookUserRights">
<ul>
<li>
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canViewObjects"
data-ng-model="selectedUser.rights.canViewObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can read the cards of this addressbook."/>
</label>
</li>
<li data-ng-hide="selectedUser.$isAnonymous()">
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canCreateObjects"
data-ng-model="selectedUser.rights.canCreateObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can add cards to this addressbook."/>
</label>
</li>
<li data-ng-hide="selectedUser.$isAnonymous()">
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canEditObjects"
data-ng-model="selectedUser.rights.canEditObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can edit the cards of this addressbook."/>
</label>
</li>
<li data-ng-hide="selectedUser.$isAnonymous()">
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canEraseObjects"
data-ng-model="selectedUser.rights.canEraseObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can erase cards from this addressbook."/>
</label>
</li>
</ul>
</div>
<script type="text/ng-template" id="UIxUserRightsEditor">
<var:component className="UIxContactsUserRightsEditor"/>
</script>
<script type="text/ng-template" id="addressbooks.html">
<script type="text/ng-template" id="UIxContactFoldersView">
<!-- dropdown menu for addressbook options button -->
<div id="addressbookProperties" class="f-dropdown icons-dropdown">
@@ -279,9 +240,9 @@
</md-content>
</main>
</script><!-- addressbooks.html -->
</script><!-- UIxContactFoldersView -->
<script type="text/ng-template" id="card.html">
<script type="text/ng-template" id="UIxContactViewTemplate">
<var:component className="UIxContactViewTemplate"/>
</script>

101
UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
View File

@@ -1,52 +1,49 @@
<?xml version="1.0" standalone="yes"?>
<!DOCTYPE var:component>
<var:component xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:uix="OGo:uix"
xmlns:label="OGo:label"
xmlns:rsrc="OGo:url"
className="UIxPageFrame"
title="title"
const:toolbar="none"
const:popup="YES">
<form id="userRightsForm" const:href="saveUserRights">
<input id="uid" type="hidden" name="uid" var:value="uid"/>
<div class="title">
<label><var:string label:value="Access rights to"/><br/>
<span id="folderName" class="value"><var:string value="folderName"/></span></label>
<label><var:string label:value="For user"/><br/>
<span class="value"><var:string value="userDisplayName"/></span></label>
</div>
<div class="calendarUserRights">
<var:if condition="userIsAnonymousUser" const:negate="YES"
><label><input type="checkbox" class="checkBox"
const:name="ObjectCreator"
var:checked="userCanCreateObjects"/><var:string
label:value="This person can add cards to this addressbook."/></label>
<br/></var:if>
<label><input type="checkbox" class="checkBox"
const:name="ObjectViewer"
var:checked="userCanViewObjects"/><var:string
label:value="This person can read the cards of this addressbook."/></label>
<br/>
<var:if condition="userIsAnonymousUser" const:negate="YES"
><label><input type="checkbox" class="checkBox"
const:name="ObjectEditor"
var:checked="userCanEditObjects"/><var:string
label:value="This person can edit the cards of this addressbook."/></label>
<br/>
<label><input type="checkbox" class="checkBox"
const:name="ObjectEraser"
var:checked="userCanEraseObjects"/><var:string
label:value="This person can erase cards from this addressbook."/></label></var:if>
</div>
<div class="buttons">
<a href="#" const:name="updateButton" id="updateButton"
class="button actionButton">
<span><var:string label:value="Update" /></span></a>
<a href="#" const:name="cancelButton" id="cancelButton" class="button">
<span><var:string label:value="Cancel" /></span></a>
</div>
</form>
</var:component>
<?xml version='1.0' standalone='yes'?>
<container
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label"
xmlns:uix="OGo:uix">
<div class="addressbookUserRights">
<ul>
<li>
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canViewObjects"
data-ng-model="selectedUser.rights.canViewObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can read the cards of this addressbook."/>
</label>
</li>
<li data-ng-hide="selectedUser.$isAnonymous()">
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canCreateObjects"
data-ng-model="selectedUser.rights.canCreateObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can add cards to this addressbook."/>
</label>
</li>
<li data-ng-hide="selectedUser.$isAnonymous()">
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canEditObjects"
data-ng-model="selectedUser.rights.canEditObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can edit the cards of this addressbook."/>
</label>
</li>
<li data-ng-hide="selectedUser.$isAnonymous()">
<label>
<input type="checkbox"
data-ng-checked="selectedUser.rights.canEraseObjects"
data-ng-model="selectedUser.rights.canEraseObjects"
data-ng-change="confirmChange(selectedUser)" />
<var:string label:value="This person can erase cards from this addressbook."/>
</label>
</li>
</ul>
</div>
</container>

6
UI/Templates/MailerUI/UIxMailMainFrame.wox
View File

@@ -216,7 +216,7 @@
<!--FIXME : repport in-line styling in style definitions -->
<div class="view" ui-view="mailboxes" layout="row"><!-- mailboxes list --></div>
<script type="text/ng-template" id="mailboxes.html">
<script type="text/ng-template" id="UIxMailMainFrame">
<!-- dropdown menu for mailbox options button -->
<div id="folderProperties" class="f-dropdown icons-dropdown" data-dropdown-content="dropdown-content">
@@ -286,11 +286,11 @@
</main>
</script>
<script type="text/ng-template" id="mailbox.html">
<script type="text/ng-template" id="UIxMailFolderTemplate">
<var:component className="UIxMailFolderTemplate"/>
</script>
<script type="text/ng-template" id="message.html">
<script type="text/ng-template" id="UIxMailViewTemplate">
<var:component className="UIxMailViewTemplate"/>
</script>

8
UI/Templates/UIxAclEditor.wox
View File

@@ -56,7 +56,13 @@
<!-- right side -->
<li id="AccessRightList" data-ng-show="selectedUser">
<h1>{{selectedUser.$shortFormat({email: false})}}</h1>
<div data-ng-include="'userRights.html'"><!-- load template from main wox --></div>
<div data-ng-include="'UIxUserRightsEditor'">
<!--
Load ng-template #UIxUserRightsEditor from main module wox. Inner wox templates are:
- UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
- UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
- UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
--></div>
</li>
</ul>
</div>

10
UI/WebServerResources/js/ContactsUI.js
View File

@@ -25,7 +25,7 @@
url: '/:addressbookId',
views: {
addressbooks: {
templateUrl: 'addressbooks.html',
templateUrl: 'UIxContactFoldersView', // UI/Templates/Contacts/UIxContactFoldersView.wox
controller: 'AddressBookCtrl'
}
},
@@ -42,7 +42,7 @@
url: '/:contactType/new',
views: {
card: {
templateUrl: 'contactEditorTemplate', // UI/Templates/Contacts/UIxContactEditorTemplate.wox
templateUrl: 'UIxContactEditorTemplate', // UI/Templates/Contacts/UIxContactEditorTemplate.wox
controller: 'CardCtrl'
}
},
@@ -70,12 +70,12 @@
})
.state('addressbook.card.view', {
url: '/view',
templateUrl: 'card.html',
templateUrl: 'UIxContactViewTemplate', // UI/Templates/Contacts/UIxContactViewTemplate.wox
controller: 'CardCtrl'
})
.state('addressbook.card.editor', {
url: '/edit',
templateUrl: 'contactEditorTemplate', // UI/Templates/Contacts/UIxContactEditorTemplate.wox
templateUrl: 'UIxContactEditorTemplate', // UI/Templates/Contacts/UIxContactEditorTemplate.wox
controller: 'CardCtrl'
});
@@ -188,7 +188,7 @@
};
$scope.share = function() {
var modal = $modal.open({
templateUrl: stateAddressbook.id + '/aclsTemplate', // UI/Templates/UIxAclEditor.wox
templateUrl: stateAddressbook.id + '/UIxAclEditor', // UI/Templates/UIxAclEditor.wox
resolve: {
modalUsers: function() {
return stateAddressbook.$acl.$users();

12
UI/WebServerResources/js/MailerUI.js
View File

@@ -26,7 +26,7 @@
url: '/Mail',
views: {
mailboxes: {
templateUrl: 'mailboxes.html',
templateUrl: 'UIxMailMainFrame', // UI/Templates/MailerUI/UIxMailMainFrame.wox
controller: 'MailboxesCtrl'
}
},
@@ -65,7 +65,7 @@
url: '/:mailboxId',
views: {
'mailbox@mail': {
templateUrl: 'mailbox.html',
templateUrl: 'UIxMailFolderTemplate', // UI/Templates/MailerUI/UIxMailFolderTemplate.wox
controller: 'MailboxCtrl'
}
},
@@ -97,7 +97,7 @@
url: '/:messageId',
views: {
message: {
templateUrl: 'message.html',
templateUrl: 'UIxMailViewTemplate', // UI/Templates/MailerUI/UIxMailViewTemplate.wox
controller: 'MessageCtrl'
}
},
@@ -119,7 +119,7 @@
url: '/edit',
views: {
'mailbox@mail': {
templateUrl: 'editorTemplate', // UI/Templates/MailerUI/UIxMailEditor.wox
templateUrl: 'UIxMailEditor', // UI/Templates/MailerUI/UIxMailEditor.wox
controller: 'MessageEditorCtrl'
}
},
@@ -133,7 +133,7 @@
url: '/{actionName:(?:reply|replyall|forward)}',
views: {
'mailbox@mail': {
templateUrl: 'editorTemplate', // UI/Templates/MailerUI/UIxMailEditor.wox
templateUrl: 'UIxMailEditor', // UI/Templates/MailerUI/UIxMailEditor.wox
controller: 'MessageEditorCtrl'
}
}
@@ -142,7 +142,7 @@
url: '/new',
views: {
mailbox: {
templateUrl: 'editorTemplate', // UI/Templates/MailerUI/UIxMailEditor.wox
templateUrl: 'UIxMailEditor', // UI/Templates/MailerUI/UIxMailEditor.wox
controller: 'MessageEditorCtrl'
}
},