CRM-15832 - Update various modules to use crmResource

diff --git a/CRM/Case/Info.php b/CRM/Case/Info.php
index 324c7a75969955120ccd58b54315d054d18b0c13..9950a0b256215b6b95bd2e3e9782049999295e21 100644 (file)
--- a/CRM/Case/Info.php
+++ b/CRM/Case/Info.php
@@ -66,9 +66,7 @@ class CRM_Case_Info extends CRM_Core_Component_Info {
       'ext' => 'civicrm',
       'js' => array('js/angular-crmCaseType.js'),
       'css' => array('css/angular-crmCaseType.css'),
-      'partials' => array(
-        'partials/crmCaseType/*.html',
-      ),
+      'partials' => array('partials/crmCaseType'),
     );
 
     CRM_Core_Resources::singleton()->addSetting(array(

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index d9be4a2975e633095ca9cf2ed7320a5c09aeb239..9457998717b618cd46099f47c5de100101649c01 100644 (file)
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -66,12 +66,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
         'js/angular-crmMailing/*.js',
       ),
       'css' => array('css/angular-crmMailing.css'),
-      'partials' => array(
-        'partials/crmMailing/*.html',
-        'partials/crmMailing/dialog/*.html',
-        'partials/crmMailing/directive/*.html',
-        'partials/crmMailing/field/*.html',
-      ),
+      'partials' => array('partials/crmMailing'),
     );
     $result['crmMailingAB'] = array(
       'ext' => 'civicrm',
@@ -80,9 +75,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
         'js/angular-crmMailingAB/*.js',
       ),
       'css' => array('css/angular-crmMailingAB.css'),
