CiviMail - Change tabs to spaces. Whitespace.
authorTim Otten <totten@civicrm.org>
Wed, 29 Oct 2014 00:16:29 +0000 (17:16 -0700)
committerTim Otten <totten@civicrm.org>
Wed, 29 Oct 2014 01:15:48 +0000 (18:15 -0700)
22 files changed:
CRM/Mailing/BAO/Mailing.php
api/v3/Mailing.php
api/v3/MailingGroup.php
api/v3/MailingRecipients.php
js/angular-Mailing.js
js/angular-crmMailingAB.js
partials/crmMailing/attachments.html
partials/crmMailing/composeonScreen.html
partials/crmMailing/content.html
partials/crmMailing/headerandFooter.html
partials/crmMailing/ht.html
partials/crmMailing/mailingGroup.html
partials/crmMailing/main.html
partials/crmMailing/plainText.html
partials/crmMailing/previewMailing.html
partials/crmMailing/preview_ht.html
partials/crmMailing/preview_plaintext.html
partials/crmMailing/sched.html
partials/crmMailing/send.html
partials/crmMailing/test.html
partials/crmMailing/trackandRespond.html
partials/crmMailing/uploadContent.html

index dd8679f0515eb11a55f02d3ec9f990919c1be0ed..7785ec4284ea30b78dffe38b5c57b1ebd5cf1bc2 100644 (file)
@@ -1633,7 +1633,7 @@ ORDER BY   civicrm_email.is_bulkmail DESC
       $mg->search_args  = $params['search_args'];
       $mg->group_type   = 'Include';
       $mg->save();
-               }
+    }
 
     // check and attach and files as needed
     CRM_Core_BAO_File::processAttachment($params, 'civicrm_mailing', $mailing->id);
@@ -1658,8 +1658,8 @@ ORDER BY   civicrm_email.is_bulkmail DESC
       // Populate the recipients.
       $mailing->getRecipients($job->id, $mailing->id, NULL, NULL, TRUE, FALSE);
     }
-               //print_r($params);
-               //exit;
+    //print_r($params);
+    //exit;
     return $mailing;
   }
 
index b653d154a404b7361df595ecbeb8caef890b2e3f..720da93588c399d81a3b708f113c1f5c8bcd9980 100755 (executable)
  * @return array API Success Array
  */
 function civicrm_api3_mailing_create($params, $ids = array()) {
-       return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
 
 function civicrm_api3_mailing_get_token($params) {
-       if (!array_key_exists("usage", $params)) {
-               throw new API_Exception('Mandatory keys missing from params array: entity');
-       }
-
-       $tokens = CRM_Core_SelectValues::contactTokens();
-       switch ($params['usage']) {
-               case 'Mailing' :
-                       $tokens = array_merge(CRM_Core_SelectValues::mailingTokens(), $tokens);
-                       break;
-               case 'ScheduleEventReminder' :
-                       $tokens = array_merge(CRM_Core_SelectValues::activityTokens(), $tokens);
-                       $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens);
-                       $tokens = array_merge(CRM_Core_SelectValues::membershipTokens(), $tokens);
-                       break;
-               case 'ManageEventScheduleReminder' :
-                       $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens);
-                       break;
-       }
-
-       return CRM_Utils_Token::formatTokensForDisplay($tokens);
-
-}
+  if (!array_key_exists("usage", $params)) {
+    throw new API_Exception('Mandatory keys missing from params array: entity');
+  }
 
+  $tokens = CRM_Core_SelectValues::contactTokens();
+  switch ($params['usage']) {
+    case 'Mailing' :
+      $tokens = array_merge(CRM_Core_SelectValues::mailingTokens(), $tokens);
+      break;
+    case 'ScheduleEventReminder' :
+      $tokens = array_merge(CRM_Core_SelectValues::activityTokens(), $tokens);
+      $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens);
+      $tokens = array_merge(CRM_Core_SelectValues::membershipTokens(), $tokens);
+      break;
+    case 'ManageEventScheduleReminder' :
+      $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens);
+      break;
+  }
 
