Commit 152fcdea by François C.

Merge branch '3498-email-error' into 'main'

3498-email-error

See merge request !10
parents ee7e3712 f6824a3a
...@@ -279,7 +279,7 @@ $qa_content['form_profile'] = array( ...@@ -279,7 +279,7 @@ $qa_content['form_profile'] = array(
'value' => qa_html(isset($inemail) ? $inemail : $useraccount['email']), 'value' => qa_html(isset($inemail) ? $inemail : $useraccount['email']),
'error' => isset($errors['email']) ? qa_html($errors['email']) : 'error' => isset($errors['email']) ? qa_html($errors['email']) :
($pending_confirmation ? qa_insert_login_links(qa_lang_html('users/email_please_confirm')) : null), ($pending_confirmation ? qa_insert_login_links(qa_lang_html('users/email_please_confirm')) : null),
'type' => 'static', 'type' => $pending_confirmation ? 'email' : ($isblocked ? 'static' : 'email'),
), ),
'messages' => array( 'messages' => array(
......
...@@ -1412,7 +1412,7 @@ class qa_html_theme_base ...@@ -1412,7 +1412,7 @@ class qa_html_theme_base
public function form_email($field, $style) public function form_email($field, $style)
{ {
$this->output('<input ' . @$field['tags'] . ' type="email" value="' . @$field['value'] . '" class="qa-form-' . $style . '-email"/>'); $this->output('<input readonly="readonly" ' . @$field['tags'] . ' type="email" value="' . @$field['value'] . '" class="qa-form-' . $style . '-email qa-form-email"/>');
} }
public function form_text_single_row($field, $style) public function form_text_single_row($field, $style)
......
...@@ -362,6 +362,10 @@ h2 {font-size:16px; padding-top:12px; clear:both;} ...@@ -362,6 +362,10 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
.qa-form-wide-number {width:48px; border:1px solid #658296; vertical-align:middle;} .qa-form-wide-number {width:48px; border:1px solid #658296; vertical-align:middle;}
.qa-form-wide-error {display:inline-block; background:#fee; border:1px solid #c00; color:#c00; font-size:11px; margin-left:6px; padding:.5em;} .qa-form-wide-error {display:inline-block; background:#fee; border:1px solid #c00; color:#c00; font-size:11px; margin-left:6px; padding:.5em;}
.qa-form-wide-note {font-size:1rem; margin-left:4px;} .qa-form-wide-note {font-size:1rem; margin-left:4px;}
.qa-form-email {
border: 0;
pointer-events: none;
}
.qa-form-wide-buttons { .qa-form-wide-buttons {
padding:8px; padding:8px;
text-align:center; text-align:center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment