Skip to content

Commit

Permalink
Changes all email address inputs to new html5 email input type [#885]
Browse files Browse the repository at this point in the history
  • Loading branch information
@dleffler
dleffler committed Mar 19, 2013
1 parent 801292f commit ed3c98f
Show file tree
Hide file tree
Showing 26 changed files with 69 additions and 36 deletions.
3 changes: 2 additions & 1 deletion framework/modules/addressbook/views/address/edit.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:" <span class=\"example\">ex: 480-555-4200</span>" 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()}

<div id="passwordDiv">
Expand Down
6 changes: 4 additions & 2 deletions framework/modules/administration/views/administration/configure_site.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -159,7 +160,8 @@
</div>
<h2>{"Mail Server Settings"|gettext}</h2>
</div>
{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}
Expand Down
6 changes: 4 additions & 2 deletions framework/modules/core/views/expComment/edit.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@
<div id="commentinput"></div>
{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}*}
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ealerts/views/ealert/showall.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
</p>
{form action=signup}
<strong>{'Step 1: Let us know your email address'|gettext}</strong>
{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}

<strong>{'Step 2: Select your E-Alerts'|gettext}</strong>
<table class="exp-skin-table">
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ealerts/views/ealert/subscriptions.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
{control type="hidden" name="id" value=$subscriber->id}
{control type="hidden" name="key" value=$subscriber->hash}
<strong>{'Step 1: Let us know your email address'|gettext}</strong>
{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}

<strong>{'Step 2: Select your E-Alerts'|gettext}</strong>
<table class="exp-skin-table">
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/billingcalculators/showall_quickdonation.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@
<tr>
<td>* Email Address</td>
<td>
{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}
</td>
</tr>
</table>
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
</div>
<!--div id="tab4">
{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}
</div-->
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@
</div>
<div id="tab4">
{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}*}
</div>
{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}
</div>
</div>
<div class="loadingdiv">{'Loading'|gettext}</div>
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
</div>
<div id="tab3">
{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}
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
<div class="yui-content">
<div id="tab1">
{*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}
</div>
<div id="tab2">
{control type="checkbox" name="accepted_cards[]" label="Master Card" value="MasterCard"|gettext checked=$calculator->configdata.accepted_cards}
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
</div>
<div id="tab3">
{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}
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@

<div class="module cart eventregistration addToCart registration_div" id="regdiv">
{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}
<hr>
</div>
Expand Down
6 changes: 4 additions & 2 deletions framework/modules/ecommerce/views/ecomconfig/configure.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,14 @@
<div id="tab4">
<h2>{'Notifications'|gettext}</h2>
{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}
</div>
<div id="tab5">
<h2>{'Store Email Settings'|gettext}</h2>
{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}
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/views/eventregistration/eventregistration_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
<tr>
<td>* {'Email Address'|gettext}</td>
<td>
{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}
</td>
</tr>
</table>
Expand Down
5 changes: 3 additions & 2 deletions framework/modules/ecommerce/views/order/edit_address.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/views/order/verifyReturnShopper.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
<h3>{'Verify the following information from your previous session to restore your shopping cart:'|gettext}{br}</h3>
{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}
Expand Down
7 changes: 4 additions & 3 deletions framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
6 changes: 4 additions & 2 deletions framework/modules/events/views/event/configure/reminders.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
3 changes: 2 additions & 1 deletion framework/modules/events/views/event/edit.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
{if $config.enable_feedback}
<div id="tab3">
{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}
</div>
{/if}
{if $config.enable_images}
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/events/views/event/email/Contact Form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading

0 comments on commit ed3c98f

Please sign in to comment.