-      'partials' => array(
-        'partials/crmMailingAB/*.html',
-      ),
+      'partials' => array('partials/crmMailingAB'),
     );
     $result['crmD3'] = array(
       'ext' => 'civicrm',

diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php
index 8466b937a178f744c3e87d7e8cef165a121565a8..4e1afd2b0a89fd9f4354aa9f158c640a455a0ee8 100644 (file)
--- a/Civi/Angular/Manager.php
+++ b/Civi/Angular/Manager.php
@@ -53,7 +53,7 @@ class Manager {
         'ext' => 'civicrm',
         'js' => array('js/angular-crmAttachment.js'),
         'css' => array('css/angular-crmAttachment.css'),
-        'partials' => array('partials/crmAttachment/*.html'),
+        'partials' => array('partials/crmAttachment'),
       );
       $angularModules['crmResource'] = array(
         'ext' => 'civicrm',
@@ -63,7 +63,7 @@ class Manager {
       $angularModules['crmUi'] = array(
         'ext' => 'civicrm',
         'js' => array('js/angular-crm-ui.js', 'packages/ckeditor/ckeditor.js'),
-        'partials' => array('partials/crmUi/*.html'),
+        'partials' => array('partials/crmUi'),
       );
       $angularModules['crmUtil'] = array(
         'ext' => 'civicrm',

diff --git a/js/angular-crm-ui.js b/js/angular-crm-ui.js
index 14e703a04a0642afe93b78db17fc42ecef55d7b1..f4920de93be7257c1dac2224e0a9dc44f0320e3f 100644 (file)
--- a/js/angular-crm-ui.js
+++ b/js/angular-crm-ui.js
@@ -4,7 +4,7 @@
   var uidCount = 0;
 
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls.civicrm + '/partials/crmUi/' + relPath;
+    return '~/crmUi/' + relPath;
   };
 
   angular.module('crmUi', [])

diff --git a/js/angular-crmAttachment.js b/js/angular-crmAttachment.js
index 815ae36b84c01b455458e3214f05af3dd05ebc51..a8082879f9b9e0699fe2d276b2ca5781f2c32388 100644 (file)
--- a/js/angular-crmAttachment.js
+++ b/js/angular-crmAttachment.js
@@ -1,7 +1,7 @@
 /// crmFile: Manage file attachments
 (function (angular, $, _) {
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls.civicrm + '/partials/crmAttachment/' + relPath;
+    return '~/crmAttachment/' + relPath;
   };
 
   angular.module('crmAttachment', ['angularFileUpload']);

diff --git a/js/angular-crmCaseType.js b/js/angular-crmCaseType.js
index f8ae9551485c1dc873472ecf6a9b5ea8111264ab..256b1ae6760b73406196ca047f0387658fc96c8e 100644 (file)
--- a/js/angular-crmCaseType.js
+++ b/js/angular-crmCaseType.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
 
   var partialUrl = function(relPath) {
-    return CRM.resourceUrls.civicrm + '/partials/crmCaseType/' + relPath;
+    return '~/crmCaseType/' + relPath;
   };
 
   var crmCaseType = angular.module('crmCaseType', ['ngRoute', 'ui.utils', 'crmUi', 'unsavedChanges', 'crmUtil']);

diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index dfeffb355597ee21ef24b6376b9901a889611b19..27e6f0eb6014ad365427e29f91ec1b92e947e644 100644 (file)
--- a/js/angular-crmMailing.js
+++ b/js/angular-crmMailing.js
@@ -1,6 +1,6 @@
 (function (angular, $, _) {
   var partialUrl = function partialUrl(relPath) {
-    return CRM.resourceUrls.civicrm + '/partials/crmMailing/' + relPath;
+    return '~/crmMailing/' + relPath;
   };
 
   angular.module('crmMailing', [

diff --git a/js/angular-crmMailing/directives.js b/js/angular-crmMailing/directives.js
index e88589d70ed16fcf6628a4f7e21c5bceb9439572..578da7caf6149b59de374013d75713db62a21507 100644 (file)
--- a/js/angular-crmMailing/directives.js
+++ b/js/angular-crmMailing/directives.js
@@ -1,6 +1,6 @@
 (function (angular, $, _) {
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls.civicrm + '/partials/crmMailing/' + relPath;
+    return '~/crmMailing/' + relPath;
   };
 
   // The following directives have the same simple implementation -- load

diff --git a/js/angular-crmMailing/services.js b/js/angular-crmMailing/services.js
index 65f1ad529779319eb8786ea043ce32fde4655ec9..5dbc803a1a574e9461eb5c95f6ab03da5de8d1ad 100644 (file)
--- a/js/angular-crmMailing/services.js
+++ b/js/angular-crmMailing/services.js
@@ -1,6 +1,6 @@
 (function (angular, $, _) {
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls.civicrm + '/partials/crmMailing/' + relPath;
+    return '~/crmMailing/' + relPath;
   };
 
   // The representation of from/reply-to addresses is inconsistent in the mailing data-model,

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 63715dad16f083f8ee40df4f8f807fcf0f6b5097..cb19d023bd3e251b9bd51acd1270338e17af76db 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -4,7 +4,7 @@
     if (!module) {
       module = 'crmMailingAB';
     }
-    return CRM.resourceUrls.civicrm + '/partials/' + module + '/' + relPath;
+    return '~/' + module + '/' + relPath;
   };
 
   angular.module('crmMailingAB', ['ngRoute', 'ui.utils', 'ngSanitize', 'crmUi', 'crmAttachment', 'crmMailing', 'crmD3']);

diff --git a/js/angular-crmMailingAB/directives.js b/js/angular-crmMailingAB/directives.js
index fb6ea8822193fc6d92d2c6b308d9cfd85c3c4cbb..49e5def2af4c4af11d3e89443e296f2b583bbcad 100644 (file)
--- a/js/angular-crmMailingAB/directives.js
+++ b/js/angular-crmMailingAB/directives.js
@@ -1,6 +1,6 @@
 (function (angular, $, _) {
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls.civicrm + '/partials/crmMailingAB/' + relPath;
+    return '~/crmMailingAB/' + relPath;
   };
 
   // example:

diff --git a/tools/extensions/org.civicrm.angularex/angularex.php b/tools/extensions/org.civicrm.angularex/angularex.php
index 63c9d6119dc3d0fcbf5bb8360f35358ab0ac1ac0..064f725453311ebd296e8522bb6429e9a882b109 100644 (file)
--- a/tools/extensions/org.civicrm.angularex/angularex.php
+++ b/tools/extensions/org.civicrm.angularex/angularex.php
@@ -115,5 +115,9 @@ function angularex_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  * @param $angularModule
  */
 function angularex_civicrm_angularModules(&$angularModule) {
-  $angularModule['example'] = array('ext' => 'org.civicrm.angularex', 'js' => array('js/example.js'));
+  $angularModule['example'] = array(
+    'ext' => 'org.civicrm.angularex',
+    'js' => array('js/*.js'),
+    'partials' => array('partials'),
+  );
 }

diff --git a/tools/extensions/org.civicrm.angularex/js/example.js b/tools/extensions/org.civicrm.angularex/js/example.js
index b607f842886588804bb3edc529916f61cf22368f..74ea0c88a45def827735774588d1268b316d79f4 100644 (file)
--- a/tools/extensions/org.civicrm.angularex/js/example.js
+++ b/tools/extensions/org.civicrm.angularex/js/example.js
@@ -1,12 +1,12 @@
 (function(angular, $, _) {
 
   var resourceUrl = CRM.resourceUrls['org.civicrm.angularex'];
-  var example = angular.module('example', ['ngRoute']);
+  var example = angular.module('example', ['ngRoute', 'crmResource']);
 
   example.config(['$routeProvider',
     function($routeProvider) {
       $routeProvider.when('/example', {
-        templateUrl: resourceUrl + '/partials/example.html',
+        templateUrl: '~/example/example.html',
         controller: 'ExampleCtrl'
       });
     }
@@ -14,6 +14,7 @@
 
   example.controller('ExampleCtrl', function($scope) {
     $scope.name = 'world';
+    $scope.ts = CRM.ts('org.civicrm.angularex');
   });
 
 })(angular, CRM.$, CRM._);
\ No newline at end of file

diff --git a/tools/extensions/org.civicrm.angularex/partials/example.html b/tools/extensions/org.civicrm.angularex/partials/example.html
index 606fa4cfcdcdb688c2c119baa44b0a46d8cef81f..93810f3f68219039969a27624092a5b58c329292 100644 (file)
--- a/tools/extensions/org.civicrm.angularex/partials/example.html
+++ b/tools/extensions/org.civicrm.angularex/partials/example.html
@@ -1,6 +1,6 @@
 <div>
-  Your Name: <input ng-model="name" type="text"/>
+  {{ts('Name')}}: <input ng-model="name" type="text"/>
 </div>
 <div>
-  Hello, {{ name }}!
+  {{ts('Hello, %1!', {1: name})}}
 </div>