From a31602108b5fef9466e3226bb5efb4c307685243 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 30 Jan 2016 18:39:01 -0800 Subject: [PATCH] HTML5 Validation fixes. --- e107_core/templates/usersettings_template.php | 10 ++++----- e107_handlers/core_functions.php | 22 +++++++++++++++---- e107_handlers/e_parse_class.php | 5 ++++- e107_handlers/form_handler.php | 4 ++-- usersettings.php | 2 +- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php index 543c8b53d..ffe828a5d 100755 --- a/e107_core/templates/usersettings_template.php +++ b/e107_core/templates/usersettings_template.php @@ -214,7 +214,7 @@ $USERSETTINGS_WRAPPER['edit']['CUSTOMTITLE'] = "
"; $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = "
- +
{---}
"; @@ -256,14 +256,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
- +
{EMAIL}
- +
{REALNAME}
@@ -277,14 +277,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
- +
{HIDEEMAIL=radio}
- +
{AVATAR_REMOTE}
diff --git a/e107_handlers/core_functions.php b/e107_handlers/core_functions.php index 3ce0f2b8b..22719d220 100644 --- a/e107_handlers/core_functions.php +++ b/e107_handlers/core_functions.php @@ -307,7 +307,7 @@ if (!function_exists('asortbyindex')) if (!function_exists('r_emote')) { /** - * @DEPRECATED + * Still in use. */ function r_emote() { @@ -331,10 +331,24 @@ if (!function_exists('r_emote')) $value = ($value2 ? $value2 : $value); $value = ($value == '&|') ? ':((' : $value; $value = " ".$value." "; - //TODO CSS class - $str .= "\n "; + + // $str .= "\n "; + $str .= "\n "; } - + + $JS = " + + $('.addEmote').click(function(){ + + val = $(this).attr('data-emote') + addtext(val,true); + return false; + }); + "; + + e107::js('footer-inline',$JS); + + return "
".$str."
"; } } diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index ac9df3a6e..0b67a6f10 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -3198,7 +3198,10 @@ class e_parser $title = (ADMIN) ? $image : $tp->toAttribute($userData['user_name']); $shape = (vartrue($options['shape'])) ? "img-".$options['shape'] : "img-rounded"; - $text = ""; + + $heightInsert = empty($height) ? '' : "height='".$height."'"; + + $text = ""; // return $img; return $text; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index dd16ff46a..b60b6dbd7 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -663,8 +663,8 @@ class e_form if($localonly == true) { - $text = ""; - $text .= ""; // TODO LAN + $text = ""; + $text .= "Click on the avatar to change it"; // TODO LAN } else { diff --git a/usersettings.php b/usersettings.php index 30cac9313..1965b35f1 100644 --- a/usersettings.php +++ b/usersettings.php @@ -763,7 +763,7 @@ if (vartrue($_POST)) //require_once (e_HANDLER."form_handler.php"); //$rs = new form; -$text = '
'; +$text = ''; //$text = (is_numeric($_uid) ? $rs->form_open("post", e_SELF."?".e_QUERY, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'") : $rs->form_open("post", e_SELF, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'"));