diff --git a/booking.mailtemplate_admin.inc b/booking.mailtemplate_admin.inc
index dc1f358..c99740c 100644
--- a/booking.mailtemplate_admin.inc
+++ b/booking.mailtemplate_admin.inc
@@ -10,29 +10,16 @@
global $event;
$form = array();
$header_link_max_count = 3;
- $social_media_link_max_count = 5;
+ $social_media_link_max_count = 3;
$prefix = "Configure HTML email template
";
+ // load any existing values from the drupal variable table
$colors = json_decode(variable_get('booking_mailtemplate_colors'), TRUE);
$header_links = json_decode(variable_get('booking_mailtemplate_header_links'), TRUE);
$social_links = json_decode(variable_get('booking_mailtemplate_social_links'), TRUE);
- watchdog('booking_debug', "Mail template navigation links loaded\n@info
", array('@info' => print_r($header_links, true)));
-
- /*
- //query for existing header links
- $query = db_select('booking_mailtemplate_fields', 'm');
- $query->condition('m.booking_mailtemplate_media_type', 'header', '=');
- $query->fields('m');
- $header_links = $query->execute()->fetchAllAssoc('mid');
-
- //query for existing social media links
- $query = db_select('booking_mailtemplate_fields', 'm');
- $query->condition('m.booking_mailtemplate_media_type', 'socialmedia', '=');
- $query->fields('m');
- $social_media_links = $query->execute()->fetchAllAssoc('mid');
- */
+ //watchdog('booking_debug', "Mail template navigation links loaded\n@info
", array('@info' => print_r($header_links, true)));
$form['colors'] = array(
'#type' => 'fieldset',
@@ -79,7 +66,15 @@
'#size' => 10,
'#maxlength' => 50,
'#default_value' => empty($colors['booking_mailtemplate_text_color']) ? '#FFFFFF' : $colors['booking_mailtemplate_text_color'],
- );
+ );
+ $form['colors']['booking_mailtemplate_subjectheading_text_color'] = array (
+ '#type' => 'textfield',
+ '#title' => t('Subject Heading Text Colour'),
+ '#description' => t('Specify CSS compatible value'),
+ '#size' => 10,
+ '#maxlength' => 50,
+ '#default_value' => empty($colors['booking_mailtemplate_subjectheading_text_color']) ? '#FFFFFF' : $colors['booking_mailtemplate_subjectheading_text_color'],
+ );
$form['colors']['booking_mailtemplate_link_color'] = array (
'#type' => 'textfield',
'#title' => t('Link Colour'),
@@ -140,7 +135,7 @@
'#collapsed' => TRUE,
);
- //add form elements for header links
+ //add form elements for social media links
for ($i = 1; $i <= $social_media_link_max_count; $i++) {
$social_link_text = 'booking_mailtemplate_sociallink_text' . $i;
$social_image_url = 'booking_mailtemplate_socialimage_url' . $i;
@@ -150,21 +145,21 @@
'#title' => t('Hover text for social link ' . $i),
'#size' => 150,
'#maxlength' => 300,
- '#default_value' => variable_get($social_link_text, 'Link Title'),
+ '#default_value' => empty($social_links[$i]['text']) ? '' : $social_links[$i]['text'],
);
$form['social-links'][$social_image_url] = array(
'#type' => 'textfield',
'#title' => t('URL to social image ' . $i),
'#size' => 150,
'#maxlength' => 500,
- '#default_value' => variable_get($social_image_url, $GLOBALS['base_url'] . '/sites/all/modules/booking/images/logo.png'),
+ '#default_value' => empty($social_links[$i]['imageurl']) ? $GLOBALS['base_url'] : $social_links[$i]['imageurl'],
);
$form['social-links'][$social_link_url] = array(
'#type' => 'textfield',
'#title' => t('URL for social link ' . $i),
'#size' => 150,
'#maxlength' => 500,
- '#default_value' => variable_get($social_link_url, $GLOBALS['base_url']),
+ '#default_value' => empty($social_links[$i]['linkurl']) ? $GLOBALS['base_url'] : $social_links[$i]['linkurl'],
);
}
@@ -185,18 +180,16 @@
function booking_mailtemplate_form_submit($form, &$form_state)
{
global $event;
- $values = $form_state['input'];
- $colors_variable_list = array('booking_mailtemplate_background_color', 'booking_mailtemplate_content_background_color',
- 'booking_mailtemplate_navigation_background_color',
- 'booking_mailtemplate_header_background_color', 'booking_mailtemplate_text_color', 'booking_mailtemplate_link_color',
- );
- $header_links_variable_list = array();
- $social_links_variable_list = array();
-
$color_data = array();
$header_data = array();
$social_data = array();
- // 'booking_mailtemplate_header_image_url', 'booking_mailtemplate_header_link_url');
+
+ $values = $form_state['input'];
+ $colors_variable_list = array('booking_mailtemplate_background_color', 'booking_mailtemplate_content_background_color',
+ 'booking_mailtemplate_navigation_background_color', 'booking_mailtemplate_subjectheading_text_color',
+ 'booking_mailtemplate_header_background_color', 'booking_mailtemplate_text_color', 'booking_mailtemplate_link_color',
+ 'booking_mailtemplate_header_image_url', 'booking_mailtemplate_header_link_url',
+ );
//set all the values that are just using the builtin drupal variable definitions
foreach ($values as $key => $value) {
@@ -204,6 +197,7 @@ function booking_mailtemplate_form_submit($form, &$form_state)
//variable_set($key, $value);
$color_data[$key] = $value;
}
+ // update navigation header links
elseif (strpos($key, "booking_mailtemplate_headerlink") === 0) {
//get the ID for this header navigation link
preg_match("/.*(\d+)$/", $key, $matches);
@@ -213,15 +207,23 @@ function booking_mailtemplate_form_submit($form, &$form_state)
'link' => $values['booking_mailtemplate_headerlink_url' . $id],
);
}
+ // update social media links
+ elseif (strpos($key, "booking_mailtemplate_social") === 0) {
+ //get the ID for this header navigation link
+ preg_match("/.*(\d+)$/", $key, $matches);
+ $id = $matches[1];
+ $social_data[$id] = array(
+ 'text' => $values['booking_mailtemplate_sociallink_text' . $id],
+ 'imageurl' => $values['booking_mailtemplate_socialimage_url' . $id],
+ 'linkurl' => $values['booking_mailtemplate_sociallink_url' . $id],
+ );
+ }
}
- watchdog('booking_debug', "Mail template navigation links\n@info
", array('@info' => print_r($header_data, true)));
+ //watchdog('booking_debug', "Mail template navigation links\n@info
", array('@info' => print_r($header_data, true)));
+ // store the data into the standard drupal variable table
variable_set('booking_mailtemplate_colors', json_encode($color_data));
variable_set('booking_mailtemplate_header_links', json_encode($header_data));
-
- //update header links
-
- //update social media links
-
+ variable_set('booking_mailtemplate_header_links', json_encode($header_data));
}
\ No newline at end of file
diff --git a/theme/mimemail-message-registration_mail.tpl.php b/theme/mimemail-message-registration_mail.tpl.php
index cbeb36e..ed33c14 100644
--- a/theme/mimemail-message-registration_mail.tpl.php
+++ b/theme/mimemail-message-registration_mail.tpl.php
@@ -220,7 +220,7 @@ max-width: 100% !important; } }
-
+
@@ -252,7 +252,7 @@ max-width: 100% !important; } }
-
+
@@ -283,33 +283,19 @@ max-width: 100% !important; } }
- 
- 
-