From ad7abea28f5ba077971be9e8e4b40b1caada2a35 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 16 Jan 2015 03:16:07 -0800 Subject: [PATCH] CRM-15832 - Update various modules to use crmResource --- CRM/Case/Info.php | 4 +--- CRM/Mailing/Info.php | 11 ++--------- Civi/Angular/Manager.php | 4 ++-- js/angular-crm-ui.js | 2 +- js/angular-crmAttachment.js | 2 +- js/angular-crmCaseType.js | 2 +- js/angular-crmMailing.js | 2 +- js/angular-crmMailing/directives.js | 2 +- js/angular-crmMailing/services.js | 2 +- js/angular-crmMailingAB.js | 2 +- js/angular-crmMailingAB/directives.js | 2 +- tools/extensions/org.civicrm.angularex/angularex.php | 6 +++++- tools/extensions/org.civicrm.angularex/js/example.js | 5 +++-- .../org.civicrm.angularex/partials/example.html | 4 ++-- 14 files changed, 23 insertions(+), 27 deletions(-) diff --git a/CRM/Case/Info.php b/CRM/Case/Info.php index 324c7a7596..9950a0b256 100644 --- 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 d9be4a2975..9457998717 100644 --- 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 8466b937a1..4e1afd2b0a 100644 --- 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 14e703a04a..f4920de93b 100644 --- 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 815ae36b84..a8082879f9 100644 --- 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 f8ae955148..256b1ae676 100644 --- 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 dfeffb3555..27e6f0eb60 100644 --- 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 e88589d70e..578da7caf6 100644 --- 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 65f1ad5297..5dbc803a1a 100644 --- 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 63715dad16..cb19d023bd 100644 --- 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 fb6ea88221..49e5def2af 100644 --- 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 63c9d6119d..064f725453 100644 --- 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 b607f84288..74ea0c88a4 100644 --- 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 606fa4cfcd..93810f3f68 100644 --- a/tools/extensions/org.civicrm.angularex/partials/example.html +++ b/tools/extensions/org.civicrm.angularex/partials/example.html @@ -1,6 +1,6 @@
- Your Name: + {{ts('Name')}}:
- Hello, {{ name }}! + {{ts('Hello, %1!', {1: name})}}
-- 2.25.1