+  return CRM_Utils_Token::formatTokensForDisplay($tokens);
+}
 
 /**
  * Adjust Metadata for Create action
@@ -104,7 +101,7 @@ function _civicrm_api3_mailing_create_spec(&$params) {
  * @return array API Success Array
  */
 function civicrm_api3_mailing_delete($params, $ids = array()) {
-       return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
 
 
@@ -115,7 +112,7 @@ function civicrm_api3_mailing_delete($params, $ids = array()) {
  * @return array
  */
 function civicrm_api3_mailing_get($params) {
-       return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
 
 /**
@@ -127,19 +124,18 @@ function civicrm_api3_mailing_get($params) {
  * @return array
  */
 function civicrm_api3_mailing_event_bounce($params) {
+  $body = $params['body'];
+  unset($params['body']);
 
-       $body = $params['body'];
-       unset($params['body']);
-
-       $params += CRM_Mailing_BAO_BouncePattern::match($body);
+  $params += CRM_Mailing_BAO_BouncePattern::match($body);
 
-       if (CRM_Mailing_Event_BAO_Bounce::create($params)) {
-               return civicrm_api3_create_success($params);
-       }
-       else {
-               throw new API_Exception(ts('Queue event could not be found'),'no_queue_event
+  if (CRM_Mailing_Event_BAO_Bounce::create($params)) {
+    return civicrm_api3_create_success($params);
+  }
+  else {
+    throw new API_Exception(ts('Queue event could not be found'),'no_queue_event
       ');
-       }
+  }
 }
 
 /**
@@ -168,7 +164,7 @@ function _civicrm_api3_mailing_event_bounce_spec(&$params) {
  * @return array
  */
 function civicrm_api3_mailing_event_confirm($params) {
-       return civicrm_api('mailing_event_confirm', 'create', $params);
+  return civicrm_api('mailing_event_confirm', 'create', $params);
 }
 
 /**
@@ -187,23 +183,23 @@ function _civicrm_api3_mailing_deprecation() {
  * @return array
  */
 function civicrm_api3_mailing_event_reply($params) {
-       $job       = $params['job_id'];
-       $queue     = $params['event_queue_id'];
-       $hash      = $params['hash'];
-       $replyto   = $params['replyTo'];
-       $bodyTxt   = CRM_Utils_Array::value('bodyTxt', $params);
-       $bodyHTML  = CRM_Utils_Array::value('bodyHTML', $params);
-       $fullEmail = CRM_Utils_Array::value('fullEmail', $params);
-
-       $mailing = CRM_Mailing_Event_BAO_Reply::reply($job, $queue, $hash, $replyto);
-
-       if (empty($mailing)) {
-               return civicrm_api3_create_error('Queue event could not be found');
-       }
+  $job       = $params['job_id'];
+  $queue     = $params['event_queue_id'];
+  $hash      = $params['hash'];
+  $replyto   = $params['replyTo'];
+  $bodyTxt   = CRM_Utils_Array::value('bodyTxt', $params);
+  $bodyHTML  = CRM_Utils_Array::value('bodyHTML', $params);
+  $fullEmail = CRM_Utils_Array::value('fullEmail', $params);
+
+  $mailing = CRM_Mailing_Event_BAO_Reply::reply($job, $queue, $hash, $replyto);
+
+  if (empty($mailing)) {
+    return civicrm_api3_create_error('Queue event could not be found');
+  }
 
-       CRM_Mailing_Event_BAO_Reply::send($queue, $mailing, $bodyTxt, $replyto, $bodyHTML, $fullEmail);
+  CRM_Mailing_Event_BAO_Reply::send($queue, $mailing, $bodyTxt, $replyto, $bodyHTML, $fullEmail);
 
-       return civicrm_api3_create_success($params);
+  return civicrm_api3_create_success($params);
 }
 
 /**
@@ -231,20 +227,20 @@ function _civicrm_api3_mailing_event_reply_spec(&$params) {
  * @return array
  */
 function civicrm_api3_mailing_event_forward($params) {
-       $job       = $params['job_id'];
-       $queue     = $params['event_queue_id'];
-       $hash      = $params['hash'];
-       $email     = $params['email'];
-       $fromEmail = CRM_Utils_Array::value('fromEmail', $params);
-       $params    = CRM_Utils_Array::value('params', $params);
+  $job       = $params['job_id'];
+  $queue     = $params['event_queue_id'];
+  $hash      = $params['hash'];
+  $email     = $params['email'];
+  $fromEmail = CRM_Utils_Array::value('fromEmail', $params);
+  $params    = CRM_Utils_Array::value('params', $params);
 
-       $forward = CRM_Mailing_Event_BAO_Forward::forward($job, $queue, $hash, $email, $fromEmail, $params);
+  $forward = CRM_Mailing_Event_BAO_Forward::forward($job, $queue, $hash, $email, $fromEmail, $params);
 
-       if ($forward) {
-               return civicrm_api3_create_success($params);
-       }
+  if ($forward) {
+    return civicrm_api3_create_success($params);
+  }
 
-       return civicrm_api3_create_error('Queue event could not be found');
+  return civicrm_api3_create_error('Queue event could not be found');
 }
 
 /**
@@ -272,23 +268,22 @@ function _civicrm_api3_mailing_event_forward_spec(&$params) {
  * @return array
  */
 function civicrm_api3_mailing_event_click($params) {
+  civicrm_api3_verify_mandatory($params,
+    'CRM_Mailing_Event_DAO_TrackableURLOpen',
+    array('event_queue_id', 'url_id'),
+    FALSE
+  );
 
-       civicrm_api3_verify_mandatory($params,
-               'CRM_Mailing_Event_DAO_TrackableURLOpen',
-               array('event_queue_id', 'url_id'),
-               FALSE
-       );
-
-       $url_id = $params['url_id'];
-       $queue = $params['event_queue_id'];
+  $url_id = $params['url_id'];
+  $queue = $params['event_queue_id'];
 
-       $url = CRM_Mailing_Event_BAO_TrackableURLOpen::track($queue, $url_id);
+  $url = CRM_Mailing_Event_BAO_TrackableURLOpen::track($queue, $url_id);
 
-       $values             = array();
-       $values['url']      = $url;
-       $values['is_error'] = 0;
+  $values             = array();
+  $values['url']      = $url;
+  $values['is_error'] = 0;
 
-       return civicrm_api3_create_success($values);
+  return civicrm_api3_create_success($values);
 }
 
 /**
@@ -300,20 +295,20 @@ function civicrm_api3_mailing_event_click($params) {
  */
 function civicrm_api3_mailing_event_open($params) {
 
-       civicrm_api3_verify_mandatory($params,
-               'CRM_Mailing_Event_DAO_Opened',
-               array('event_queue_id'),
-               FALSE
-       );
+  civicrm_api3_verify_mandatory($params,
+    'CRM_Mailing_Event_DAO_Opened',
+    array('event_queue_id'),
+    FALSE
+  );
 
-       $queue = $params['event_queue_id'];
-       $success = CRM_Mailing_Event_BAO_Opened::open($queue);
+  $queue = $params['event_queue_id'];
+  $success = CRM_Mailing_Event_BAO_Opened::open($queue);
 
-       if (!$success) {
-               return civicrm_api3_create_error('mailing open event failed');
-       }
+  if (!$success) {
+    return civicrm_api3_create_error('mailing open event failed');
+  }
 
-       return civicrm_api3_create_success($params);
+  return civicrm_api3_create_success($params);
 }
 
 function civicrm_api3_mailing_preview($params) {
@@ -496,9 +491,9 @@ function civicrm_api3_mailing_stats($params) {
  * Both the min and max days can be set via the params
  */
 function civicrm_api3_mailing_update_email_resetdate($params) {
-       CRM_Mailing_Event_BAO_Delivered::updateEmailResetDate(
-               CRM_Utils_Array::value('minDays', $params, 3),
-               CRM_Utils_Array::value('maxDays', $params, 3)
-       );
-       return civicrm_api3_create_success();
+  CRM_Mailing_Event_BAO_Delivered::updateEmailResetDate(
+    CRM_Utils_Array::value('minDays', $params, 3),
+    CRM_Utils_Array::value('maxDays', $params, 3)
+  );
+  return civicrm_api3_create_success();
 }
index edefc0843b086bc51a5529901e8c97676e5b12a8..117c82dbf68845bc59d6ebc9e469e72ceb8a4390 100644 (file)
@@ -54,7 +54,7 @@ function _civicrm_api3_mailing_group_deprecation() {
  * @return array
  */
 function civicrm_api3_mailing_group_event_unsubscribe($params) {
-       return civicrm_api('mailing_event_unsubscribe', 'create', $params);
+  return civicrm_api('mailing_event_unsubscribe', 'create', $params);
 }
 
 /**
@@ -66,8 +66,8 @@ function civicrm_api3_mailing_group_event_unsubscribe($params) {
  * @return array
  */
 function civicrm_api3_mailing_group_event_domain_unsubscribe($params) {
-       $params['org_unsubscribe'] = 1;
-       return civicrm_api('mailing_event_unsubscribe', 'create', $params);
+  $params['org_unsubscribe'] = 1;
+  return civicrm_api('mailing_event_unsubscribe', 'create', $params);
 }
 
 /**
@@ -79,7 +79,7 @@ function civicrm_api3_mailing_group_event_domain_unsubscribe($params) {
  * @return array
  */
 function civicrm_api3_mailing_group_event_resubscribe($params) {
-       return civicrm_api('mailing_event_resubscribe', 'create', $params);
+  return civicrm_api('mailing_event_resubscribe', 'create', $params);
 }
 
 /**
@@ -91,7 +91,7 @@ function civicrm_api3_mailing_group_event_resubscribe($params) {
  * @return array
  */
 function civicrm_api3_mailing_group_event_subscribe($params) {
-       return civicrm_api('mailing_event_subscribe', 'create', $params);
+  return civicrm_api('mailing_event_subscribe', 'create', $params);
 }
 
 /**
@@ -103,28 +103,26 @@ function civicrm_api3_mailing_group_get($params) {
   return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
 
-
 function civicrm_api3_mailing_group_delete($params, $ids = array()) {
   return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
 
 function civicrm_api3_mailing_group_getfields($params) {
-       $dao = _civicrm_api3_get_DAO('Subscribe');
-       $d = new $dao();
-       $fields = $d->fields();
-       $d->free();
+  $dao = _civicrm_api3_get_DAO('Subscribe');
+  $d = new $dao();
+  $fields = $d->fields();
+  $d->free();
 
-       $dao = _civicrm_api3_get_DAO('Unsubscribe');
-       $d = new $dao();
-       $fields = $fields + $d->fields();
-       $d->free();
+  $dao = _civicrm_api3_get_DAO('Unsubscribe');
+  $d = new $dao();
+  $fields = $fields + $d->fields();
+  $d->free();
 
-       // CRM-13830 - prevent the api wrapper from helping out with pseudoconstants
-       // Since these fields don't belong to this entity it will fail
-       foreach ($fields as &$field) {
-               unset($field['pseudoconstant']);
-       }
+  // CRM-13830 - prevent the api wrapper from helping out with pseudoconstants
+  // Since these fields don't belong to this entity it will fail
+  foreach ($fields as &$field) {
+    unset($field['pseudoconstant']);
+  }
 
   return civicrm_api3_create_success($fields, $params, 'mailing_group', 'getfields');
 }
-
index f230eb0dc47dc20f80703e0f7ce1559d7f1bc164..60c0c93bead6f94f2fcfaad0520607b22f060d6d 100644 (file)
@@ -53,8 +53,5 @@
  * @access public
  */
 function civicrm_api3_mailing_recipients_get($params, $ids = array()) {
-       return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
-
-
-
index a4c94fa81ec4952659a67185eae8c5e0083d1ed6..556d27da12c80722972d427841111f2072a9de67 100644 (file)
           $scope.mailid.push(c);
         });
         for(var a in chck)
-        {      var b ={}
+        {
+          var b ={}
           b.id = chck[a];
           var splt = chck[a].split(" ");
 
           resubscribe_id: $scope.currentMailing.resubscribe_id,
           body_html: $scope.currentMailing.body_html,
           body_text: $scope.currentMailing.body_text,
-          campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id,
-          header_id:   $scope.currentMailing.header_id,
-          footer_id:   $scope.currentMailing.footer_id,
+          campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id,
+          header_id: $scope.currentMailing.header_id,
+          footer_id: $scope.currentMailing.footer_id,
           groups: {include: $scope.incGrp,
             exclude: $scope.excGrp
           },
           resubscribe_id: $scope.currentMailing.resubscribe_id,
           body_html: $scope.currentMailing.body_html,
           body_text: $scope.currentMailing.body_text,
-          campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id,
-          header_id:   $scope.currentMailing.header_id,
-          footer_id:   $scope.currentMailing.footer_id,
+          campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id,
+          header_id: $scope.currentMailing.header_id,
+          footer_id: $scope.currentMailing.footer_id,
           is_completed: $scope.currentMailing.is_completed,
           dedupe_email: $scope.currentMailing.dedupe_email
         },
           body_text: $scope.currentMailing.body_text,
           scheduled_date: $scope.currentMailing.scheduled_date==null ? "" : $scope.currentMailing.scheduled_date,
           scheduled_id: $scope.currentMailing.scheduled_id==null ? "" : $scope.currentMailing.scheduled_id,
-          campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id,
-          header_id:   $scope.currentMailing.header_id,
-          footer_id:   $scope.currentMailing.footer_id,
+          campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id,
+          header_id: $scope.currentMailing.header_id,
+          footer_id: $scope.currentMailing.footer_id,
           is_completed: $scope.currentMailing.is_completed,
           approver_id: $scope.currentMailing.approver_id,
           approval_status_id: $scope.currentMailing.approval_status_id,
   });
 
 
-// Directive to go to the next tab    
+// Directive to go to the next tab
   crmMailing.directive('nexttab', function() {
     return {
       restrict: 'A',
index 91bffd3f7708a2c546facec473f899b130d20d08..ba073cb29022d54c8db817379dc87ab0705ae63a 100755 (executable)
     return {
       restrict : 'AE',
       link: function(scope, element, attrs){
-          
-        function format(item){ 
+
+        function format(item){
             return item.label.replace(/&/g, '&amp;')
             .replace(/"/g, '&quot;')
             .replace(/</g, '&lt;')
             .replace(/>/g, '&gt;');
         }
-          
+
         CRM.api3('OptionGroup', 'get', {
           "sequential": 1,
           "name": "from_email_address"
             "sequential": 1,
             "option_group_id": result.id
           }).done(function(orgEmails) {
-              
+
               //$sce.trustAsHtml(
-          
+
             $(element).select2({
               class: "abtesting-form-element",
               data: orgEmails.values,
               formatResult: format,
               formatSelection: format,
               placeholder:"Select reply to address"});
-          
-          });
-          
-        });  
-                    
 
+          });
+        });
       }
     };
   });
index 85b7d47d396f2d9b5641ceb8b9a6319c0ef51abb..472984385b6996e4f768e5bd998d94f4fa88ad1a 100644 (file)
@@ -1,35 +1,33 @@
 <!-- will use Controller: browse -->
 <body>
 <table>
-       <tr>
-               <td class="label">Attach Files</td>
-               <td>
-                       <input type="file" data-file="param.file_1"/>
-               </td>
-               <td>
-                       <button ng-click="upload()" >Upload</button>
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Attach Files</td>
-               <td>
-                       <input type="file" data-file="param.file_2"/>
-               </td>
-               <td>
-                       <button ng-click="upload_2()" >Upload</button>
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Attach Files</td>
-               <td>
-                       <input type="file" data-file="param.file_3"/>
-               </td>
-               <td>
-                       <button ng-click="upload_3()" >Upload</button>
-               </td>
-       </tr>
-
+  <tr>
+    <td class="label">Attach Files</td>
+    <td>
+      <input type="file" data-file="param.file_1"/>
+    </td>
+    <td>
+      <button ng-click="upload()" >Upload</button>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Attach Files</td>
+    <td>
+      <input type="file" data-file="param.file_2"/>
+    </td>
+    <td>
+      <button ng-click="upload_2()" >Upload</button>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Attach Files</td>
+    <td>
+      <input type="file" data-file="param.file_3"/>
+    </td>
+    <td>
+      <button ng-click="upload_3()" >Upload</button>
+    </td>
+  </tr>
 </table>
-
 </body>
 
index a6b38a34e3a6a7dec4b0856e8c2f5cb69d388a4d..9424d086bc413a7f3c1c7a377ada069871700f5f 100644 (file)
@@ -1,17 +1,17 @@
 <br>
 <div class="crm-accordion-wrapper collapsed">
-       <div class="crm-accordion-header">HTML Format</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('ht.html')"></div>
+  <div class="crm-accordion-header">HTML Format</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('ht.html')"></div>
 </div>
 
 <div class="crm-accordion-wrapper collapsed">
-       <div class="crm-accordion-header">Plain Text</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('plainText.html')"></div>
+  <div class="crm-accordion-header">Plain Text</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('plainText.html')"></div>
 </div>
 
 <table>
-       <tr ng-show= "false">
-               <td>
-                       <input type="checkbox">&nbsp Save Template</input>
-       </tr>
+  <tr ng-show="false">
+    <td>
+      <input type="checkbox">&nbsp Save Template</input>
+  </tr>
 </table>
index 75696deb68dfc52ce11092f3a1ebd7061c865548..6ff40c470764c7f55bd938c86f7f0015c6b243ea 100644 (file)
@@ -6,89 +6,89 @@ Required Variables: cool_api and currentMailing and fromAddress
   <div class="crm-block crm-form-block crmMailing">
 <br>
 <table class="form-layout-compressed">
-       <tbody>
-       <tr>
-               <td class="label">From E-mail Address</td>
-               <td>
-                       <select  style="width: 200px" ng-model="from.total" ng-options="frm.label as frm.label for frm in fromAddress">
-                               <option value="">-none-</option>
-                       </select>
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Reply to E-mail Address</td>
-               <td>
-                       <select  style="width: 200px" ng-model="currentMailing.replyto_email" ng-options="frm.email as frm.email for frm in replyaddress">
-                               <option value="">-none-</option>
-                       </select>
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Mailing Subject</td>
-               <td>
-                       <input id= "sub" placeholder="Enter Subject" required name="subject" type="text" ng-model="currentMailing.subject"/>
-               </td>
-       </tr>
-       <tr>
-               <td class="label"  style= "color:red" ng-show="mailing_form.subject.$invalid">
-                       Mailing subject required.
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Mailing Subject Token</td>
-               <td>
-                       <input type="hidden" groupselect id= "subgroup" ng-model="token" ></input>
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Use Template</td>
-               <td>
-                       <select ng-change="tmp(tst)" ng-model="tst" ng-options= "mstemp.id as mstemp.msg_title for mstemp in tmpList">
-                               <option value="">-none-</option>
-                       </select>
-               </td>
-       </tr>
-       </tbody>
+  <tbody>
+  <tr>
+    <td class="label">From E-mail Address</td>
+    <td>
+      <select  style="width: 200px" ng-model="from.total" ng-options="frm.label as frm.label for frm in fromAddress">
+        <option value="">-none-</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Reply to E-mail Address</td>
+    <td>
+      <select  style="width: 200px" ng-model="currentMailing.replyto_email" ng-options="frm.email as frm.email for frm in replyaddress">
+        <option value="">-none-</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Mailing Subject</td>
+    <td>
+      <input id="sub" placeholder="Enter Subject" required name="subject" type="text" ng-model="currentMailing.subject"/>
+    </td>
+  </tr>
+  <tr>
+    <td class="label"  style="color:red" ng-show="mailing_form.subject.$invalid">
+      Mailing subject required.
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Mailing Subject Token</td>
+    <td>
+      <input type="hidden" groupselect id="subgroup" ng-model="token" ></input>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Use Template</td>
+    <td>
+      <select ng-change="tmp(tst)" ng-model="tst" ng-options="mstemp.id as mstemp.msg_title for mstemp in tmpList">
+        <option value="">-none-</option>
+      </select>
+    </td>
+  </tr>
+  </tbody>
 </table>
 <br>
-<!--<div class="crm-accordion-wrapper collapsed" ng-show= "upldChange(composeS)">
+<!--<div class="crm-accordion-wrapper collapsed" ng-show="upldChange(composeS)">
   <div class="crm-accordion-header">Compose on Screen</div>
   <div class="crm-accordion-body" ng-include="partialUrl('composeonScreen.html')"></div>
 </div>-->
 
 <br>
 <div class="crm-accordion-wrapper ">
-       <div class="crm-accordion-header">HTML Format</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('ht.html')"></div>
+  <div class="crm-accordion-header">HTML Format</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('ht.html')"></div>
 </div>
 
 <div class="crm-accordion-wrapper collapsed">
-       <div class="crm-accordion-header">Plain Text</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('plainText.html')"></div>
+  <div class="crm-accordion-header">Plain Text</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('plainText.html')"></div>
 </div>
 
 <div class="crm-accordion-wrapper collapsed">
-       <div class="crm-accordion-header">Header and Footer</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('headerandFooter.html')"></div>
+  <div class="crm-accordion-header">Header and Footer</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('headerandFooter.html')"></div>
 </div>
 
 <div class="crm-accordion-wrapper collapsed">
-       <div class="crm-accordion-header">Track and Respond</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('trackandRespond.html')"></div>
+  <div class="crm-accordion-header">Track and Respond</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('trackandRespond.html')"></div>
 </div>
     <br>
     <div class="crm-submit-buttons">
       <span class="crm-button">
-        <input prevtab type="submit" class="crm-button" value = "Previous" />
+        <input prevtab type="submit" class="crm-button" value="Previous" />
       </span>
       <span class="crm-button">
-        <input nexttab type= "submit" ng-click="editMailingFormStep2.$setPristine(); save_next_page2()" value="Next" />
+        <input nexttab type="submit" ng-click="editMailingFormStep2.$setPristine(); save_next_page2()" value="Next" />
       </span>
       <span class="crm-button">
-        <input type= "submit" ng-click="editMailingFormStep2.$setPristine(); save()" value="Save and Continue Later" />
+        <input type="submit" ng-click="editMailingFormStep2.$setPristine(); save()" value="Save and Continue Later" />
       </span>
       <span class="crm-button">
-        <input type= "submit" ng-click="back()" value="Cancel" />
+        <input type="submit" ng-click="back()" value="Cancel" />
       </span>
     </div>
   </div>
index 0c1da434e4fb4ccf8ddaa2b52a968edc6dfa6402..afb9ade2097bfbb34ac9f1df655ca851d4f4da08 100644 (file)
@@ -5,21 +5,21 @@ Required vars: currentMailing and headerfooter
 <br>
 <body>
 <table>
-       <tr>
-               <td class="label">Mailing Header</td>
-               <td>
-                       <select ng-model="currentMailing.header_id" ng-options="hf.id as hf.name for hf in headerfooter| filter:isHeader">
-                               <option value="">-none-</option>
-                       </select>
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Mailing Footer</td>
-               <td>
-                       <select ng-model="currentMailing.footer_id" ng-options="f.id as f.name for f in headerfooter| filter:isFooter">
-                               <option value="">-none-</option>
-                       </select>
-               </td>
-       </tr>
+  <tr>
+    <td class="label">Mailing Header</td>
+    <td>
+      <select ng-model="currentMailing.header_id" ng-options="hf.id as hf.name for hf in headerfooter| filter:isHeader">
+        <option value="">-none-</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Mailing Footer</td>
+    <td>
+      <select ng-model="currentMailing.footer_id" ng-options="f.id as f.name for f in headerfooter| filter:isFooter">
+        <option value="">-none-</option>
+      </select>
+    </td>
+  </tr>
 </table>
 </body>
index df8f31dce8ff4d6b02081b067f0d9780dfa45963..afc3da4402949dc4024cd276d5c9ca17817664a8 100644 (file)
@@ -1,8 +1,8 @@
 
 
 <br>
-<div style = "float:right;">
-<input type="hidden" groupselect id= "htgroup" ng-model="token" />
+<div style="float:right;">
+<input type="hidden" groupselect id="htgroup" ng-model="token" />
 </div>
 <br>
 <br>
index 3ba5aec882c263b46338d56644745ccacd2504e2..57d218f64ca2766289d6fa487a6c40938fb08853 100644 (file)
@@ -1,15 +1,15 @@
 <!--
 Controller: MailCtrl
-Required vars: groupNamesList 
+Required vars: groupNamesList
 MailingGroup api needs to be improved to bind the chosen groups
 -->
 
 <br>
 <select chsgroup multiple ng-model="incGroup">
-       <option ng-repeat="grp in groupNamesList| filter: isGrp" value="{{grp.id}} civicrm_group include" > {{grp.title}} </option>
-       <option ng-repeat="grp in groupNamesList| filter: isGrp" value="{{grp.id}} civicrm_group exclude" > {{grp.title}} </option>
-       <option ng-repeat="ml in mailList| filter:isCompMail" value="{{ml.id}} civicrm_mailing include" > {{ml.name}} </option>
-       <option ng-repeat="ml in mailList| filter:isCompMail" value="{{ml.id}} civicrm_mailing exclude" > {{ml.name}} </option>
+  <option ng-repeat="grp in groupNamesList| filter: isGrp" value="{{grp.id}} civicrm_group include" > {{grp.title}} </option>
+  <option ng-repeat="grp in groupNamesList| filter: isGrp" value="{{grp.id}} civicrm_group exclude" > {{grp.title}} </option>
+  <option ng-repeat="ml in mailList| filter:isCompMail" value="{{ml.id}} civicrm_mailing include" > {{ml.name}} </option>
+  <option ng-repeat="ml in mailList| filter:isCompMail" value="{{ml.id}} civicrm_mailing exclude" > {{ml.name}} </option>
 </select>
 <br> <br>
 
index 0fba3ce90215a898aee1de17ae4228dc966b0dd6..6307d731061e7a708a59e374991b7ebfa8451212 100644 (file)
@@ -4,22 +4,22 @@ Submit Mailing is not functional yet
 -->
 
 
-       <div ui-jq="tabs" id="alltabs" class="crmMailingTabs">
-               <ul>
-                       <li><a href="#tab-0" ng-click= "recclicked()">Recipients</a></li>
-                       <li><a href="#tab-1" ng-click= "conclicked()">Content</a></li>
-                       <li><a href="#tab-2" ng-click= "schedclicked()">Schedule and Send</a></li>
-               </ul>
+  <div ui-jq="tabs" id="alltabs" class="crmMailingTabs">
+    <ul>
+      <li><a href="#tab-0" ng-click="recclicked()">Recipients</a></li>
+      <li><a href="#tab-1" ng-click="conclicked()">Content</a></li>
+      <li><a href="#tab-2" ng-click="schedclicked()">Schedule and Send</a></li>
+    </ul>
 
-               <div id="tab-0">
-                       <div ng-include="partialUrl('recipient.html')"></div>
-               </div>
+    <div id="tab-0">
+      <div ng-include="partialUrl('recipient.html')"></div>
+    </div>
 
-               <div id="tab-1">
-                       <div ng-include="partialUrl('content.html')"></div>
-               </div>
+    <div id="tab-1">
+      <div ng-include="partialUrl('content.html')"></div>
+    </div>
 
-               <div id="tab-2">
-                       <div ng-include="partialUrl('send.html')"></div>
-               </div>
-       </div>
+    <div id="tab-2">
+      <div ng-include="partialUrl('send.html')"></div>
+    </div>
+  </div>
index 34b08de933af942c83f7ec2ce9995ddd0a23610f..cbc4f740f5f8d3072b1322e3240f99478d3dae06 100644 (file)
@@ -3,8 +3,8 @@ Controller: MailCtrl
 Required vars: currentMailing
 -->
 <br>
-<div style = "float:right;">
-  <input type="hidden" groupselect id= "textgroup" ng-model="token" ></input>
+<div style="float:right;">
+  <input type="hidden" groupselect id="textgroup" ng-model="token" ></input>
 </div>
 <br>
 <br>
index 7b1d265c49365579f8c71b79031d0d767bb5aff2..0b817b5f783a7a0ef6cf7130050aa3b2fe5725a9 100644 (file)
@@ -1,17 +1,17 @@
 <!--
 Controller: MailCtrl
-Required vars: currentMailing 
+Required vars: currentMailing
 The editor has to be added. Currently just a simple text editor
 -->
 <br>
-<div class="crm-accordion-wrapper collapsed" ng-click = "preview_update()">
-       <div class="crm-accordion-header">HTML Preview</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('preview_ht.html')"></div>
+<div class="crm-accordion-wrapper collapsed" ng-click="preview_update()">
+  <div class="crm-accordion-header">HTML Preview</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('preview_ht.html')"></div>
 </div>
 
-<div class="crm-accordion-wrapper collapsed" ng-show = "isBody_text()" ng-click = "preview_update()">
-       <div class="crm-accordion-header">Plain Text Preview</div>
-       <div class="crm-accordion-body" ng-include="partialUrl('preview_plaintext.html')"></div>
+<div class="crm-accordion-wrapper collapsed" ng-show="isBody_text()" ng-click="preview_update()">
+  <div class="crm-accordion-header">Plain Text Preview</div>
+  <div class="crm-accordion-body" ng-include="partialUrl('preview_plaintext.html')"></div>
 </div>
 <br>
 
index 0e005c50a1dafb249fcc6d080e7e22e3efe59a04..97972487b189c298b40d42c9f403ea3f92e722d0 100644 (file)
@@ -1,21 +1,21 @@
 <!--
 Controller: MailCtrl
-Required vars: currentMailing 
+Required vars: currentMailing
 The editor has to be added. Currently just a simple text editor
 -->
 
 <br>
-<table style = "font-size:13pt; font-family: Georgia; ">
-       <tr>
-               <td>Subject:</td>
-               <td><div ng-bind-html="deliberatelyTrustDangerousSnippet3()"></div></td>
-       </tr>
+<table style="font-size:13pt; font-family: Georgia; ">
+  <tr>
+    <td>Subject:</td>
+    <td><div ng-bind-html="deliberatelyTrustDangerousSnippet3()"></div></td>
+  </tr>
 
-       <tr></tr>
-       <tr>
-               <td>Html:</td>
-               <td><div ng-bind-html="deliberatelyTrustDangerousSnippet()"></div></td>
-       </tr>
+  <tr></tr>
+  <tr>
+    <td>Html:</td>
+    <td><div ng-bind-html="deliberatelyTrustDangerousSnippet()"></div></td>
+  </tr>
 </table>
 <!--/siddhant/drupal-7.27/civicrm/mailing/preview?type=html&qfKey=e1adc21bd61fb7e449c48ffe80c4d15c_991
 /siddhant/drupal-7.27/civicrm/mailing/preview?type=html&qfKey=e1adc21bd61fb7e449c48ffe80c4d15c_7748
index 5b548648065bebb6689d085cdf231b93e5babcd1..d4544fb10baaed200af62a10d1e697cf7ccd3d12 100644 (file)
@@ -3,15 +3,15 @@ Controller: MailCtrl
 Required vars: currentMailing
 -->
 <br>
-<table style = "font-size:13pt; font-family: Georgia; ">
-       <tr>
-               <td>Subject:</td>
-               <td><div ng-bind-html="deliberatelyTrustDangerousSnippet3()"></div></td>
-       </tr>
+<table style="font-size:13pt; font-family: Georgia; ">
+  <tr>
+    <td>Subject:</td>
+    <td><div ng-bind-html="deliberatelyTrustDangerousSnippet3()"></div></td>
+  </tr>
 
-       <tr></tr>
-       <tr>
-               <td>PlainText:</td>
-               <td><div ng-bind-html="deliberatelyTrustDangerousSnippet2()"></div></td>
-       </tr>
+  <tr></tr>
+  <tr>
+    <td>PlainText:</td>
+    <td><div ng-bind-html="deliberatelyTrustDangerousSnippet2()"></div></td>
+  </tr>
 </table>
index 93db3bed3a17eccb9cb93513591e0aa4bee55ca6..e08d82b49529323ff69f653c63e2782d2fc5a9c9 100644 (file)
@@ -5,34 +5,34 @@ Required vars: currentMailing
 <!--<script src="../../packages/jquery/plugins/jquery.validate.min.js"><script>-->
 <br>
 <table class="form-layout-compressed">
-       <tbody>
-       <tr>
-               <td class="label">Send Immediately</td>
-               <td>
-                       <input type="checkbox" ng-model="now" ng-change= "checkNow()" ng-true-value="1" ng-false-value="0"/>
-               </td>
-       <tr ng-show="now==0">
-               <td class="label">OR</td>
-       </tr>
-       <tr ng-show="now==0">
-               <td class="label">Schedule Mailing</td>
-               <td>
-                       <input type="text" class="dateplugin" chsdate ng-model="scheddate.date" >
-               </td>
-               <td class="label" >Time</td>
-               <td>
-                       <input type="text" placeholder="hh:mm" ng-model="scheddate.time" checktimeentry required>
-               </td>
-               <!--<td>
-                       <input type="text" ng-model="scheddate.time">
-               </td>-->
-       </tr>
+  <tbody>
+  <tr>
+    <td class="label">Send Immediately</td>
+    <td>
+      <input type="checkbox" ng-model="now" ng-change="checkNow()" ng-true-value="1" ng-false-value="0"/>
+    </td>
+  <tr ng-show="now==0">
+    <td class="label">OR</td>
+  </tr>
+  <tr ng-show="now==0">
+    <td class="label">Schedule Mailing</td>
+    <td>
+      <input type="text" class="dateplugin" chsdate ng-model="scheddate.date" >
+    </td>
+    <td class="label" >Time</td>
+    <td>
+      <input type="text" placeholder="hh:mm" ng-model="scheddate.time" checktimeentry required>
+    </td>
+    <!--<td>
+      <input type="text" ng-model="scheddate.time">
+    </td>-->
+  </tr>
 
-       </tbody>
+  </tbody>
 </table>
 
 <div id="help" ng-show="now==0">
-       Enter the time in the 12:32 format where 12 is the hour, 32 the minutes.
+  Enter the time in the 12:32 format where 12 is the hour, 32 the minutes.
 </div>
 <br>
 
index 4e9dc178bc83099fd89859e473ba09ffc5c6a035..e4a930b9c05414e25e11835832b1f7dd2f3ef54f 100644 (file)
@@ -5,7 +5,7 @@ Controller: MailCtrl
 <form name="editMailingFormStep3" unsaved-warning-form>
   <br>
   <div class="crm-block crm-form-block crmMailing">
-    <div id="prevmail" ng-show = "pre">
+    <div id="prevmail" ng-show="pre">
       <div ui-jq="tabs" id="settings">
         <ul>
           <li>
@@ -23,7 +23,7 @@ Controller: MailCtrl
     </div>
 
 
-    <!--<div class="crm-accordion-wrapper collapsed" ng-click = "preview_update()" >
+    <!--<div class="crm-accordion-wrapper collapsed" ng-click="preview_update()" >
       <div class="crm-accordion-header">Preview</div>
       <div class="crm-accordion-body" ng-include="partialUrl('previewMailing.html')"></div>
     </div>-->
@@ -42,16 +42,16 @@ Controller: MailCtrl
     <br>
     <div class="crm-submit-buttons">
       <span class="crm-button">
-        <input prevtab type="submit" class="crm-button" value = "Previous" />
+        <input prevtab type="submit" class="crm-button" value="Previous" />
       </span>
       <span class="crm-button">
-        <input type="submit" class="crm-button" ng-click="preview_update()" value = "Preview" />
+        <input type="submit" class="crm-button" ng-click="preview_update()" value="Preview" />
       </span>
       <span class="crm-button">
-        <input type= "submit" ng-click="editMailingFormStep3.$setPristine(); submitButton()" value="Submit Mailing" />
+        <input type="submit" ng-click="editMailingFormStep3.$setPristine(); submitButton()" value="Submit Mailing" />
       </span>
       <span class="crm-button">
-        <input type= "submit" ng-click="back()" value="Continue Later" />
+        <input type="submit" ng-click="back()" value="Continue Later" />
       </span>
     </div>
 
index d866e15fab56fb2ae1e2b34bdb2364ad2ab79ed3..a2f03b73fd091babc359e08ccca1334148b1f589 100644 (file)
@@ -4,27 +4,27 @@ Required vars: groupNamesList
 -->
 
 <table class="form-layout-compressed">
-       <tbody>
-       <tr>
-               <td class="label">Send to address</td>
-               <td>
-                       <input type="text" ng-model="testMailing.name" />
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Send to this Group</td>
-               <td>
-                       <select  style="width: 200px" ng-model="testMailing.group">
-                               <option value="">-none-</option>
-                               <option ng-repeat="grp in groupNamesList| filter: isGrp" value="{{grp.id}}" > {{grp.title}} </option>
-                       </select>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <button class="crm-submit-buttons crm-button" id="testbutton" ng-click="sendTest()">Send a Test Mailing</button>
-               </td>
-       </tr>
-       </tbody>
+  <tbody>
+  <tr>
+    <td class="label">Send to address</td>
+    <td>
+      <input type="text" ng-model="testMailing.name" />
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Send to this Group</td>
+    <td>
+      <select  style="width: 200px" ng-model="testMailing.group">
+        <option value="">-none-</option>
+        <option ng-repeat="grp in groupNamesList| filter: isGrp" value="{{grp.id}}" > {{grp.title}} </option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <button class="crm-submit-buttons crm-button" id="testbutton" ng-click="sendTest()">Send a Test Mailing</button>
+    </td>
+  </tr>
+  </tbody>
 </table>
 
index 7de7c6117725f7a453b3b3f38fab336cbd9fc012..007ed5084cee29e938d4c060f57600310bb5a1e7 100644 (file)
@@ -4,97 +4,97 @@ Required vars: currentMailing
 -->
 
 <table class="form-layout-compressed">
-       <tbody>
-       <tr>
-               <td>
-                       <h3> Tracking</h3>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <input type="checkbox" ng-model="currentMailing.url_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Click Throughs</input>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <div id="help">
-                               Track the number of times recipients click each link in this mailing. NOTE: When this feature is enabled, all links in the message body will be automaticallly re-written to route through your CiviCRM server prior to redirecting to the target page.
-                       </div>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <input type="checkbox" ng-model="currentMailing.open_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Opens</input>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <div id="help">
-                               Track the number of times recipients open this mailing in their email software.
-                       </div>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <h3>Responding</h3>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <input type="checkbox" ng-model="trackreplies" ng-change= "reply()" ng-true-value="1" ng-false-value="0">&nbsp Track Replies</input>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <div id="help">
-                               Recipients' replies are sent to a CiviMail specific address instead of the sender's address so they can be stored within CiviCRM.
-                       </div>
-               </td>
-       </tr>
-       <tr ng-show= "trackr(trackreplies)">
-               <td>
-                       <input type="checkbox" ng-model="currentMailing.forward_replies" ng-true-value="1" ng-false-value="0">&nbsp Forward Replies</input>
-               </td>
-       </tr>
-       <tr ng-show= "trackr(trackreplies)">
-               <td>
-                       <div id="help">
-                               If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.
-                       </div>
-               </td>
-       </tr>
-       <tr ng-show= "trackr(trackreplies)">
-               <td>
-                       <input type="checkbox" ng-model="currentMailing.auto_responder" ng-true-value="1" ng-false-value="0">&nbsp Auto-Respond to Replies &nbsp &nbsp</input>
-                       <select ng-model="mailAutoResponder" ng-options="au.id as au.name for au in headerfooter| filter:isAuto">
-                               <option value="">-none-</option>
-                       </select>
-               </td>
-       </tr>
-       <tr ng-show= "trackr(trackreplies)">
-               <td>
-                       <div id="help">
-                               If a recipient replies to this mailing, send an automated reply using the selected message.
-                       </div>
-               </td>
-       </tr>
-       <tr>
-               <td>
-                       <h3> Online Publication</h3>
-               </td>
-       </tr>
+  <tbody>
+  <tr>
+    <td>
+      <h3> Tracking</h3>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <input type="checkbox" ng-model="currentMailing.url_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Click Throughs</input>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <div id="help">
+        Track the number of times recipients click each link in this mailing. NOTE: When this feature is enabled, all links in the message body will be automaticallly re-written to route through your CiviCRM server prior to redirecting to the target page.
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <input type="checkbox" ng-model="currentMailing.open_tracking" ng-true-value="1" ng-false-value="0">&nbsp Track Opens</input>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <div id="help">
+        Track the number of times recipients open this mailing in their email software.
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <h3>Responding</h3>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <input type="checkbox" ng-model="trackreplies" ng-change="reply()" ng-true-value="1" ng-false-value="0">&nbsp Track Replies</input>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <div id="help">
+        Recipients' replies are sent to a CiviMail specific address instead of the sender's address so they can be stored within CiviCRM.
+      </div>
+    </td>
+  </tr>
+  <tr ng-show="trackr(trackreplies)">
+    <td>
+      <input type="checkbox" ng-model="currentMailing.forward_replies" ng-true-value="1" ng-false-value="0">&nbsp Forward Replies</input>
+    </td>
+  </tr>
+  <tr ng-show="trackr(trackreplies)">
+    <td>
+      <div id="help">
+        If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.
+      </div>
+    </td>
+  </tr>
+  <tr ng-show="trackr(trackreplies)">
+    <td>
+      <input type="checkbox" ng-model="currentMailing.auto_responder" ng-true-value="1" ng-false-value="0">&nbsp Auto-Respond to Replies &nbsp &nbsp</input>
+      <select ng-model="mailAutoResponder" ng-options="au.id as au.name for au in headerfooter| filter:isAuto">
+        <option value="">-none-</option>
+      </select>
+    </td>
+  </tr>
+  <tr ng-show="trackr(trackreplies)">
+    <td>
+      <div id="help">
+        If a recipient replies to this mailing, send an automated reply using the selected message.
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <h3> Online Publication</h3>
+    </td>
+  </tr>
 </table>
 
 <table class="form-layout-compressed">
-       <tr>
-               <td class="label">Mailing Visibility</td>
-               <td>
-                       <select ng-model="currentMailing.visibility">
-                               <option value="Public Pages">Public Pages</option>
-                               <option value="User and User Admin Only">User and User Admin Only</option>
-                       </select>
-               </td>
-               </tbody>
+  <tr>
+    <td class="label">Mailing Visibility</td>
+    <td>
+      <select ng-model="currentMailing.visibility">
+        <option value="Public Pages">Public Pages</option>
+        <option value="User and User Admin Only">User and User Admin Only</option>
+      </select>
+    </td>
+    </tbody>
 </table>
 
 
index 0f50aeb2319363599503d11ff74991274f7f8d8a..a70e698e8404fe2b37e2b6b6484b7c7f0595205e 100644 (file)
@@ -1,17 +1,17 @@
 <body>
 <table>
-       <tr>
-               <td class="label">Upload TEXT Message</td>
-               <td>
-                       <input type="file"/>
-               </td>
-       </tr>
-       <tr>
-               <td class="label">Upload HTML Message</td>
-               <td>
-                       <input type="file"/>
-               </td>
-       </tr>
+  <tr>
+    <td class="label">Upload TEXT Message</td>
+    <td>
+      <input type="file"/>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Upload HTML Message</td>
+    <td>
+      <input type="file"/>
+    </td>
+  </tr>
 </table>
 
 </body>