fixed beta 1 bugs: 31058 removed more menu andd added directly in row

diff --git a/CRM/Wci/Form/CreateWidget.php b/CRM/Wci/Form/CreateWidget.php
index 58fa128ea95f77a5508d9e0c899e6cbbf77100ca..f6f64b78fd280c9dd0876877b7543e71aea88a6e 100644 (file)
--- a/CRM/Wci/Form/CreateWidget.php
+++ b/CRM/Wci/Form/CreateWidget.php
@@ -109,7 +109,7 @@ class CRM_Wci_Form_CreateWidget extends CRM_Core_Form {
     $this->add('select', 'progress_bar', ts('Progress bar'), $this->getProgressBars());
     $this->addWysiwyg('description', ts('Description'), '');
     $this->add('select', 'email_signup_group_id', ts('Newsletter signup'), $this->getGroupOptions());
-    $this->add('select', 'size_variant', ts('Size variant<br><SMALL>Fixed width. Height depends on what contents selected.</SMALL>'), $this->getSizeOptions());
+    $this->add('select', 'size_variant', ts('Size variant'), $this->getSizeOptions());
     // $fieldset = $this->addElement('fieldset')->setLabel('Advanced Settings');
     $this->add('checkbox', 'hide_title', ts('Hide Title'));
     $this->add('checkbox', 'hide_border', ts('Hide border'));

diff --git a/CRM/Wci/Page/ManageEmbedCode.php b/CRM/Wci/Page/ManageEmbedCode.php
index 5644274013c0c7b4f21f197074180243f968f63f..d5b15a8965dd027b1068ee34f30c5dc259ed2bd6 100644 (file)
--- a/CRM/Wci/Page/ManageEmbedCode.php
+++ b/CRM/Wci/Page/ManageEmbedCode.php
@@ -57,11 +57,7 @@ class CRM_Wci_Page_ManageEmbedCode extends CRM_Core_Page {
       $action = array_sum(array_keys($this->actionLinks())); 
       //build the normal action links.
       $emb_code[$dao->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(),
-        $action,
-        array('id' => $dao->id),
-        ts('more'),
-        TRUE
-      );     
+        $action, array('id' => $dao->id));     
     }
    
     if (isset($emb_code)) {

diff --git a/CRM/Wci/Page/ProgressBarList.php b/CRM/Wci/Page/ProgressBarList.php
index f0a220c2650889f86679393413979e3e3711dca5..a0a33cd064708faab9bc11bbd098f98d7a33bec9 100644 (file)
--- a/CRM/Wci/Page/ProgressBarList.php
+++ b/CRM/Wci/Page/ProgressBarList.php
@@ -58,11 +58,7 @@ class CRM_Wci_Page_ProgressBarList extends CRM_Core_Page {
       $action = array_sum(array_keys($this->actionLinks())); 
       //build the normal action links.
       $con_page[$dao->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(),
-        $action,
-        array('id' => $dao->id),
-        ts('more'),
-        TRUE
-      );
+        $action, array('id' => $dao->id));
     }
 
     if (isset($con_page)) {

diff --git a/CRM/Wci/Page/WidgetList.php b/CRM/Wci/Page/WidgetList.php
index f2277fae9365af1b106654fb003b0a2660d9fdac..3335b838fefe0a1ffcdb0335d78669d427194203 100644 (file)
--- a/CRM/Wci/Page/WidgetList.php
+++ b/CRM/Wci/Page/WidgetList.php
@@ -57,11 +57,7 @@ class CRM_Wci_Page_WidgetList extends CRM_Core_Page {
       $action = array_sum(array_keys($this->actionLinks())); 
       //build the normal action links.
       $wid_page[$dao->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(),
-        $action,
-        array('id' => $dao->id),
-        ts('more'),
-        TRUE
-      );
+        $action, array('id' => $dao->id));
     }
    
     if (isset($wid_page)) {

diff --git a/createwidget.js b/createwidget.js
index 9af6254ed44e1b81207723aec483c87d5be8e4ac..29b9fa3867ff7c3c504fa9160bab2860f69ebce9 100644 (file)
--- a/createwidget.js
+++ b/createwidget.js
@@ -15,6 +15,8 @@ cj(function ( $ ) {
     
     $('#image').after('<label><br><SMALL>Select a smaller image than Size variant</SMALL></label>');
     $('#logo_image').after('<label><br><SMALL>Select smaller image appropriate for logo</SMALL></label>');
+    $('#email_signup_group_id').after("<label><br><SMALL>Those groups that are 'Mailing List' selected are shown.</SMALL></label>");
+    $('#size_variant').after("<label><br><SMALL>Fixed width. Height depends on what contents selected.</SMALL></label>");
     
   }
   $(document).ready(setState)