diff --git a/login/change_password_form.html b/login/change_password_form.html index 279e6cb1633..b3556ef3085 100644 --- a/login/change_password_form.html +++ b/login/change_password_form.html @@ -1,34 +1,35 @@ -

- -
- - - - - - - - - - - - - - - - - - - - -

:

 - username) ?> -

:

 - password) ?> -

:

 - newpassword1) ?> -

():

 - newpassword2) ?> -
- ">
-
+

+ +
+ + + + + + + + + + + + + + + + + + + + + +

:

 + username) ?> +

:

 + password) ?> +

:

 + newpassword1) ?> +

():

 + newpassword2) ?> +
+ " />
+
diff --git a/login/forgot_password_form.html b/login/forgot_password_form.html index 92e2362497d..380ee921f2a 100644 --- a/login/forgot_password_form.html +++ b/login/forgot_password_form.html @@ -1,25 +1,28 @@ - - - - - - -
-

-

 -
- - - - - - - -
: - email)) {formerr($err->email);} ?> -
"> - " onClick="javascript: history.go(-1)"> -
-
-
- + + + + + + + + +
+

+ 		+
+ + + + + + + + + +
: + email)) {formerr($err->email);} ?> +
" /> + " onClick="javascript: history.go(-1)" /> +
+
+
diff --git a/login/index.php b/login/index.php index 7b022151913..4be43ddf002 100644 --- a/login/index.php +++ b/login/index.php @@ -28,7 +28,8 @@ if ($user) { if (! $user->confirmed ) { // they never confirmed via email print_header(get_string("mustconfirm"), get_string("mustconfirm") ); - include("index_confirm.html"); + print_heading(get_string("mustconfirm")); + print_simple_box(get_string("emailconfirmsent", "", $user->email), "center"); print_footer(); die; } diff --git a/login/index_confirm.html b/login/index_confirm.html deleted file mode 100644 index e7700b67608..00000000000 --- a/login/index_confirm.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

-email) ?> - diff --git a/login/index_form.html b/login/index_form.html index 1b1a746392f..01d8675fa34 100644 --- a/login/index_form.html +++ b/login/index_form.html @@ -1,59 +1,57 @@ -
- - - - - - - - - -
cellheading2?> class="headingblock"> -

- 		cellheading2?> class="headingblock"> -

-
-

:
- ()
- + + + + + + + + + - - + + + - - - - -
+

+ 		+

+
+

:
+ ()
+

-
+ - - +
- - - - - - - - - -

:

 -

:

 -
- 		- "> + + + + + + + + + + +

:

 +

:

 +
+ 		+ " />
-
- -
- guestloginbutton) { ?> -
-

:

-
-
- - - "> -
-
- - changepassword or $CFG->auth == "email" or $CFG->auth == "none") { + + +
+ guestloginbutton) { ?> +
+

:

+
+
+ + + " /> +
+
+ + changepassword or $CFG->auth == "email" or $CFG->auth == "none") { if ($CFG->auth == "email" or $CFG->auth == "none") { $changepassword = "forgot_password.php"; $changebuttonname = get_string("senddetails"); @@ -63,49 +61,49 @@ } ?> -
-

-
-
- -
-
- -
-
- - auth) { +
+

+
+
+ +
+
+ + + 		+ + auth) { case "email": ?> -

- -
-
- "> -
-
-

+ +
+
+ + " /> +
+
+ ".get_string("loginstepsnone")."

"; break; default: echo "
"; echo format_text($CFG->auth_instructions); - echo "
"; + echo ""; require_once("../auth/$CFG->auth/lib.php"); if (isset($CFG->auth_user_create) and $CFG->auth_user_create==1 and function_exists('auth_user_create') ){?> -
- "> -
- - + + " /> + +
+ + +

diff --git a/login/signup.php b/login/signup.php index 4b265fdcf95..11b670895aa 100644 --- a/login/signup.php +++ b/login/signup.php @@ -36,10 +36,7 @@ $emailconfirm = get_string("emailconfirm"); print_header($emailconfirm, $emailconfirm, $emailconfirm); - echo "
"; - print_string("emailconfirmsent", "", $user->email); - echo "
"; - print_footer(); + notice(get_string("emailconfirmsent", "", $user->email), $CFG->wwwroot); exit; } } diff --git a/login/signup_form.html b/login/signup_form.html index a4e726e69fd..b3e1e02048f 100644 --- a/login/signup_form.html +++ b/login/signup_form.html @@ -1,103 +1,107 @@ -username)) { - $user->username = ""; - } - if (empty($user->password)) { - $user->password = ""; - } - if (empty($user->email)) { - $user->email = ""; - } - if (empty($user->firstname)) { - $user->firstname = ""; - } - if (empty($user->lastname)) { - $user->lastname = ""; - } - if (empty($user->idnumber)) { - $user->idnumber = ""; - } - if (empty($user->phone)) { - $user->phone = ""; - } - if (empty($user->city)) { - $user->city = ""; - } - if (empty($user->country)) { - $user->country = ""; - } - -?> -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

:

:

 - username)) { formerr($err->username); } ?> -

:

 - password)) { formerr($err->password); } ?> -


:
()

-

:

 - email)) { formerr($err->email); } ?> -

:

 - firstname)) { formerr($err->firstname);} ?> -

:

 - lastname)) { formerr($err->lastname);} ?> -

:

 () - idnumber)) { formerr($err->idnumber);} ?> -

:

 () - phone)) { formerr($err->phone);} ?> -

:

 - city)) { formerr($err->city);} ?> -

:

country, get_string("selectacountry"), "", "") ?> - country)) { formerr($err->country);} ?> -
">
-
- -
- +username)) { + $user->username = ""; + } + if (empty($user->password)) { + $user->password = ""; + } + if (empty($user->email)) { + $user->email = ""; + } + if (empty($user->firstname)) { + $user->firstname = ""; + } + if (empty($user->lastname)) { + $user->lastname = ""; + } + if (empty($user->idnumber)) { + $user->idnumber = ""; + } + if (empty($user->phone)) { + $user->phone = ""; + } + if (empty($user->city)) { + $user->city = ""; + } + if (empty($user->country)) { + $user->country = ""; + } + +?> +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

:

:

 + username)) { formerr($err->username); } ?> +

:

 + password)) { formerr($err->password); } ?> +


+ :
+ ()

+

:

 + email)) { formerr($err->email); } ?> +

:

 + firstname)) { formerr($err->firstname);} ?> +

:

 + lastname)) { formerr($err->lastname);} ?> +

:

 + () + idnumber)) { formerr($err->idnumber);} ?> +

:

 + () + phone)) { formerr($err->phone);} ?> +

:

 + city)) { formerr($err->city);} ?> +

:

country, get_string("selectacountry"), "", "") ?> + country)) { formerr($err->country);} ?> +
" />
+
+ +