diff --git a/framework/modules/addressbook/views/address/edit.tpl b/framework/modules/addressbook/views/address/edit.tpl index 49071d8680..9860a796c2 100755 --- a/framework/modules/addressbook/views/address/edit.tpl +++ b/framework/modules/addressbook/views/address/edit.tpl @@ -65,7 +65,8 @@ YUI(EXPONENT.YUI3_CONFIG).use('node', function(Y) { {control type=text name=zip label="Zip/Postal Code"|gettext required=true value=$record->zip} {control type="text" name="phone" label="Phone Number"|gettext|cat:" ex: 480-555-4200" required=true value=$record->phone} {control type="dropdown" name="address_type" label="Address Type"|gettext items="Business,Military,Residential"|gettxtlist values="Business,Military,Residential"|gettxtlist default=$record->address_type|default:"Residential"} - {control type="text" name="email" label="Email Address"|gettext required=true value=$record->email} + {*{control type="text" name="email" label="Email Address"|gettext required=true value=$record->email}*} + {control type=email name="email" label="Email Address"|gettext required=true value=$record->email} {if !$user->isLoggedIn()}
diff --git a/framework/modules/administration/views/administration/configure_site.tpl b/framework/modules/administration/views/administration/configure_site.tpl index 933e151e5e..2e96008b06 100755 --- a/framework/modules/administration/views/administration/configure_site.tpl +++ b/framework/modules/administration/views/administration/configure_site.tpl @@ -94,7 +94,8 @@ {group label="New User Notification Email"|gettext} {control type="checkbox" postfalse=1 name="sc[USER_REGISTRATION_SEND_NOTIF]" label="Notify a site administrator when a new user registers on your website?"|gettext checked=$smarty.const.USER_REGISTRATION_SEND_NOTIF value=1} {control type="text" name="sc[USER_REGISTRATION_NOTIF_SUBJECT]" label='Subject of the administrator\'s new user notification'|gettext value=$smarty.const.USER_REGISTRATION_NOTIF_SUBJECT} - {control type="text" name="sc[USER_REGISTRATION_ADMIN_EMAIL]" label="Email address of administrator that should be notified when a user signs up"|gettext value=$smarty.const.USER_REGISTRATION_ADMIN_EMAIL} + {*{control type="text" name="sc[USER_REGISTRATION_ADMIN_EMAIL]" label="Email address of administrator that should be notified when a user signs up"|gettext value=$smarty.const.USER_REGISTRATION_ADMIN_EMAIL}*} + {control type=email name="sc[USER_REGISTRATION_ADMIN_EMAIL]" label="Email address of administrator that should be notified when a user signs up"|gettext value=$smarty.const.USER_REGISTRATION_ADMIN_EMAIL} {/group} {group label="New User Welcome Message"|gettext} {control type="checkbox" postfalse=1 name="sc[USER_REGISTRATION_SEND_WELCOME]" label="Send an email to the user after registering?"|gettext checked=$smarty.const.USER_REGISTRATION_SEND_WELCOME value=1} @@ -159,7 +160,8 @@

{"Mail Server Settings"|gettext}

- {control type="text" name="sc[SMTP_FROMADDRESS]" label="From Address"|gettext value=$smarty.const.SMTP_FROMADDRESS description='This MUST be in a valid email address format or sending mail may fail!'|gettext} + {*{control type="text" name="sc[SMTP_FROMADDRESS]" label="From Address"|gettext value=$smarty.const.SMTP_FROMADDRESS description='This MUST be in a valid email address format or sending mail may fail!'|gettext}*} + {control type=email name="sc[SMTP_FROMADDRESS]" label="From Address"|gettext value=$smarty.const.SMTP_FROMADDRESS description='This MUST be in a valid email address format or sending mail may fail!'|gettext} {control type="checkbox" postfalse=1 name="sc[SMTP_USE_PHP_MAIL]" label='Use simplified php mail() function instead of SMTP?'|gettext checked=$smarty.const.SMTP_USE_PHP_MAIL value=1} ({"or"|gettext}) {group label="SMTP Server Settings"|gettext} diff --git a/framework/modules/core/views/expComment/edit.tpl b/framework/modules/core/views/expComment/edit.tpl index be87bb138a..ea0ad55f2c 100755 --- a/framework/modules/core/views/expComment/edit.tpl +++ b/framework/modules/core/views/expComment/edit.tpl @@ -26,10 +26,12 @@
{if $user->id == 0 || $comment->id } {control type=text name=name label="Name"|gettext required=true value=$comment->name required=1} - {control type=text name=email label="Email"|gettext required=true value=$comment->email required=1} + {*{control type=text name=email label="Email"|gettext required=true value=$comment->email required=1}*} + {control type=email name=email label="Email"|gettext required=true value=$comment->email required=1} {else} {control type=text name=name disabled=1 label="Name"|gettext value="`$user->firstname` `$user->lastname`"} - {control type=text name=email disabled=1 label="Email"|gettext value=$user->email} + {*{control type=text name=email disabled=1 label="Email"|gettext value=$user->email}*} + {control type=email name=email disabled=1 label="Email"|gettext value=$user->email} {/if} {*control type=text name=website label="Website" value=$comment->website*} {*{control type=textarea name=body label="Your Comment"|gettext rows=6 cols=35 value=$comment->body}*} diff --git a/framework/modules/ealerts/views/ealert/showall.tpl b/framework/modules/ealerts/views/ealert/showall.tpl index 4fc909be48..2124a577b9 100755 --- a/framework/modules/ealerts/views/ealert/showall.tpl +++ b/framework/modules/ealerts/views/ealert/showall.tpl @@ -24,7 +24,8 @@

{form action=signup} {'Step 1: Let us know your email address'|gettext} - {control type="text" name="email" label="Email Address"|gettext} + {*{control type="text" name="email" label="Email Address"|gettext}*} + {control type=email name="email" label="Email Address"|gettext} {'Step 2: Select your E-Alerts'|gettext} diff --git a/framework/modules/ealerts/views/ealert/subscriptions.tpl b/framework/modules/ealerts/views/ealert/subscriptions.tpl index 6926afd9ca..d75f4ccc4b 100755 --- a/framework/modules/ealerts/views/ealert/subscriptions.tpl +++ b/framework/modules/ealerts/views/ealert/subscriptions.tpl @@ -26,7 +26,8 @@ {control type="hidden" name="id" value=$subscriber->id} {control type="hidden" name="key" value=$subscriber->hash} {'Step 1: Let us know your email address'|gettext} - {control type="text" name="email" label="Email Address"|gettext value=$subscriber->email} + {*{control type="text" name="email" label="Email Address"|gettext value=$subscriber->email}*} + {control type=email name="email" label="Email Address"|gettext value=$subscriber->email} {'Step 2: Select your E-Alerts'|gettext}
diff --git a/framework/modules/ecommerce/billingcalculators/showall_quickdonation.tpl b/framework/modules/ecommerce/billingcalculators/showall_quickdonation.tpl index 50cd626a08..ea789af1bc 100644 --- a/framework/modules/ecommerce/billingcalculators/showall_quickdonation.tpl +++ b/framework/modules/ecommerce/billingcalculators/showall_quickdonation.tpl @@ -133,7 +133,8 @@
* Email Address - {control type="text" name="address[email]" value=`$record.address.email` required=1} + {*{control type="text" name="address[email]" value=`$record.address.email` required=1} *} + {control type=email name="address[email]" value=`$record.address.email` required=1}
diff --git a/framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl index 36275b3f3f..bd786ce270 100755 --- a/framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl +++ b/framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl @@ -42,7 +42,8 @@ diff --git a/framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl index 6db5f821d8..363996ac13 100755 --- a/framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl +++ b/framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl @@ -44,8 +44,9 @@
{control type="checkbox" name="email_admin" label="Send a notification that a new order was received?"|gettext value=1 checked=$calculator->configdata.email_admin} - {control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy} + {*{control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}*}
+ {control type=email name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}
{'Loading'|gettext}
diff --git a/framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl index 4b00ea6434..f236b6337f 100755 --- a/framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl +++ b/framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl @@ -49,7 +49,8 @@
{control type="checkbox" name="email_admin" label="Send a notification that a new order was received?"|gettext value=1 checked=$calculator->configdata.email_admin} - {control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy} + {*{control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}*} + {control type=email name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}
diff --git a/framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl index 9de1a516b8..3e2e8a76af 100755 --- a/framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl +++ b/framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl @@ -22,7 +22,8 @@
{*control type="checkbox" name="email_admin" label="Send a notification that a new order was received?"|gettext value=1 checked=$calculator->configdata.email_admin*} - {control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy} + {*{control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}*} + {control type=email name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}
{control type="checkbox" name="accepted_cards[]" label="Master Card" value="MasterCard"|gettext checked=$calculator->configdata.accepted_cards} diff --git a/framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl index a548bfceee..0a9f6328bd 100644 --- a/framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl +++ b/framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl @@ -36,7 +36,8 @@
{control type="checkbox" name="email_admin" label="Send a notification that a new order was received?"|gettext value=1 checked=$calculator->configdata.email_admin} - {control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy} + {*{control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}*} + {control type=email name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}
diff --git a/framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl b/framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl index 41e7c0cb66..e14606ebbd 100755 --- a/framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl +++ b/framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl @@ -26,7 +26,8 @@
{control type="text" id="registrations" name="registrants[]" label="Registrant Name:"|gettext} - {control type="text" id="registrations_emails" name="registrant_emails[]" label="Registrant Email:"|gettext} + {*{control type="text" id="registrations_emails" name="registrant_emails[]" label="Registrant Email:"|gettext}*} + {control type=email id="registrations_emails" name="registrant_emails[]" label="Registrant Email:"|gettext} {control type="text" id="registrations_phones" name="registrant_phones[]" label="Registrant Phone:"|gettext}
diff --git a/framework/modules/ecommerce/views/ecomconfig/configure.tpl b/framework/modules/ecommerce/views/ecomconfig/configure.tpl index 13a8f30261..02b9ecdb11 100755 --- a/framework/modules/ecommerce/views/ecomconfig/configure.tpl +++ b/framework/modules/ecommerce/views/ecomconfig/configure.tpl @@ -75,12 +75,14 @@

{'Notifications'|gettext}

{control type="checkbox" name="email_invoice" label="Send email notification of new orders?"|gettext value=1 checked=$config.email_invoice} - {control type="text" name="email_invoice_addresses" label="Send email notifications to (separate email addresses with a comma)"|gettext size=60 value=$config.email_invoice_addresses} + {*{control type="text" name="email_invoice_addresses" label="Send email notifications to (separate email addresses with a comma)"|gettext size=60 value=$config.email_invoice_addresses}*} + {control type=email name="email_invoice_addresses" label="Send email notifications to (separate email addresses with a comma)"|gettext size=60 value=$config.email_invoice_addresses}

{'Store Email Settings'|gettext}

{control type="text" name="from_name" label="Email From Name"|gettext value=$config.from_name} - {control type="text" name="from_address" label="Email From Address"|gettext value=$config.from_address} + {*{control type="text" name="from_address" label="Email From Address"|gettext value=$config.from_address}*} + {control type=email name="from_address" label="Email From Address"|gettext value=$config.from_address} {control type="checkbox" name="email_invoice_to_user" label="Email a copy of the invoice to the user after purchase?"|gettext value=1 checked=$config.email_invoice_to_user} {control type="text" name="invoice_subject" label="Subject of invoice email"|gettext size="40" value=$config.invoice_subject} {control type="textarea" name="invoice_msg" label="Message to put in invoice email:"|gettext rows=5 cols=45 value=$config.invoice_msg} diff --git a/framework/modules/ecommerce/views/eventregistration/eventregistration_form.tpl b/framework/modules/ecommerce/views/eventregistration/eventregistration_form.tpl index 122178a92b..14d5ce3929 100644 --- a/framework/modules/ecommerce/views/eventregistration/eventregistration_form.tpl +++ b/framework/modules/ecommerce/views/eventregistration/eventregistration_form.tpl @@ -106,7 +106,8 @@ * {'Email Address'|gettext} - {control type="text" name="address[email]" value="`$record.address.email`" required=1} + {*{control type="text" name="address[email]" value="`$record.address.email`" required=1} *} + {control type=email name="address[email]" value="`$record.address.email`" required=1} diff --git a/framework/modules/ecommerce/views/order/edit_address.tpl b/framework/modules/ecommerce/views/order/edit_address.tpl index 83eae6566a..4137b5d5e6 100755 --- a/framework/modules/ecommerce/views/order/edit_address.tpl +++ b/framework/modules/ecommerce/views/order/edit_address.tpl @@ -50,8 +50,9 @@ {control type=text name='address[zip]' label="*"|cat:"Zip Code"|gettext value=$record->zip} {control type="text" name="address[phone]" label="*"|cat:"Phone Number"|gettext|cat:" (xxx-xxx-xxxx)" value=$record->phone} - {control type="text" name="address[email]" label="*"|cat:"Email Address"|gettext value=$record->email} - + {*{control type="text" name="address[email]" label="*"|cat:"Email Address"|gettext value=$record->email}*} + {control type=email name="address[email]" label="*"|cat:"Email Address"|gettext value=$record->email} + {control type=buttongroup submit="Save Address Change"|gettext cancel="Cancel"|gettext} {/form} diff --git a/framework/modules/ecommerce/views/order/verifyReturnShopper.tpl b/framework/modules/ecommerce/views/order/verifyReturnShopper.tpl index f8fe9ea41e..8d96b0a444 100755 --- a/framework/modules/ecommerce/views/order/verifyReturnShopper.tpl +++ b/framework/modules/ecommerce/views/order/verifyReturnShopper.tpl @@ -29,7 +29,8 @@

{'Verify the following information from your previous session to restore your shopping cart:'|gettext}{br}

{form name="verifyAndRestoreCartForm" controller="order" action="verifyAndRestoreCart"} {control type="text" name="lastname" id="lastname" label="Last Name:"|gettext} - {control type="text" name="email" id="email" label="Email Address:"|gettext} + {*{control type="text" name="email" id="email" label="Email Address:"|gettext}*} + {control type=email name="email" id="email" label="Email Address:"|gettext} {control type="text" name="zip_code" id="zip_code" label="Zip Code:"|gettext} {control type="buttongroup" submit="Verify"|gettext} {/form} diff --git a/framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl b/framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl index e34b24982f..3105080c24 100644 --- a/framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl +++ b/framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl @@ -20,12 +20,13 @@ {control type="textarea" name="vendor[body]" label="Vendor Notes"|gettext rows=5 cols=85 value=$vendor->body} {control type="text" name="vendor[address1]" label="Address 1"|gettext value=$vendor->address1} {control type="text" name="vendor[address2]" label="Address 2"|gettext value=$vendor->address2} - {control type=text name="vendor[city]" label="City"|gettext value=$vendor->address1} + {control type=text name="vendor[city]" label="City"|gettext value=$vendor->city} {control type=state name="vendor[state]" label="State"|gettext value=$vendor->state} {control type=text name="vendor[zip]" label="Zip Code"|gettext value=$vendor->zip} {control type="text" name="vendor[phone]" label="Phone Number"|gettext|cat:" (xxx-xxx-xxxx)" value=$vendor->phone} - {control type="text" name="vendor[fax]" label="Fax"|gettext value=$vendor->email} + {control type="text" name="vendor[fax]" label="Fax"|gettext value=$vendor->fax} {control type="text" name="vendor[website]" label="Website"|gettext value=$vendor->website} - {control type="text" name="vendor[email]" label="Email Address"|gettext value=$vendor->email} + {*{control type="text" name="vendor[email]" label="Email Address"|gettext value=$vendor->email}*} + {control type=email name="vendor[email]" label="Email Address"|gettext value=$vendor->email} {control type="buttongroup" submit="Submit"|gettext cancel="Cancel"|gettext} {/form} \ No newline at end of file diff --git a/framework/modules/events/views/event/configure/reminders.tpl b/framework/modules/events/views/event/configure/reminders.tpl index 4f418b42c3..a40ba5d2db 100644 --- a/framework/modules/events/views/event/configure/reminders.tpl +++ b/framework/modules/events/views/event/configure/reminders.tpl @@ -35,8 +35,10 @@ {group label="Email Details"|gettext} {control type="text" name="email_title_reminder" label="Message Subject Prefix"|gettext value=$config.email_title_reminder} {control type="text" name="email_from_reminder" label="From (Display)"|gettext value=$config.email_from_reminder} -{control type="text" name="email_address_reminder" label="From (Email Address)"|gettext value=$config.email_address_reminder} -{control type="text" name="email_reply_reminder" label="Reply-to"|gettext value=$config.email_reply_reminder} +{*{control type="text" name="email_address_reminder" label="From (Email Address)"|gettext value=$config.email_address_reminder}*} +{control type=email name="email_address_reminder" label="From (Email Address)"|gettext value=$config.email_address_reminder} +{*{control type="text" name="email_reply_reminder" label="Reply-to"|gettext value=$config.email_reply_reminder}*} +{control type=email name="email_reply_reminder" label="Reply-to"|gettext value=$config.email_reply_reminder} {control type="checkbox" name="email_showdetail" label="Show event details in message?"|gettext value=1 checked=$config.email_showdetail} {control type="textarea" name="email_signature" label="Email Signature"|gettext value=$config.email_signature} {/group} \ No newline at end of file diff --git a/framework/modules/events/views/event/edit.tpl b/framework/modules/events/views/event/edit.tpl index b98cfe9fcd..f01646b043 100644 --- a/framework/modules/events/views/event/edit.tpl +++ b/framework/modules/events/views/event/edit.tpl @@ -70,7 +70,8 @@ {if $config.enable_feedback}
{control type=dropdown name=feedback_form label="Feedback Form"|gettext items=$allforms items=$allforms value=$record->feedback_form} - {control type=text name=feedback_email label="Feedback Email"|gettext value=$record->feedback_email} + {*{control type=text name=feedback_email label="Feedback Email"|gettext value=$record->feedback_email}*} + {control type=email name=feedback_email label="Feedback Email"|gettext value=$record->feedback_email}
{/if} {if $config.enable_images} diff --git a/framework/modules/events/views/event/email/Contact Form.tpl b/framework/modules/events/views/event/email/Contact Form.tpl index 5ff16a91ff..91df46b7c5 100644 --- a/framework/modules/events/views/event/email/Contact Form.tpl +++ b/framework/modules/events/views/event/email/Contact Form.tpl @@ -18,7 +18,8 @@ {form action=send_feedback} {control type=hidden name=formname value=$feedback_form} {control type=hidden name=id value=$event->id} - {control type=text name=email label="Your Email Address"|gettext} + {*{control type=text name=email label="Your Email Address"|gettext}*} + {control type=email name=email label="Your Email Address"|gettext} {control type=text name=subject label="Subject"|gettext} {control type="textarea" name="message" label='Message'|gettext} {control type=buttongroup submit="Send"|gettext} diff --git a/framework/modules/events/views/event/email/RSVP Form.tpl b/framework/modules/events/views/event/email/RSVP Form.tpl index 817aa15c93..1a0c14298c 100644 --- a/framework/modules/events/views/event/email/RSVP Form.tpl +++ b/framework/modules/events/views/event/email/RSVP Form.tpl @@ -20,7 +20,8 @@ {control type=hidden name=id value=$event->id} {control type=hidden name=subject value="RSVP for {$event->event->title}"} {control type=text name=name label="Your Name"|gettext} - {control type=text name=email label="Your Email Address"|gettext} + {*{control type=text name=email label="Your Email Address"|gettext}*} + {control type=email name=email label="Your Email Address"|gettext} {control type=text name=phone label="Your Phone"|gettext} {control type=text name=attendees label="Number of Attendees"|gettext} {control type="textarea" name="comments" label='Comments'|gettext} diff --git a/framework/modules/faq/views/faq/ask_question.tpl b/framework/modules/faq/views/faq/ask_question.tpl index 3abb8d10b2..095a1d0df3 100755 --- a/framework/modules/faq/views/faq/ask_question.tpl +++ b/framework/modules/faq/views/faq/ask_question.tpl @@ -31,10 +31,12 @@ {*{control type="text" name="submitter_email" label="Your Email Address"|gettext value=$record->submitter_email}*} {if $user->id == 0 || $comment->id } {control type=text name="submitter_name" label="Your Name"|gettext required=true value=$record->submitter_name} - {control type=text name="submitter_email" label="Your Email Address"|gettext required=true value=$record->submitter_email} + {*{control type=text name="submitter_email" label="Your Email Address"|gettext required=true value=$record->submitter_email}*} + {control type=email name="submitter_email" label="Your Email Address"|gettext required=true value=$record->submitter_email} {else} {control type=text name="submitter_name" disabled=1 label="Your Name"|gettext value="`$user->firstname` `$user->lastname`"} - {control type=text name="submitter_email" disabled=1 label="Your Email Address"|gettext value=$user->email} + {*{control type=text name="submitter_email" disabled=1 label="Your Email Address"|gettext value=$user->email}*} + {control type=email name="submitter_email" disabled=1 label="Your Email Address"|gettext value=$user->email} {/if} {control type="textarea" name="question" label="Your Question"|gettext value=$record->question} {control type="buttongroup" submit="Submit Question"|gettext cancel="Cancel"|gettext} diff --git a/framework/modules/faq/views/faq/configure/FAQ_Email.tpl b/framework/modules/faq/views/faq/configure/FAQ_Email.tpl index 33ede505b8..1130f5154d 100755 --- a/framework/modules/faq/views/faq/configure/FAQ_Email.tpl +++ b/framework/modules/faq/views/faq/configure/FAQ_Email.tpl @@ -16,11 +16,13 @@ {group label="Email Notification"|gettext} {control type="checkbox" name="notify_of_new_question" label="Send email notification of new questions"|gettext value=1 checked=$config.notify_of_new_question} {control type="text" name="notification_email_subject" label="Subject of Email Notification"|gettext value=$config.notification_email_subject|default:'Someone asked a question'|gettext} -{control type="text" name="notification_email_address" label="Email address of the person to notify"|gettext value=$config.notification_email_address|default:$smarty.const.SMTP_FROMADDRESS} +{*{control type="text" name="notification_email_address" label="Email address of the person to notify"|gettext value=$config.notification_email_address|default:$smarty.const.SMTP_FROMADDRESS}*} +{control type="email" name="notification_email_address" label="Email address of the person to notify"|gettext value=$config.notification_email_address|default:$smarty.const.SMTP_FROMADDRESS} {/group} {group label="Answer Reply Default Settings"|gettext}
{'These default settings are used when emailing answers to users who have submitted a question'|gettext}
{control type="text" name="answer_subject" label="Email Subject"|gettext value=$config.answer_subject|default:'Your question was answered'|gettext} -{control type="text" name="answer_from_address" label="Email From Address (leave blank to use site default)"|gettext value=$config.answer_from_address|default:$smarty.const.SMTP_FROMADDRESS} +{*{control type="text" name="answer_from_address" label="Email From Address (leave blank to use site default)"|gettext value=$config.answer_from_address|default:$smarty.const.SMTP_FROMADDRESS}*} +{control type=email name="answer_from_address" label="Email From Address (leave blank to use site default)"|gettext value=$config.answer_from_address|default:$smarty.const.SMTP_FROMADDRESS} {control type="text" name="answer_from_name" label="Email From Name"|gettext value=$config.answer_from_name} {/group} \ No newline at end of file diff --git a/framework/modules/faq/views/faq/edit.tpl b/framework/modules/faq/views/faq/edit.tpl index b6126f8e56..06cb130dda 100755 --- a/framework/modules/faq/views/faq/edit.tpl +++ b/framework/modules/faq/views/faq/edit.tpl @@ -19,7 +19,8 @@ {form action="update"} {control type="hidden" name="id" value=$record->id} {control type="text" name="submitter_name" label="Name of submitter"|gettext value=$record->submitter_name|default:$user->username} - {control type="text" name="submitter_email" label='Submitter\'s Email'|gettext value=$record->submitter_email|default:$user->email} + {*{control type="text" name="submitter_email" label='Submitter\'s Email'|gettext value=$record->submitter_email|default:$user->email}*} + {control type=email name="submitter_email" label='Submitter\'s Email'|gettext value=$record->submitter_email|default:$user->email} {control type="checkbox" name="send_email" label="Send email to user"|gettext|cat:"?" value=1} {control type="textarea" name="question" label="Question"|gettext value=$record->question} {control type="html" name="answer" label="Answer"|gettext value=$record->answer} diff --git a/framework/modules/report/views/report/order_report.tpl b/framework/modules/report/views/report/order_report.tpl index 28a888259f..8c36169ef5 100755 --- a/framework/modules/report/views/report/order_report.tpl +++ b/framework/modules/report/views/report/order_report.tpl @@ -129,7 +129,8 @@ - {control type="text" name="email" label="An Email Address Containing"|gettext value=$record->email} + {*{control type="text" name="email" label="An Email Address Containing"|gettext value=$record->email}*} + {control type=email name="email" label="An Email Address Containing"|gettext value=$record->email} diff --git a/framework/modules/users/views/users/edituser.tpl b/framework/modules/users/views/users/edituser.tpl index 1dbed1c754..69e860148c 100755 --- a/framework/modules/users/views/users/edituser.tpl +++ b/framework/modules/users/views/users/edituser.tpl @@ -45,7 +45,8 @@ {if $smarty.const.USER_REGISTRATION_USE_EMAIL == 0} {control type=text name=username label="Username"|gettext value=$edit_user->username required=1} {else} - {control type=text name=email label="Email Address"|gettext value=$edit_user->email required=1} + {*{control type=text name=email label="Email Address"|gettext value=$edit_user->email required=1}*} + {control type=email name=email label="Email Address"|gettext value=$edit_user->email required=1} {/if} {control type=password name=pass1 label="Password"|gettext required=1} {control type=password name=pass2 label="Confirm Password"|gettext required=1} @@ -54,7 +55,8 @@ {/if} {control type="hidden" name="userkey" value=$userkey} {if $smarty.const.USER_REGISTRATION_USE_EMAIL == 0} - {control type=text name=email label="Email Address"|gettext value=$edit_user->email} + {*{control type=text name=email label="Email Address"|gettext value=$edit_user->email}*} + {control type=email name=email label="Email Address"|gettext value=$edit_user->email} {/if} {control type=text name=firstname label="First Name"|gettext value=$edit_user->firstname} {control type=text name=lastname label="Last Name"|gettext value=$edit_user->lastname}