mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2169 from MikeyGMT/20161218c

Browse Source 
LANS #6 Signup Shortcode Plus Accessibility Labels for Signup Form #275
This commit is contained in:
Cameron
2016-12-20 16:47:16 -08:00
committed by GitHub
parent 3a3848460c 71df424799
commit 2e4c85a062
3 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2012 e107 Inc (e107.org)
* Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -32,8 +32,9 @@ class signup_shortcodes extends e_shortcode
return "
<form method='post' action='".e_SELF."?stage1' autocomplete='off'>\n
<div><br />
<input type='radio' name='coppa' value='0' checked='checked' /> ".LAN_NO."
<input type='radio' name='coppa' value='1' /> ".LAN_YES."<br />
<input type='radio' name='coppa' value='0' id='coppa_no' checked='checked' /> <label class='control-label' for='coppa_no'>".LAN_NO."</label>
<input type='radio' name='coppa' value='1' id='coppa_yes' /> <label class='control-label' for='coppa_yes'>".LAN_YES."</label>
<br />
<br />
<input class='btn btn-primary button' type='submit' name='newver' value=\"".LAN_CONTINUE."\" />
</div></form>
@@ -88,7 +89,7 @@ class signup_shortcodes extends e_shortcode
// 'signup' Creates a new XUP user if not found, otherwise it logs the person in.
$button = (defset('FONTAWESOME') === 4) ? $tp->toGlyph('fa-'.$ic, array('size'=>$size)) : "<img class='e-tip' title='Register using your {$p} account' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";
$button = (defset('FONTAWESOME') === 4) ? $tp->toGlyph('fa-'.$ic, array('size'=>$size)) : "<img class='e-tip' title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_SIGNUP, $p)."' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";
$text .= " <a title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_SIGNUP, $p)." ' role='button' class='signup-xup btn btn-primary' href='".e107::getUrl()->create('system/xup/signup?provider='.$p.'&back='.base64_encode(e_REQUEST_URL))."'>".$button."</a> ";
}
//TODO different icon options. see: http://zocial.smcllns.com/
@@ -103,7 +104,8 @@ class signup_shortcodes extends e_shortcode
function sc_signup_xup_signup($parm)
{
$pref = e107::getPref('social_login_active');
$tp = e107::getParser();
$tp = e107::getParser();
if(!empty($pref))
{
$text = "";
@@ -129,7 +131,7 @@ class signup_shortcodes extends e_shortcode
$ic = 'windows';
}
$button = (defset('FONTAWESOME') === 4) ? "<span title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_REG, $p)."'>".$tp->toGlyph('fa-'.$ic, array('size'=>$size))."</span>" : "<img class='e-tip' title='Register using your {$p} account' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";
$button = (defset('FONTAWESOME') === 4) ? "<span title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_REG, $p)."'>".$tp->toGlyph('fa-'.$ic, array('size'=>$size))."</span>" : "<img class='e-tip' title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_SIGNUP, $p)."' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";
$text .= " <a class='signup-xup ".$class."' role='button' href='".e107::getUrl()->create('system/xup/signup?provider='.$p.'&back='.base64_encode(e_REQUEST_URL))."'>".$button."</a> ";
}
@@ -359,7 +361,7 @@ class signup_shortcodes extends e_shortcode
if ($pref)
{
return $rs->form_radio("hideemail", 1, $default_email_setting==1)." ".LAN_YES."&nbsp;&nbsp;".$rs->form_radio("hideemail", 0,$default_email_setting==0)." ".LAN_NO;
return $rs->form_radio("hideemail", 1, $default_email_setting==1)." <label for='hideemail1'>".LAN_YES."</label> &nbsp;&nbsp;".$rs->form_radio("hideemail", 0,$default_email_setting==0)." <label for='hideemail0'>".LAN_NO."</label>";
}
}
@@ -556,7 +558,9 @@ class signup_shortcodes extends e_shortcode
function sc_signup_adminoptions()
{
if(getperms('0'))
$tp = e107::getParser();
if(getperms('0'))
{
$pref = e107::getPref();
$frm = e107::getForm();
@@ -564,17 +568,17 @@ class signup_shortcodes extends e_shortcode
if(intval($pref['user_reg']) !== 1)
{
$adminMsg .= "<div class='form-group'><b>User registration is currently disabled.</b></div>";
$adminMsg .= "<div class='form-group'><b>".LAN_SIGNUP_114."</b></div>";
}
$adminMsg .= "<div class='form-group form-inline'>
<a class='btn btn-warning btn-danger btn-sm' href='".e_SELF."?preview'>Preview Activation Email</a>
<a class='btn btn-error btn-danger btn-sm' href='".e_SELF."?preview.aftersignup'>Preview After Form Submit</a>
<a class='btn btn-error btn-danger btn-sm e-tip' href='".e_SELF."?test' title=\"to ".USEREMAIL."\">Send a Test Activation</a>
<a class='btn btn-warning btn-danger btn-sm' href='".e_SELF."?preview'>".LAN_SIGNUP_115."</a>
<a class='btn btn-error btn-danger btn-sm' href='".e_SELF."?preview.aftersignup'>".LAN_SIGNUP_116."</a>
<a class='btn btn-error btn-danger btn-sm e-tip' href='".e_SELF."?test' title='\"".$tp->lanVars(LAN_SIGNUP_118,USEREMAIL)."\"'>".LAN_SIGNUP_117."</a>
</div>
";
$adminMsg .= $frm->checkbox('simulation',1, false, "Don't send email");
$adminMsg .= $frm->checkbox('simulation',1, false, LAN_SIGNUP_119);
return "<div class='alert alert-block alert-error alert-danger text-center'>".$adminMsg."</div>";

26
e107_core/templates/signup_template.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -21,8 +21,8 @@ define("REQUIRED_FIELD_MARKER", "<span class='required'> *</span>");
$sc_style['SIGNUP_DISPLAYNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap' >"
.LAN_SIGNUP_89."<span class='required'> *</span><br /><span class='smalltext'>".LAN_SIGNUP_90."</span>
<td class='forumheader3' style='width:30%;white-space:nowrap' ><label for='username'>"
.LAN_SIGNUP_89."<span class='required'> *</span><br /><span class='smalltext'>".LAN_SIGNUP_90."</span></label>
</td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_DISPLAYNAME']['post'] = "
@@ -31,8 +31,8 @@ $sc_style['SIGNUP_DISPLAYNAME']['post'] = "
$sc_style['SIGNUP_REALNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>"
.LAN_SIGNUP_91."".req($pref['signup_option_realname'])."
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='realname'>"
.LAN_SIGNUP_91."".req($pref['signup_option_realname'])."</label>
</td>
<td class='forumheader3' style='width:70%' >";
$sc_style['SIGNUP_REALNAME']['post'] = "
@@ -119,7 +119,7 @@ $SIGNUP_SIGNATURE_END = "
$sc_style['SIGNUP_SIGNATURE']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' >".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])."</td>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' ><label for='signature'>".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_SIGNATURE']['post'] = "
@@ -128,7 +128,7 @@ $sc_style['SIGNUP_SIGNATURE']['post'] = "
$sc_style['SIGNUP_IMAGES']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' >".LAN_SIGNUP_94.req($pref['signup_option_image'])."</td>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' ><label for='avatar'>".LAN_SIGNUP_94.req($pref['signup_option_image'])."</label></td>
<td class='forumheader3' style='width:70%;vertical-align:top'>";
$sc_style['SIGNUP_IMAGES']['post'] = "
</td>
@@ -136,7 +136,7 @@ $sc_style['SIGNUP_IMAGES']['post'] = "
$sc_style['SIGNUP_IMAGECODE']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%'>".e107::getSecureImg()->renderLabel().req(2)."</td>
<td class='forumheader3' style='width:30%'><label for='code-verify'>".e107::getSecureImg()->renderLabel().req(2)."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_IMAGECODE']['post'] = "
</td>
@@ -144,7 +144,7 @@ $sc_style['SIGNUP_IMAGECODE']['post'] = "
$sc_style['SIGNUP_LOGINNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%'>".LAN_SIGNUP_81.req(2)."</td>
<td class='forumheader3' style='width:30%'><label for='loginname'>".LAN_SIGNUP_81.req(2)."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_LOGINNAME']['post'] = "
</td>
@@ -160,7 +160,7 @@ $sc_style['SIGNUP_HIDE_EMAIL']['post'] = "
$sc_style['SIGNUP_EMAIL_CONFIRM']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_39."</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email-confirm'>".LAN_SIGNUP_39."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = "
</td>
@@ -170,13 +170,13 @@ $sc_style['SIGNUP_XUP']['pre'] = "<div class='center' style='display:block;paddi
$sc_style['SIGNUP_XUP']['post'] = "<h2 class='signup-divider'><span>OR</span></h2></div>";
$sc_style['SIGNUP_PASSWORD1']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_83."<span class='required'> *</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password1'>".LAN_SIGNUP_83."<span class='required'> *</span></label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_PASSWORD1']['post'] = "</td>
</tr>";
$sc_style['SIGNUP_PASSWORD2']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_84."<span class='required'> *</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password2'>".LAN_SIGNUP_84."<span class='required'> *</span></label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_PASSWORD2']['post'] = "</td>
</tr>";
@@ -229,7 +229,7 @@ if(!defined($SIGNUP_BODY))
{SIGNUP_LOGINNAME}
{SIGNUP_REALNAME}
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_USER_60."{SIGNUP_IS_MANDATORY=email}</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email'>".LAN_USER_60."{SIGNUP_IS_MANDATORY=email}</label></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_EMAIL}
</td>

12
e107_languages/English/lan_signup.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2015 e107 Inc (e107.org)
* Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -50,7 +50,7 @@ define("LAN_SIGNUP_13", "You can now log in from the Login box, or from [here]."
define("LAN_SIGNUP_14", "here");
define("LAN_SIGNUP_15", "Please contact the main site admin");
define("LAN_SIGNUP_16", "if you require assistance.");
define("LAN_SIGNUP_17", "Please certify you are 13 or over the age of 13.");
define("LAN_SIGNUP_17", "Please confirm that you are age 13 or over.");
define("LAN_SIGNUP_18", "Your registration has been received and created with the following login information:");
//define("LAN_SIGNUP_19", "Username:"); // now LAN_LOGINNAME
//define("LAN_SIGNUP_20", "Password:"); // now LAN_PASSWORD
@@ -140,7 +140,6 @@ define("LAN_SIGNUP_103", "Too many users already using IP address: ");
define("LAN_SIGNUP_105", "Unable to action your request - please contact the site administrator"); // Two people with same password.
define("LAN_SIGNUP_106", "Unable to action your request - do you already have an account here?"); // Trying to set email same as existing
define("LAN_LOGINNAME", "Username");
//define("LAN_PASSWORD", "Password");
define("LAN_USERNAME", "Display Name");
@@ -154,3 +153,10 @@ define("LAN_SIGNUP_112", "You are currently logged in as Main Admin.");
define("LAN_SIGNUP_113", "Subscription(s)");
define("LAN_SIGNUP_114", "User registration is currently disabled.");
define("LAN_SIGNUP_115", "Preview Activation Email");
define("LAN_SIGNUP_116", "Preview After Form Submit");
define("LAN_SIGNUP_117", "Send a Test Activation");
define("LAN_SIGNUP_118", "To [x]");
define("LAN_SIGNUP_119", "Don't send email");