diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php index 9b282e52c..7216f065d 100755 --- a/e107_core/shortcodes/batch/signup_shortcodes.php +++ b/e107_core/shortcodes/batch/signup_shortcodes.php @@ -639,6 +639,13 @@ class signup_shortcodes extends e_shortcode //return ""; } + function sc_signup_button($parm=null) + { + $class = isset($parm['class']) ? $parm['class'] : "button btn btn-primary signup-button"; + + return "\n"; + } + // allow main admin to view signup page for design/testing. function sc_signup_adminoptions() diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php index 6e6819727..6d7a53ee6 100755 --- a/e107_core/templates/signup_template.php +++ b/e107_core/templates/signup_template.php @@ -21,79 +21,71 @@ if(!defined('e107_INIT')) // Shortcode Wrappers -$SIGNUP_WRAPPER['SIGNUP_DISPLAYNAME'] = " - - - {---} -"; +$SIGNUP_WRAPPER['SIGNUP_DISPLAYNAME'] = "
+ +
{---}
+
"; -$SIGNUP_WRAPPER['SIGNUP_REALNAME'] = " - - - {---} -"; +$SIGNUP_WRAPPER['SIGNUP_REALNAME'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_GDPR_INFO'] = "
{---}
"; -$SIGNUP_WRAPPER['SIGNUP_GDPR_INFO'] = "{---}"; +$SIGNUP_WRAPPER['SIGNUP_SIGNATURE'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_IMAGES'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_IMAGECODE'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_LOGINNAME'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_HIDE_EMAIL'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_EMAIL_CONFIRM'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_XUP'] = "
{---} +

" . LAN_SIGNUP_120 . "

"; + +$SIGNUP_WRAPPER['SIGNUP_PASSWORD1'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_PASSWORD2'] = "
+ +
{---}
+
"; + +$SIGNUP_WRAPPER['SIGNUP_USERCLASS_SUBSCRIBE'] = "
+ +
{---}
+
"; + -$SIGNUP_WRAPPER['SIGNUP_SIGNATURE'] = " - - - {---} -"; - -$SIGNUP_WRAPPER['SIGNUP_IMAGES'] = " - - - {---} -"; - -$SIGNUP_WRAPPER['SIGNUP_IMAGECODE'] = " - - - {---} -"; - -$SIGNUP_WRAPPER['SIGNUP_LOGINNAME'] = " - - - {---} -"; - -$SIGNUP_WRAPPER['SIGNUP_HIDE_EMAIL'] = " - - - {---} -"; - -$SIGNUP_WRAPPER['SIGNUP_EMAIL_CONFIRM'] = " - - - {---} -"; - -$SIGNUP_WRAPPER['SIGNUP_XUP'] = "
{---} -

" . LAN_SIGNUP_120 . "

"; - -$SIGNUP_WRAPPER['SIGNUP_PASSWORD1'] = " - - {---} - "; - -$SIGNUP_WRAPPER['SIGNUP_PASSWORD2'] = " - - {---} - "; - -$SIGNUP_WRAPPER['SIGNUP_USERCLASS_SUBSCRIBE'] = " - - {---} - "; - - -// Template v2.x spec. +// Signup Template $SIGNUP_TEMPLATE['start'] = " @@ -104,16 +96,13 @@ $SIGNUP_TEMPLATE['body'] = " {SIGNUP_XUP}
{SIGNUP_XUP_ACTION} - {SIGNUP_DISPLAYNAME} {SIGNUP_LOGINNAME} {SIGNUP_REALNAME} - - - - +
+ +
{SIGNUP_EMAIL}
+
{SIGNUP_EMAIL_CONFIRM} {SIGNUP_PASSWORD1} {SIGNUP_PASSWORD2} @@ -124,43 +113,28 @@ $SIGNUP_TEMPLATE['body'] = " {SIGNUP_IMAGES} {SIGNUP_IMAGECODE} {SIGNUP_GDPR_INFO} - - - -
- {SIGNUP_EMAIL} -
- -
-
+
+ {SIGNUP_BUTTON} +
{SIGNUP_FORM_CLOSE}"; +$SIGNUP_TEMPLATE['end'] = ''; -$SIGNUP_TEMPLATE['end'] = ''; +$SIGNUP_TEMPLATE['coppa'] = "{SIGNUP_COPPA_TEXT}

+
{LAN=LAN_SIGNUP_17} + {SIGNUP_COPPA_FORM} +
"; +$SIGNUP_TEMPLATE['coppa-fail'] = "
{LAN=LAN_SIGNUP_9}
"; -$SIGNUP_TEMPLATE['coppa'] = "{SIGNUP_COPPA_TEXT}

-
{LAN=LAN_SIGNUP_17} - {SIGNUP_COPPA_FORM} -
"; +$SIGNUP_TEMPLATE['extended-category'] = " +
+
{EXTENDED_CAT_TEXT}
+
"; -$SIGNUP_TEMPLATE['coppa-fail'] = "
{LAN=LAN_SIGNUP_9}
"; - - -$SIGNUP_TEMPLATE['extended-category'] = " - - - {EXTENDED_CAT_TEXT} - - "; - - -$SIGNUP_TEMPLATE['extended-user-fields'] = " - - - - - - {EXTENDED_USER_FIELD_EDIT} - - "; \ No newline at end of file +$SIGNUP_TEMPLATE['extended-user-fields'] = " +
+ +
{EXTENDED_USER_FIELD_EDIT}
+
"; \ No newline at end of file