From 031c49fabb474edbc4e59a61233be854699a8e4e Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 7 Sep 2004 08:05:25 +0000 Subject: [PATCH] HTML code tidy up --- user/edit.html | 156 ++++++++++++++++++++++++------------------------- user/edit.php | 12 ++-- user/index.php | 16 ++--- user/view.php | 46 +++++++-------- 4 files changed, 115 insertions(+), 115 deletions(-) diff --git a/user/edit.html b/user/edit.html index 05be96ec0d..6a217b3314 100644 --- a/user/edit.html +++ b/user/edit.html @@ -12,34 +12,34 @@ ?>
- +
id == $USER->id) and ($USER->id == $user->id)); - echo ""; - echo ""; + echo ""; + echo ""; if ($adminself || is_internal_auth($user->auth) ){ - echo ""; echo ""; if ($adminself || is_internal_auth($user->auth) ){ - echo ""; - echo ""; - echo ""; + echo ""; echo ""; - echo ""; + echo ""; } } ?> - - - + + - - - + + - - - + + - - + + - - + + - - + + - - + + - - + + htmleditor) { ?> - - + + - - - + + - - + + - - + + - - + + - - + + - + + - - + + gdversion) and isadmin()) { ?> - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - +

".get_string("username").":

".get_string("username").":

username); - echo "\">"; + echo "\"/>"; if (isset($err["username"])) formerr($err["username"]); } else { echo ""; p($user->username); echo "username); - echo "\">"; + echo "\"/>"; } echo "

".get_string("newpassword").":

"; + echo "

".get_string("newpassword").":

newpassword)) p($user->newpassword); - echo "\">"; + echo "\"/>"; if (isset($err["newpassword"])) { formerr($err["newpassword"]); } else if (empty($user->newpassword)) { @@ -47,30 +47,30 @@ if (isadmin()) { } echo "

:

 +

:

:

 +

:

:

 +

:

:

:

 maildisplay, "") ?>

:

:

 emailstop, "") ?>

:

:

 mailformat, "") ?>

:

:

 maildigest, "") ?>

:

:

:

:

:

 +

:

:

:

 country and $CFG->country) { @@ -145,8 +145,8 @@ if (isadmin()) {

:

:

 lang) { $user->lang = $CFG->lang; @@ -157,8 +157,8 @@ if (isadmin()) { ?>

:

:

 timezone) > 13) { $user->timezone = 99; @@ -184,8 +184,8 @@ if (isadmin()) { ?>

:

:

 "; @@ -203,8 +203,8 @@ if (isadmin()) { $maxbytes = get_max_upload_file_size($CFG->maxbytes, $course->maxbytes); if (!empty($CFG->gdversion) and $maxbytes and empty($CFG->disableuserimages)) { ?> -

:

:

 id, $course->id, $user->picture, false, false, false); if ($user->picture) { @@ -214,11 +214,11 @@ if (isadmin()) { ?>

:

:

 - - + +

:

:

 wwwroot/$CFG->admin/config.php\">"; @@ -238,58 +238,58 @@ if (isadmin()) {

:

 +

:

:

 +

:

:

 +

:

:

 +

:

:

 +

:

1:

 +

1:

2:

 +

2:

:

 +

:
">" />
- - + +
diff --git a/user/edit.php b/user/edit.php index 6c9ace7071..8040edf635 100644 --- a/user/edit.php +++ b/user/edit.php @@ -145,16 +145,16 @@ } if ($course->category) { print_header("$course->shortname: $streditmyprofile", "$course->fullname: $streditmyprofile", - "wwwroot/course/view.php?id=$course->id\">$course->shortname - -> id\">$strparticipants - -> id&course=$course->id\">$userfullname + "wwwroot/course/view.php?id=$course->id\">$course->shortname + -> id\">$strparticipants + -> id&course=$course->id\">$userfullname -> $streditmyprofile", ""); } else { if (isset($USER->newadminuser)) { print_header(); } else { print_header("$course->shortname: $streditmyprofile", "$course->fullname", - "id&course=$course->id\">$userfullname + "id&course=$course->id\">$userfullname -> $streditmyprofile", ""); } } @@ -184,9 +184,9 @@ print_simple_box_start("center", "", "$THEME->cellheading"); if (!empty($err)) { - echo "
"; + echo "
"; notify(get_string("someerrorswerefound")); - echo "
"; + echo "
"; } include("edit.html"); print_simple_box_end(); diff --git a/user/index.php b/user/index.php index e286b55653..3786d4fe26 100644 --- a/user/index.php +++ b/user/index.php @@ -51,7 +51,7 @@ if ($course->category) { print_header("$course->shortname: ".get_string("participants"), "$course->fullname", - "id>$course->shortname -> ". + "id\">$course->shortname -> ". "$participantslink", "", "", true, " ", navmenu($course)); } else { print_header("$course->shortname: ".get_string("participants"), "$course->fullname", @@ -128,15 +128,15 @@ } } - echo "

$totalcount $course->students"; + echo "

$totalcount $course->students"; if (isteacheredit($course->id)) { echo ' '; - echo ''; + echo ''; } echo '

'; if (($CFG->longtimenosee < 500) and (!$page) and ($sort == "lastaccess")) { - echo "

("; + echo "

("; print_string("unusedaccounts","",$CFG->longtimenosee); echo ")

"; } @@ -271,7 +271,7 @@ function print_user_table($users, $isteacher) { $table->head = array (" ", "$firstname / $lastname", $city, $country, $lastaccess); - $table->align = array ("LEFT", "LEFT", "LEFT", "LEFT", "LEFT"); + $table->align = array ("left", "left", "left", "left", "left"); $table->size = array ("10", "*", "*", "*", "*"); $table->size = array ("10", "*", "*", "*", "*"); $table->cellpadding = 4; @@ -291,9 +291,9 @@ function print_user_table($users, $isteacher) { $table->data[] = array ($picture, "wwwroot/user/view.php?id=$user->id&course=$course->id\">$fullname", - "$user->city", - "$user->country", - "$lastaccess"); + "$user->city", + "$user->country", + "$lastaccess"); } print_table($table); } diff --git a/user/view.php b/user/view.php index dbcbeed339..5200206efd 100644 --- a/user/view.php +++ b/user/view.php @@ -102,7 +102,7 @@ // Print name and edit button across top - echo "
"; + echo ""; + echo ""; } ?> -- 2.39.5
"; echo "

