Commit ba63dad1 authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie

Cleaned up the login box on trunk so that it uses an <h3> for the

header. Makes it easy for the contextual help.
parent 8084764d
......@@ -498,7 +498,7 @@ function get_login_form_js($form) {
$cookiename = get_config('cookieprefix') . 'ctest';
return <<<EOF
<script type="text/javascript">
var loginbox = $('loginbox');
var loginbox = $('loginform_container');
document.cookie = "$cookiename=1";
if (document.cookie) {
loginbox.innerHTML = '$form';
......@@ -713,44 +713,34 @@ function auth_generate_login_form() {
'plugintype' => 'auth',
'pluginname' => 'internal',
'elements' => array(
'login' => array(
'type' => 'fieldset',
'legend' => get_string('login'),
'elements' => array(
'login_username' => array(
'type' => 'text',
'title' => get_string('username') . ':',
'description' => get_string('usernamedescription'),
'rules' => array(
'required' => true
)
),
'login_password' => array(
'type' => 'password',
'title' => get_string('password') . ':',
'description' => get_string('passworddescription'),
'value' => '',
'rules' => array(
'required' => true
)
),
'login_institution' => array(
'type' => 'select',
'title' => get_string('institution') . ':',
'defaultvalue' => $defaultinstitution,
'options' => $institutions,
'rules' => array(
'required' => true
),
'ignore' => count($institutions) == 1,
'help' => true,
),
'chelp' => array(
'value' => get_help_icon('core', 'login', null, null, null, 'loginbox'),
),
'login_username' => array(
'type' => 'text',
'title' => get_string('username') . ':',
'description' => get_string('usernamedescription'),
'rules' => array(
'required' => true
)
),
'login_password' => array(
'type' => 'password',
'title' => get_string('password') . ':',
'description' => get_string('passworddescription'),
'value' => '',
'rules' => array(
'required' => true
)
),
'login_institution' => array(
'type' => 'select',
'title' => get_string('institution') . ':',
'defaultvalue' => $defaultinstitution,
'options' => $institutions,
'rules' => array(
'required' => true
),
'ignore' => count($institutions) == 1,
'help' => true,
),
'submit' => array(
'type' => 'submit',
'value' => get_string('login')
......
......@@ -411,7 +411,7 @@ tr.required th {
/* RIGHT SIDE BOX BEGIN */
div.sidebar {
background: #FFF url(../images/sidebox2_top_headerbg.gif) no-repeat top;
padding: 10px 0 0 10px;
padding: 7px 0 0 10px;
margin-bottom: 10px;
color: #FFF;
font-weight: bold;
......@@ -503,31 +503,12 @@ div.sidebar p {
.sidebar-botcorners {
margin-left: -10px;
}
#loginbox .sidebar-botcorners {
margin-left: 0;
}
#column-right #loginbox {
width: 228px;
background: #FFF url(../images/sidebox1_top_headerbg.gif) no-repeat top;
padding: 10px 0 0 0;
margin-bottom: 10px;
color: #000;
}
#column-right #loginbox fieldset {
border: none;
padding: 0;
margin: 0 0 0 10px;
width: 150px;
}
#column-right #login legend {
color: #FFF;
font-weight: bold;
margin: 0 0 0 -7px;
padding: 0;
}
#column-right #login_login_username_container {
padding-top: 25px;
}
#column-right #login_login_password_container {
margin: 5px 0;
padding: 0;
......
<h3>{str tag="login"}{contextualhelp plugintype='core' pluginname='core' section='loginbox'}</h3>
<noscript><p>{str tag="javascriptnotenabled"}</p></noscript>
{$data.loginform}
<div id="loginform_container">{$data.loginform}</div>
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