From: Jagadedes Date: Thu, 6 Nov 2014 05:21:59 +0000 (+0530) Subject: #31000 changed grpup name X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;ds=sidebyside;h=68f8aff61c9ebe7eced95e635bdbc440645e5665;p=com.zyxware.civiwci.git #31000 changed grpup name --- diff --git a/CRM/Wci/BAO/Widget.php b/CRM/Wci/BAO/Widget.php index f8980ac..a3420b5 100644 --- a/CRM/Wci/BAO/Widget.php +++ b/CRM/Wci/BAO/Widget.php @@ -161,7 +161,7 @@ class CRM_Wci_BAO_Widget extends CRM_Wci_DAO_Widget { $data["hide_border"] = $dao->hide_border; $data["hide_pbcap"] = $dao->hide_pbcap; $data["color_bar"] = $dao->color_progress_bar; - $defProf = civicrm_api3('setting', 'getValue', array('group' => 'extensions', 'name' => 'default_wci_profile')); + $defProf = civicrm_api3('setting', 'getValue', array('group' => 'Wci Preference', 'name' => 'default_wci_profile')); $data["emailSignupGroupFormURL"] = CRM_Utils_System::baseCMSURL() . '/civicrm/profile/create?reset=1&gid=' . $defProf; } return $data; diff --git a/CRM/Wci/Form/CreateWidget.php b/CRM/Wci/Form/CreateWidget.php index 320e080..100233b 100644 --- a/CRM/Wci/Form/CreateWidget.php +++ b/CRM/Wci/Form/CreateWidget.php @@ -28,12 +28,12 @@ class CRM_Wci_Form_CreateWidget extends CRM_Core_Form { $this->_colorFields = array('color_title' => array(ts('Title Text Color'), 'text', FALSE, - '#2786C2', + '#BF0F0F', ), 'color_title_bg' => array(ts('Title background color'), 'text', FALSE, - '#BF0F0F', + '#FFFFFF', ), 'color_bar' => array(ts('Progress Bar Color'), 'text', diff --git a/CRM/Wci/Form/WCISettings.php b/CRM/Wci/Form/WCISettings.php index 5fb20fa..af07b14 100644 --- a/CRM/Wci/Form/WCISettings.php +++ b/CRM/Wci/Form/WCISettings.php @@ -35,8 +35,8 @@ class CRM_Wci_Form_WCISettings extends CRM_Core_Form { ), )); - $widgetId = civicrm_api3('setting', 'getValue', array('group' => 'extensions', 'name' => 'default_wci_widget')); - $defProf = civicrm_api3('setting', 'getValue', array('group' => 'extensions', 'name' => 'default_wci_profile')); + $widgetId = civicrm_api3('setting', 'getValue', array('group' => 'Wci Preference', 'name' => 'default_wci_widget')); + $defProf = civicrm_api3('setting', 'getValue', array('group' => 'Wci Preference', 'name' => 'default_wci_profile')); $this->setDefaults(array( 'default_widget' => $widgetId)); diff --git a/extern/wciwidget.php b/extern/wciwidget.php index cd5d544..59730c4 100644 --- a/extern/wciwidget.php +++ b/extern/wciwidget.php @@ -48,7 +48,7 @@ $template = CRM_Core_Smarty::singleton(); $widgetId = CRM_Utils_Request::retrieve('widgetId', 'Positive', CRM_Core_DAO::$_nullObject); if(empty($widgetId)) { - $widgetId = civicrm_api3('setting', 'getValue', array('group' => 'wci', 'name' => 'default_wci_widget')); + $widgetId = civicrm_api3('setting', 'getValue', array('group' => 'Wci Preference', 'name' => 'default_wci_widget')); } $embed = CRM_Utils_Request::retrieve('embed', 'Positive', CRM_Core_DAO::$_nullObject); diff --git a/templates/CRM/Wci/Page/wciwidget.tpl b/templates/CRM/Wci/Page/wciwidget.tpl index 8374bbc..c68cc93 100644 --- a/templates/CRM/Wci/Page/wciwidget.tpl +++ b/templates/CRM/Wci/Page/wciwidget.tpl @@ -4,17 +4,17 @@ font-size:12px; font-family:Helvetica, Arial, sans; padding:6px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; - border-radius: 4px; - + -moz-border-radius: 12px; + -webkit-border-radius: 12px; + -khtml-border-radius: 12px; + border-radius: 12px; {/literal}{if (0 == $wciform.hide_border)}{literal} border: 4px solid {/literal}{$wciform.color_border}{literal}; {if (1 == $wciform.hide_border)} border: None; {/literal}{/if}{literal} background-color: {/literal}{$wciform.color_widget_bg}{literal}; /* background color */ + box-shadow: 3px 3px 6px; } .crm-wci-widget.thin { @@ -176,8 +176,8 @@ {/if} {if (false == $wciform.hide_pbcap)}
-
{$wciform.goal_amount}
-
{$wciform.starting_amount}
+
${$wciform.goal_amount}
+
${$wciform.starting_amount}
{$wciform.pb_percentage}%
{/if} diff --git a/wci.php b/wci.php index 5b9fb66..0c5f6cc 100644 --- a/wci.php +++ b/wci.php @@ -179,7 +179,7 @@ function wci_civicrm_navigationMenu( &$params ) { '5' => array ( 'attributes' => array ( - 'label' => ts('Wci Settings'), + 'label' => ts('Widget Settings'), 'name' => 'manage_progress_bar', 'url' => 'civicrm/wci/settings?reset=1', 'permission' => 'access CiviReport,access CiviContribute',