$fullname

"; echo "		"; if (($currentuser and !isguest()) or isadmin()) { @@ -123,7 +123,7 @@ // Print the description if ($user->description) { - echo "

".format_text($user->description, FORMAT_MOODLE)."

"; + echo "

".format_text($user->description, FORMAT_MOODLE)."

"; } // Print all the little details in a list @@ -173,7 +173,7 @@ } $emailswitch = " id&course=$course->id&$switchparam=$user->id\">". - "pixpath/t/$switchpix\">"; + "pixpath/t/$switchpix\" />"; } else { $emailswitch = ''; } @@ -186,7 +186,7 @@ } if ($user->icq) { - print_row("ICQ:","icq\">$user->icq icq&img=5\" width=18 height=18 border=0>"); + print_row("ICQ:","icq\">$user->icq icq&img=5\" width=\"18\" height=\"18\" border=\"0\" />"); } if (isteacher($course->id)) { @@ -222,40 +222,40 @@ } // Print other functions - echo "
"; + echo "
"; if ($currentuser and !isguest()) { if ($internalpassword) { - echo ""; } else if (strlen($CFG->changepassword) > 1) { - echo ""; } } if ($course->category and ((isstudent($course->id) and ($user->id == $USER->id) and !isguest() and $CFG->allowunenroll) or (isteacheredit($course->id) and isstudent($course->id, $user->id))) ) { - echo ""; } if (isteacher($course->id) or ($course->showreports and $USER->id == $user->id)) { - echo ""; } if ((isadmin() and !isadmin($user->id)) or (isteacher($course->id) and ($USER->id != $user->id) and !iscreator($user->id))) { - echo ""; } echo "

"; - echo "id\">"; - echo ""; + echo "

"; + echo "id\" />"; + echo ""; echo "

changepassword\" method=get>"; - echo ""; + echo "

changepassword\" method=\"get\">"; + echo ""; echo "

"; - echo "id\">"; - echo "id\">"; - echo "shortname)."\">"; + echo "

"; + echo "id\" />"; + echo "id\" />"; + echo "shortname)."\">"; echo "

"; - echo "id\">"; - echo "id\">"; - echo ""; + echo "

"; + echo "id\" />"; + echo "id\" />"; + echo ""; echo "

"; - echo "id\">"; - echo "id\">"; - echo ""; + echo "

"; + echo "id\" />"; + echo "id\" />"; + echo ""; echo "

\n"; @@ -273,7 +273,7 @@ /// Functions /////// function print_row($left, $right) { - echo "

$left

$right

$left

$right