X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FInfo.php;h=9457998717b618cd46099f47c5de100101649c01;hb=ad7abea28f5ba077971be9e8e4b40b1caada2a35;hp=e29cd28d4cea16104be80d28411ec9fa431dedc2;hpb=ed82d450f431beeadce77ff828ac479855b50f03;p=civicrm-core.git

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index e29cd28d4c..9457998717 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -37,12 +37,14 @@
  */
 class CRM_Mailing_Info extends CRM_Core_Component_Info {
 
-  // docs inherited from interface
+  /**
+   * @inheritDoc
+   */
   protected $keyword = 'mailing';
 
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return array
    */
   public function getInfo() {
@@ -59,17 +61,28 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     $result = array();
     $result['crmMailing'] = array(
       'ext' => 'civicrm',
-      'js' => array('js/angular-crmMailing.js', 'js/angular-crmMailing/services.js', 'js/angular-crmMailing/directives.js'),
+      'js' => array(
+        'js/angular-crmMailing.js',
+        'js/angular-crmMailing/*.js',
+      ),
       'css' => array('css/angular-crmMailing.css'),
+      'partials' => array('partials/crmMailing'),
     );
     $result['crmMailingAB'] = array(
       'ext' => 'civicrm',
-      'js' => array('js/angular-crmMailingAB.js', 'js/angular-crmMailingAB/services.js', 'js/angular-crmMailingAB/directives.js'),
+      'js' => array(
+        'js/angular-crmMailingAB.js',
+        'js/angular-crmMailingAB/*.js',
+      ),
       'css' => array('css/angular-crmMailingAB.css'),
+      'partials' => array('partials/crmMailingAB'),
     );
     $result['crmD3'] = array(
       'ext' => 'civicrm',
-      'js' => array('js/angular-crmD3.js', 'bower_components/d3/d3.min.js'),
+      'js' => array(
+        'js/angular-crmD3.js',
+        'bower_components/d3/d3.min.js',
+      ),
     );
 
     $config = CRM_Core_Config::singleton();
@@ -100,7 +113,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
         'contact_id' => $contactID,
       ));
       $mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
-      'sequential' => 1,
+        'sequential' => 1,
         'return' => array("msg_html", "id", "msg_title", "msg_subject", "msg_text"),
         'workflow_id' => array('IS NULL' => ""),
       ));
@@ -127,10 +140,13 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
         'contactid' => $contactID,
         'enableReplyTo' => isset($config->replyTo) ? $config->replyTo : 0,
         'fromAddress' => array_values($fromAddress['values'][0]['api.OptionValue.get']['values']),
-        'defaultTestEmail' => civicrm_api3('Contact', 'getvalue', array('id' => 'user_contact_id', 'return' => 'email')),
+        'defaultTestEmail' => civicrm_api3('Contact', 'getvalue', array(
+            'id' => 'user_contact_id',
+            'return' => 'email',
+          )),
         'visibility' => array(
-            array('value' => 'Public Pages', 'label' => ts('Public Pages')),
-            array('value' => 'User and User Admin Only', 'label' => ts('User and User Admin Only')),
+          array('value' => 'Public Pages', 'label' => ts('Public Pages')),
+          array('value' => 'User and User Admin Only', 'label' => ts('User and User Admin Only')),
         ),
       ),
     ));
@@ -166,8 +182,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     ) ? TRUE : FALSE;
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @param bool $getAllUnconditionally
    *
    * @return array
@@ -190,8 +206,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
   }
 
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return null
    */
   public function getUserDashboardElement() {
@@ -207,8 +223,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     return NULL;
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return array
    */
   public function registerTab() {
@@ -220,27 +236,27 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     );
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return array
    */
   public function registerAdvancedSearchPane() {
     return array(
-    'title' => ts('Mailings'),
+      'title' => ts('Mailings'),
       'weight' => 20,
     );
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return null
    */
   public function getActivityTypes() {
     return NULL;
   }
 
-  // add shortcut to Create New
   /**
+   * add shortcut to Create New
    * @param $shortCuts
    */
   public function creatNewShortcut(&$shortCuts) {