From b8ad85b2e2cc7ad44f6f87d2641bf62274035f9c Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 21 Jan 2015 16:40:26 -0500
Subject: [PATCH] Rename ng-templates to match names of .wox files

---
 UI/Common/UIxUserRightsEditor.m               |   2 +-
 UI/Common/product.plist                       |   3 +-
 UI/Contacts/product.plist                     |   9 +-
 UI/MailerUI/product.plist                     |  10 +-
 .../ContactsUI/UIxContactFoldersView.wox      |  49 +--------
 .../UIxContactsUserRightsEditor.wox           | 101 +++++++++---------
 UI/Templates/MailerUI/UIxMailMainFrame.wox    |   6 +-
 UI/Templates/UIxAclEditor.wox                 |   8 +-
 UI/WebServerResources/js/ContactsUI.js        |  10 +-
 UI/WebServerResources/js/MailerUI.js          |  12 +--
 10 files changed, 90 insertions(+), 120 deletions(-)

diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m
index 2452c8c69..e4c07e5f6 100644
--- a/UI/Common/UIxUserRightsEditor.m
+++ b/UI/Common/UIxUserRightsEditor.m
@@ -183,7 +183,7 @@
   return response;
 }
 
-- (id <WOActionResults>) defaultAction
+- (id <WOActionResults>) userRightsAction
 {
   id <WOActionResults> response;
   NSDictionary *jsonResponse;
diff --git a/UI/Common/product.plist b/UI/Common/product.plist
index 3384fd081..ff78c1f53 100644
--- a/UI/Common/product.plist
+++ b/UI/Common/product.plist
@@ -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";
         };
diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist
index 5b30b53ed..f845e044d 100644
--- a/UI/Contacts/product.plist
+++ b/UI/Contacts/product.plist
@@ -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";
diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index 23cbebe71..a43d234c0 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -337,11 +337,11 @@
           protectedBy = "View";
           pageName    = "UIxMailSearch";
         };
-        viewerTemplate = {
-          protectedBy = "View";
-          pageName    = "UIxMailViewTemplate";
-        };
-        editorTemplate = {
+        // viewerTemplate = {
+        //   protectedBy = "View";
+        //   pageName    = "UIxMailViewTemplate";
+        // };
+        UIxMailEditor = {
           protectedBy = "View";
           pageName    = "UIxMailEditor";
         };
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 3f9cd06d6..474e2a536 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -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>
 
diff --git a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
index 0952888f4..21b21e9cf 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
@@ -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>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 8cff7b592..1b1901e9d 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -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>
 
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 918bf7ec4..ab713eabc 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -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>
diff --git a/UI/WebServerResources/js/ContactsUI.js b/UI/WebServerResources/js/ContactsUI.js
index d71a9ef26..4e46495ce 100644
--- a/UI/WebServerResources/js/ContactsUI.js
+++ b/UI/WebServerResources/js/ContactsUI.js
@@ -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();
diff --git a/UI/WebServerResources/js/MailerUI.js b/UI/WebServerResources/js/MailerUI.js
index 1189e2ade..d84ddb385 100644
--- a/UI/WebServerResources/js/MailerUI.js
+++ b/UI/WebServerResources/js/MailerUI.js
@@ -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'
             }
           },