From f6a0fdebfefefb71a96601afb9050fb3f8df6e98 Mon Sep 17 00:00:00 2001 From: manolobevia Date: Wed, 29 Jun 2011 20:48:32 +0000 Subject: [PATCH] NIHVIVO-2796: Re-factored contact form templates --- .../body/contactForm/contactForm-backup.ftl | 8 ++-- .../body/contactForm/contactForm-email.ftl | 14 +++++-- .../body/contactForm/contactForm-error.ftl | 13 +++---- .../body/contactForm/contactForm-form.ftl | 38 +++++++++---------- 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl index dd38b47b3..981b57ca0 100644 --- a/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl +++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl @@ -5,12 +5,14 @@

${datetime}

<#if spamReason??> -
+
+ ${msgText} -
+
\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl index 5c0ac1fad..06e04779e 100644 --- a/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl +++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl @@ -8,15 +8,21 @@ ${subject} +

${subject}

+ +

From: ${name}

+ +

Email address: ${emailAddress}

+

- From: ${name}
- Email address: ${emailAddress}
IP address: ${ip}
<#if referrer??> - Likely viewing page: ${referrer}
+ Likely viewing page: ${referrer} - Comments: ${comments} +

+ +

Comments: ${comments}

\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl index d37a48342..7027d14e3 100644 --- a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl +++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl @@ -4,13 +4,10 @@

${title}

- <#if errorMessage?has_content> - -
-

${errorMessage}

-
- - - +<#if errorMessage?has_content> +
+

${errorMessage}

+
+

Return to the home page.

\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl index c56f0d5ad..db4501468 100644 --- a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl +++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl @@ -2,38 +2,36 @@ <#-- Contact form --> -
- +

${title}

Thank you for your interest in ${siteName}. Please submit this form with questions, comments, or feedback about the content of this site.

-
- - - - - + + + + + + - -

- -

- - - + + + + + +
- +
Thank you!

+ +

* required fields

- -
+ +${stylesheets.add('')} ${scripts.add('')}