Commit 5e59ce48 authored by Seamus Lee's avatar Seamus Lee

#527 Add in abiity to set translated text for Submit and Cancel button text

Convert to using entity fields style adding to form
parent ac5895d2
......@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Core/UFGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:e5e629c4f6d56d238b4ac28e822cea8a)
* (GenCodeChecksum:0f78fb49440e1cf5d43fd3db5a43ee7e)
*/
/**
......@@ -551,6 +551,9 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
'entity' => 'UFGroup',
'bao' => 'CRM_Core_BAO_UFGroup',
'localizable' => 1,
'html' => [
'type' => 'Text',
],
],
'submit_button_text' => [
'name' => 'submit_button_text',
......@@ -564,6 +567,9 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
'entity' => 'UFGroup',
'bao' => 'CRM_Core_BAO_UFGroup',
'localizable' => 1,
'html' => [
'type' => 'Text',
],
],
'add_cancel_button' => [
'name' => 'add_cancel_button',
......
......@@ -38,6 +38,12 @@ class CRM_UF_Form_AdvanceSetting extends CRM_UF_Form_Group {
* @param CRM_Core_Form $form
*/
public static function buildAdvanceSetting(&$form) {
$entityFields = [
'cancel_button_text',
'submit_button_text',
];
$form->assign('advancedFieldsConverted', $entityFields);
// should mapping be enabled for this group
$form->addElement('checkbox', 'is_map', ts('Enable mapping for this profile?'));
......@@ -53,8 +59,6 @@ class CRM_UF_Form_AdvanceSetting extends CRM_UF_Form_Group {
$form->add('advcheckbox', 'add_cancel_button', ts('Include Cancel Button?'));
$form->addElement('text', 'cancel_URL', ts('Cancel Redirect URL'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'cancel_URL'));
$form->addElement('text', 'cancel_button_text', ts('Cancel Button Text'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'cancel_button_text'));
$form->addElement('text', 'submit_button_text', ts('Submit Button Text'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'submit_button_text'));
// add select for groups
$group = array('' => ts('- select -')) + $form->_group;
......
......@@ -64,7 +64,9 @@ class CRM_UF_Form_Group extends CRM_Core_Form {
'title' => ['name' => 'title'],
'frontend_title' => ['name' => 'frontend_title'],
'description' => ['name' => 'description', 'help' => ['id' => 'id-description', 'file' => 'CRM/UF/Form/Group.hlp']],
'uf_group_type' => ['name' => 'uf_group_type', 'not-auto-addable' => TRUE, 'help' => ['id' => 'id-used_for', 'file' => 'CRM/UF/Form/Group.hlp'], 'post_html_text' => ' ' . $this->getOtherModuleString()]
'uf_group_type' => ['name' => 'uf_group_type', 'not-auto-addable' => TRUE, 'help' => ['id' => 'id-used_for', 'file' => 'CRM/UF/Form/Group.hlp'], 'post_html_text' => ' ' . $this->getOtherModuleString()],
'cancel_button_text' => ['name' => 'cancel_button_text', 'help' => ['id' => 'id-cancel_button_text', 'file' => 'CRM/UF/Form/Group.hlp'], 'class' => 'cancel_button_section'],
'submit_button_text' => ['name' => 'submit_button_text', 'help' => ['id' => 'id-submit_button_text', 'file' => 'CRM/UF/Form/Group.hlp'], 'class' => ''],
];
}
......
......@@ -60,15 +60,12 @@
<td>{$form.cancel_URL.html} {help id='id-cancel_URL' file="CRM/UF/Form/Group.hlp"}</td>
</tr>
<tr class="cancel_button_section crm-uf-advancesetting-form-block-cancel_button_text">
<td class="label">{$form.cancel_button_text.label}</td>
<td>{$form.cancel_button_text.html} {help id='id-cancel_button_text' file="CRM/UF/Form/Group.hlp"}</td>
</tr>
<tr class="crm-uf-advancesetting-form-block-submit_button_text">
<td class="label">{$form.submit_button_text.label}</td>
<td>{$form.submit_button_text.html} {help id='id-submit_button_text' file="CRM/UF/Form/Group.hlp"}</td>
</tr>
{foreach from=$advancedFieldsConverted item=fieldName}
{assign var=fieldSpec value=$entityFields.$fieldName}
<tr class="crm-{$entityInClassFormat}-form-block-{$fieldName} {$fieldSpec.class}">
{include file="CRM/Core/Form/Field.tpl"}
</tr>
{/foreach}
<tr class="crm-uf-advancesetting-form-block-add_captcha">
<td class="label"></td>
......
......@@ -47,10 +47,12 @@
{else}
<table class="form-layout">
{foreach from=$entityFields item=fieldSpec}
{assign var=fieldName value=$fieldSpec.name}
<tr class="crm-{$entityInClassFormat}-form-block-{$fieldName}">
{include file="CRM/Core/Form/Field.tpl"}
</tr>
{if not in_array($fieldSpec.name, $advancedFieldsConverted)}
{assign var=fieldName value=$fieldSpec.name}
<tr class="crm-{$entityInClassFormat}-form-block-{$fieldName}">
{include file="CRM/Core/Form/Field.tpl"}
</tr>
{/if}
{/foreach}
<tr class="crm-uf_group-form-block-weight" >
<td class="label">{$form.weight.label}{if $config->userSystem->is_drupal EQ '1'} {help id='id-profile_weight' file="CRM/UF/Form/Group.hlp"}{/if}</td>
......
......@@ -281,6 +281,9 @@
<default>NULL</default>
<localizable>true</localizable>
<add>4.7</add>
<html>
<type>Text</type>
</html>
</field>
<field>
<name>submit_button_text</name>
......@@ -291,6 +294,9 @@
<default>NULL</default>
<localizable>true</localizable>
<add>4.7</add>
<html>
<type>Text</type>
</html>
</field>
<field>
<name>add_cancel_button</name>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment