From d6f6b78f24dab44e087e48ea9355b925303b3b95 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Thu, 29 Jun 2017 11:22:37 +1000 Subject: [PATCH] theme tweaks --- booking.module | 15 ++-- ...mimemail-message-registration_mail.tpl.php | 79 ++++++++----------- 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/booking.module b/booking.module index 86322fd..66e1034 100644 --- a/booking.module +++ b/booking.module @@ -824,20 +824,23 @@ function booking_node_access($node, $op, $account) { * Implementation of hook_theme(). */ function booking_theme($existing, $type, $theme, $path) { - if($type == 'module') - { + if($type == 'module') { + $theme_path = drupal_get_path('module', 'booking'). '/theme'; + // if our more heavily customised template exists, use that, otherwise fall back to the generic one + $template_file = is_file($theme_path . '/mimemail-message-registration_mail.tpl.php') ? '/mimemail-message-registration_mail' : '/mimemail-message'; + return array( - 'booking_details' => array('arguments' => array('node' => NULL)), + 'booking_details' => array('arguments' => array('node' => NULL)), 'booking_htmlmail_template' => array( 'variables' => array('module' => NULL, 'key' => NULL, 'css' => NULL, 'recipient' => NULL, 'subject' => NULL, 'body' => NULL, 'message' => array()), - 'path' => drupal_get_path('module', 'booking'). '/theme', + 'path' => $theme_path, 'template' => 'mimemail-message' // extension of .tpl.php automatically added ), 'booking_htmlmail_registration_mail' => array( 'variables' => array('subject' => NULL, 'body' => NULL), - 'path' => drupal_get_path('module', 'booking'). '/theme', + 'path' => $theme_path, 'image_path' => drupal_get_path('module', 'booking'). '/images', - 'template' => 'mimemail-message-registration_mail' // extension of .tpl.php automatically added + 'template' => $template_file, ), ); } diff --git a/theme/mimemail-message-registration_mail.tpl.php b/theme/mimemail-message-registration_mail.tpl.php index 9dbe405..bbe9da8 100644 --- a/theme/mimemail-message-registration_mail.tpl.php +++ b/theme/mimemail-message-registration_mail.tpl.php @@ -1,22 +1,3 @@ -" - */ -?> - - + @@ -179,7 +159,7 @@ a[x-apple-data-detectors=true] {
-
 
+
 
@@ -199,10 +179,12 @@ a[x-apple-data-detectors=true] {
+ +
-
 
Image -
 
+
 
Image +
 
@@ -246,7 +228,7 @@ a[x-apple-data-detectors=true] {
- Resources + Resources
@@ -265,7 +247,7 @@ a[x-apple-data-detectors=true] {
- Who's Coming + Who's Coming
@@ -290,7 +272,7 @@ a[x-apple-data-detectors=true] {
-

+

@@ -306,15 +288,15 @@ a[x-apple-data-detectors=true] {
-
 
+
 
-
-

Our preferred method of contact is via email.
info@studyweek.net

 

If you have an enquiry regarding your booking.
bookings@studyweek.net

 

Need to speak to the right person?
Speak to our bookings coordinator - 0423 637 024

+
+

Our preferred method of contact is via email.
info@studyweek.net

 

If you have an enquiry regarding your booking.
bookings@studyweek.net

 

Need to speak to the right person?
Speak to our bookings coordinator - 0423 637 024

@@ -322,33 +304,42 @@ a[x-apple-data-detectors=true] {
-
 
-
- - +
 
+
+ +
- + Facebook -
 
+
 
- - + +
+
- + Twitter -
 
+
 
+
+ + +
+ + Instagram + +
 
- - Google+ + + YouTube -
 
+
 
@@ -359,7 +350,7 @@ a[x-apple-data-detectors=true] {
-
 
+