#29759 - Included newsletter signup in widget.

diff --git a/CRM/Wci/Form/CreateWidget.php b/CRM/Wci/Form/CreateWidget.php
index bc114f0757b1a62ced657d8335a0d3a86e263352..04f82629c7fc5923637f48cff2af6e3d20d1ec2e 100644 (file)
--- a/CRM/Wci/Form/CreateWidget.php
+++ b/CRM/Wci/Form/CreateWidget.php
@@ -348,7 +348,10 @@ where w.id=" . $this->_id;
       '' => ts('- select -'),
     );
     
-    $result = civicrm_api3('group', 'get');    
+    $result = civicrm_api3('group', 'get', array(
+      'group_type' => '2'
+    ));
+    
     foreach ($result['values'] as $group) {
       $options[$group['id']] = $group['title'];
     }

diff --git a/extern/wciwidget.php b/extern/wciwidget.php
index a44ea7184e8ef568208210e8a4ac961a46fd07ce..3f89330d30bdeafa0a87327fd43430d3e7cdc8e8 100644 (file)
--- a/extern/wciwidget.php
+++ b/extern/wciwidget.php
@@ -54,18 +54,14 @@ if (isset($format)) {
 }
 
 $data = "";
-if (isset($embed) && (true == $embed)) {
+$data = CRM_Wci_BAO_Widget::getWidgetData($widgetId);
+$template->assign('wciform', $data);
+$template->assign('cpageId', $data['button_link_to']);
+$template->assign('embed', $embed);
 
-} else {
-  $data = CRM_Wci_BAO_Widget::getWidgetData($widgetId);
-  $template->assign('wciform', $data);
-  $template->assign('cpageId', $data['button_link_to']);
-
-  $template->template_dir[] = getWciWidgetTemplatePath();
-  $wcidata = $template->fetch('wciwidget.tpl');
-  $output = 'var wciwidgetcode =  ' . json_encode($wcidata) . ';';
-  echo $output;
-
-}
+$template->template_dir[] = getWciWidgetTemplatePath();
+$wcidata = $template->fetch('wciwidget.tpl');
+$output = 'var wciwidgetcode =  ' . json_encode($wcidata) . ';';
+echo $output;
 
 CRM_Utils_System::civiExit();

diff --git a/templates/CRM/Wci/Page/wciwidget.tpl b/templates/CRM/Wci/Page/wciwidget.tpl
index 84e63c6e64e8ac221ea9e4558acc7fb0d77ea7e8..6dad7da4b4fd959e0e922271f004cfa0c537dab5 100644 (file)
--- a/templates/CRM/Wci/Page/wciwidget.tpl
+++ b/templates/CRM/Wci/Page/wciwidget.tpl
@@ -185,4 +185,19 @@
     <div class="crm-wci-button-wrapper" id="crm_wid_{$widgetId}_button">
         <a href='{crmURL p="civicrm/contribute/transact" q="reset=1&id=$cpageId" h=0 a=1 fe=1}' class="crm-wci-button"><span class="crm-wci-button-inner" id="crm_wid_{$widgetId}_btn_txt">{$wciform.button_title}</span></a>
     </div>
+    {$wciform.embed}
+    {if $wciform.email_signup_group_id}
+      {if $wciform.embed == 1}
+        <form method="get" action="http://{php}echo $_SERVER['SERVER_NAME'];{/php}/civicrm/mailing/subscribe"
+      {/if}
+        <p style="text-align:center;">
+          <input type="text" id="frmEmail" name="email-Primary" size="10">
+        </p>
+        <p style="text-align: center; margin-top: 10px;">
+          <input type="submit" name="_qf_Edit_next" value="Subscribe Me">
+        </p>
+      {if $wciform.embed == 1}
+        </form>
+      {/if}
+    {/if}
 </div>