drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

change default for meta token

Browse Source
This commit is contained in:
Nathan Coad
2018-06-17 10:16:35 +10:00
parent 33899cc483
commit 638e0807ac
2 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.admin.inc
View File

@@ -739,8 +739,8 @@ function booking_admin() {
'#title' => t('Leader/Helper Pair Format'), '#title' => t('Leader/Helper Pair Format'),
'#default_value' => variable_get('booking_studygroup_leaderhelperpair_text', '#default_value' => variable_get('booking_studygroup_leaderhelperpair_text',
'<b>[meta-booking:studygroup-role]</b> for <b>[meta-booking:studygroup-descrip]</b>. ' . '<b>[meta-booking:studygroup-role]</b> for <b>[meta-booking:studygroup-descrip]</b>. ' .
'Your <b>[meta-booking:studygroup-otherrole]</b> is <b>[meta-booking:studygroup-othername]</b>. ' . 'Your [meta-booking:studygroup-otherrole] is <b>[meta-booking:studygroup-othername]</b>. ' .
'You can contact them on <b>[meta-booking:studygroup-otherphone]</b> or <b>[meta-booking:studygroup-otheremail]</b>.' 'You can contact them on [meta-booking:studygroup-otherphone] or [meta-booking:studygroup-otheremail].'
), ),
'#description' => 'List element definition (using tokens) for token [booking:leaderhelper-pair], which is the study group leader/helper pair information in emails. ' . '#description' => 'List element definition (using tokens) for token [booking:leaderhelper-pair], which is the study group leader/helper pair information in emails. ' .
'Note: Don\'t add the li tags, they will be added automatically.', 'Note: Don\'t add the li tags, they will be added automatically.',

25
booking.helper.inc
View File

@@ -1643,22 +1643,6 @@ function _booking_studygroup_email_summary($node) {
// Make sure there is only HTML in the admin-entered text // Make sure there is only HTML in the admin-entered text
$list_element_text = check_markup($list_element_text, 'full_html', '', FALSE); $list_element_text = check_markup($list_element_text, 'full_html', '', FALSE);
$rows[] = token_replace($list_element_text, $tokens); $rows[] = token_replace($list_element_text, $tokens);
/*
// Add some boldness if we're using html email
if(variable_get('booking_enable_html_mail', 0) == 1) {
$rows[] = t('<b>!role</b> for group <b>!descrip</b>, which will occur on <b>!weekday</b>. <b>!explan</b>', array(
'!descrip' => $studygroup->booking_studygroup_descrip, '!weekday' => $studygroup->booking_studygroup_weekday,
'!explan' => $studygroup->booking_studygroup_explanation, '!role' => _booking_studygroup_role_lookup($node->$roleid),
));
}
// Otherwise just leave things plain
else {
$rows[] = t('!role for group !descrip, which will occur on !weekday. !explan', array(
'!descrip' => $studygroup->booking_studygroup_descrip, '!weekday' => $studygroup->booking_studygroup_weekday,
'!explan' => $studygroup->booking_studygroup_explanation, '!role' => _booking_studygroup_role_lookup($node->$roleid),
));
}
*/
} // End checking for empty studygroup session } // End checking for empty studygroup session
} // End foreach loop } // End foreach loop
@@ -1758,17 +1742,12 @@ function _booking_leader_helper_email_summary($node) {
$list_element_text = variable_get('booking_studygroup_leaderhelperpair_text', $list_element_text = variable_get('booking_studygroup_leaderhelperpair_text',
'<b>[meta-booking:studygroup-role]</b> for <b>[meta-booking:studygroup-descrip]</b>. ' . '<b>[meta-booking:studygroup-role]</b> for <b>[meta-booking:studygroup-descrip]</b>. ' .
'Your <b>[meta-booking:studygroup-otherrole]</b> is <b>[meta-booking:studygroup-othername]</b>. ' . 'Your [meta-booking:studygroup-otherrole] is <b>[meta-booking:studygroup-othername]</b>. ' .
'You can contact them on <b>[meta-booking:studygroup-otherphone]</b> or <b>[meta-booking:studygroup-otheremail]</b>.' 'You can contact them on [meta-booking:studygroup-otherphone] or [meta-booking:studygroup-otheremail].'
); );
// Make sure there is only HTML in the admin-entered text // Make sure there is only HTML in the admin-entered text
$list_element_text = check_markup($list_element_text, 'full_html', '', FALSE); $list_element_text = check_markup($list_element_text, 'full_html', '', FALSE);
$rows[] = token_replace($list_element_text, $tokens); $rows[] = token_replace($list_element_text, $tokens);
//$rows[] = t('<li>!role for !descrip. Your !otherrole is !other. You can contact them on !phone or !email.</li>',
// array('!role' => $role, '!id' => $studygroup->sid, '!descrip' => $studygroup->booking_studygroup_descrip,
// '!otherrole' => $otherrole, '!other' => $otherperson_name, '!phone' => $otherperson_phone, '!email' => $otherperson_email,
//));
} }
} }
} }