diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index b38458c71..544fa8cf4 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1468,20 +1468,9 @@ $text .= " ".$frm->radio_switch('signup_remote_emailcheck', $pref['signup_remote_emailcheck'])." - - - - ".$frm->radio_switch('disable_emailcheck', $pref['disable_emailcheck'])." - - - - - - ".$frm->radio_switch('use_coppa', $pref['use_coppa'])." -
".PRFLAN_46." ".PRFLAN_94."
- - + + "; @@ -1505,6 +1494,24 @@ $text .= " + + + + ".$frm->number('displayname_maxlength', $pref['displayname_maxlength'], 3)." + + + + + + ".$frm->number('loginname_maxlength', $pref['loginname_maxlength'], 3)." + + + + + + ".$frm->number('signup_pass_len', $pref['signup_pass_len'], 2)." + + @@ -1513,7 +1520,7 @@ $text .= "
".PRFLAN_78."
- + @@ -1544,24 +1551,44 @@ $text .= " + Field options + + + + + + + + + - "; + + + + "; $signup_option_names = array( // "signup_option_loginname" => "Login Name", - "signup_option_email_confirm" => CUSTSIG_21, + "signup_option_realname" => CUSTSIG_2, - "signup_option_signature" => CUSTSIG_6, + "signup_option_email_confirm" => CUSTSIG_21, "signup_option_image" => CUSTSIG_7, - "signup_option_class" => CUSTSIG_17, + 'signup_option_customtitle' => CUSTSIG_20, - 'signup_option_hideemail' => CUSTSIG_22 + 'signup_option_hideemail' => CUSTSIG_22, + "signup_option_class" => CUSTSIG_17, + "signup_option_signature" => CUSTSIG_6, ); @@ -1572,8 +1599,8 @@ $text .= " @@ -1582,6 +1609,37 @@ $text .= " $text .= " + + + + + + + + + +
+ ".$frm->radio('disable_emailcheck', 2, ($pref['disable_emailcheck']==2), array('label' => CUSTSIG_12, 'disabled'=>true))." + ".$frm->radio('disable_emailcheck', 1, (intval($pref['disable_emailcheck']) == 1), array('label' => CUSTSIG_14))." + ".$frm->radio('disable_emailcheck', 0, (intval($pref['disable_emailcheck']) == 0), array('label' => CUSTSIG_15))." + +
- ".$frm->radio('signup_option_password', 0, !$prefOptionPassword, array('label' => CUSTSIG_12))."   - ".$frm->radio('signup_option_password', 1, ($prefOptionPassword == 1), array('label' => CUSTSIG_14, 'disabled'=>true))."   + ".$frm->radio('signup_option_password', 0, !$prefOptionPassword, array('label' => CUSTSIG_12))." + ".$frm->radio('signup_option_password', 1, ($prefOptionPassword == 1), array('label' => CUSTSIG_14, 'disabled'=>true))." ".$frm->radio('signup_option_password', 2, ($prefOptionPassword == 2), array('label' => CUSTSIG_15))."
- ".$frm->radio($value, 0, !$pref[$value], array('label' => CUSTSIG_12))."   - ".$frm->radio($value, 1, ($pref[$value] == 1), array('label' => CUSTSIG_14))."   + ".$frm->radio($value, 0, !$pref[$value], array('label' => CUSTSIG_12))." + ".$frm->radio($value, 1, ($pref[$value] == 1), array('label' => CUSTSIG_14))." ".$frm->radio($value, 2, ($pref[$value] == 2), array('label' => CUSTSIG_15))."
+ ".$frm->radio_switch('user_reg_secureveri', $pref['user_reg_secureveri'], CUSTSIG_12, CUSTSIG_14)." +
+ + + + + + ".$frm->radio_switch('use_coppa', $pref['use_coppa'])." +
".PRFLAN_46." ".PRFLAN_94."
+ + "; + +/* + + + + ". $pref['disable_emailcheck']." + + */ + +$text .= " @@ -1604,18 +1662,28 @@ $text .= "
".PRFLAN_193."
".str_replace("[br]","
",PRFLAN_194)."
- - + + + + + - ".$frm->number('displayname_maxlength', $pref['displayname_maxlength'], 3)." + ".$frm->tags('signup_disallow_text', $pref['signup_disallow_text'], 500)." +
".CUSTSIG_19."
- - - - ".$frm->number('loginname_maxlength', $pref['loginname_maxlength'], 3)." + + + + + ".$e_userclass->uc_dropdown('displayname_class', $pref['displayname_class'], 'nobody,member,admin,classes', "tabindex='".$frm->getNext()."'")." + ".$frm->admin_button('submit_resetdisplaynames', PRFLAN_156, 'delete')." + + + + "; /* @@ -1902,12 +1970,7 @@ $text .= " * */ -$text .= " - - - ".$frm->radio_switch('user_reg_secureveri', $pref['user_reg_secureveri'])." - - +$text .= " @@ -1926,30 +1989,7 @@ $text .= " - - - - ".$frm->textarea('signup_disallow_text', $pref['signup_disallow_text'], 2, 1)." -
".CUSTSIG_19."
- - - - - - -
".$e_userclass->uc_dropdown('displayname_class', $pref['displayname_class'], 'nobody,member,admin,classes', "tabindex='".$frm->getNext()."'")."
- ".$frm->admin_button('submit_resetdisplaynames', PRFLAN_156)." - - - - - - - - - ".$frm->number('signup_pass_len', $pref['signup_pass_len'], 2)." - - + diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index dca22f665..5930b1321 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -1487,7 +1487,7 @@ class e_form if($labelFound) { - $text .= $labelFound.""; + $text .= "".$labelFound.""; } return $text; diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 1fb9b6ab9..52d525e79 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -182,7 +182,10 @@ input:-moz-placeholder { font-style:italic } /* input[type='radio'] { vertical-align:top; } */ -.radio.disabled, .checkbox.disabled { opacity: .2; } +.radio.disabled, .checkbox.disabled { opacity: 0; } +input[type="radio"] + span { padding-right:10px } +input[type="radio"] , input[type="radio"] + span { opacity:.5 } +input[type="radio"]:checked, input[type="radio"]:checked + span { opacity:1.0; } label.legacy { margin-left:5px;margin-right:10px; display: inline-block; } @@ -990,6 +993,10 @@ li.rssRow > div { .sidebar-toggle a {color:#C6C6C6;} #left-panel.toggled { display: none } + + + + /* body { background-color: rgb(68, 68, 68); }