Skip to content

Commit

Permalink
IOMAD: converted old standard </br> to <br> tags
Browse files Browse the repository at this point in the history
  • Loading branch information
turf212 committed Sep 15, 2023
1 parent 6092faa commit 2bd6246
Show file tree
Hide file tree
Showing 33 changed files with 131 additions and 131 deletions.
20 changes: 10 additions & 10 deletions admin/tool/checklearningrecords/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ function do_fixbrokenlicenses($brokenlicenses) {
}
}
if (!CLI_SCRIPT) {
echo "Fixed " . count($fixed) . " records. </br>";
echo "Remaining = " . count($stillbroken) . " broken records. IDs:</br>" . join(',', array_keys($stillbroken)) . "</br>";
echo "Fixed " . count($fixed) . " records. <br>";
echo "Remaining = " . count($stillbroken) . " broken records. IDs:<br>" . join(',', array_keys($stillbroken)) . "<br>";
} else {
mtrace("Fixed " . count($fixed) . " records. </br>");
mtrace("Remaining = " . count($stillbroken) . " broken records. IDs:</br>" . join(',', array_keys($stillbroken)) . "</br>");
mtrace("Fixed " . count($fixed) . " records. <br>");
mtrace("Remaining = " . count($stillbroken) . " broken records. IDs:<br>" . join(',', array_keys($stillbroken)) . "<br>");
}
}

Expand Down Expand Up @@ -170,11 +170,11 @@ function do_fixbrokencompletions($brokencompletions) {
}
}
if (!CLI_SCRIPT) {
echo "Fixed " . count($fixed) . " records. </br>";
echo "Remaining = " . count($broken) . " broken records. IDs:</br>" . join(',', array_keys($broken)) . "</br>";
echo "Fixed " . count($fixed) . " records. <br>";
echo "Remaining = " . count($broken) . " broken records. IDs:<br>" . join(',', array_keys($broken)) . "<br>";
} else {
mtrace("Fixed " . count($fixed) . " records. </br>");
mtrace("Remaining = " . count($broken) . " broken records. IDs:</br>" . join(',', array_keys($broken)) . "</br>");
mtrace("Fixed " . count($fixed) . " records. <br>");
mtrace("Remaining = " . count($broken) . " broken records. IDs:<br>" . join(',', array_keys($broken)) . "<br>");
}
}

Expand Down Expand Up @@ -202,8 +202,8 @@ function do_fixmissingcompletions($missingcompletions) {

}
if (!CLI_SCRIPT) {
echo "Fired course completed even for " . count($missingcompletions) . " entries</br>";
echo "Fired course completed even for " . count($missingcompletions) . " entries<br>";
} else {
mtrace("Fired course completed even for " . count($missingcompletions) . " entries</br>");
mtrace("Fired course completed even for " . count($missingcompletions) . " entries<br>");
}
}
2 changes: 1 addition & 1 deletion blocks/iomad_approve_access/classes/forms/approve_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function definition() {
$user->firstname. ' '. $user->lastname.' : '.$course->fullname.'
<a href="'.
new moodle_url('/mod/trainingevent/manageclass.php', array('id' => $result->activityid)).'">'.
$activity->name.' '.date($dateformat, $activity->startdatetime).'</a></br><b>'.
$activity->name.' '.date($dateformat, $activity->startdatetime).'</a><br><b>'.
get_string('fullybooked', 'block_iomad_approve_access')."</b>",
array(' '), false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,17 @@ public function definition_after_data() {
<td id="buttonscell">
<input name="add" id="add" type="submit" value="&nbsp;' .
$output->larrow().'&nbsp;'. get_string('enrol', 'block_iomad_company_admin') .
'" title="Enrol" /></br>
'" title="Enrol" /><br>
<input name="addall" id="addall" type="submit" value="&nbsp;' .
$output->larrow().'&nbsp;'. get_string('enrolall', 'block_iomad_company_admin') .
'" title="Enrolall" /></br>
'" title="Enrolall" /><br>
<input name="remove" id="remove" type="submit" value="' .
$output->rarrow().'&nbsp;'. get_string('unenrol', 'block_iomad_company_admin') .
'&nbsp;" title="Unenrol" /></br>
'&nbsp;" title="Unenrol" /><br>
<input name="removeall" id="removeall" type="submit" value="&nbsp;' .
$output->rarrow().'&nbsp;'. get_string('unenrolall', 'block_iomad_company_admin') .
'" title="Enrolall" /></br>
'" title="Enrolall" /><br>
</td>
<td id="potentialcell">');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function definition_after_data() {
if (!empty($this->licenseid)) {
$mform->addElement('html', '<br /><p align="center"><b>' . get_string('licenseleft1', 'block_iomad_company_admin') .
((intval($licensestring3, 0)) - (intval($licensestring2, 0))) .
"$licenseleft2</br>$programstr</b></p>");
"$licenseleft2<br>$programstr</b></p>");

$mform->addElement('date_time_selector', 'due', get_string('senddate', 'block_iomad_company_admin'));
$mform->addHelpButton('due', 'senddate', 'block_iomad_company_admin');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function definition() {
foreach ($coursegroups as $key => $value) {

$coursegrouphtml .= '<input type = "radio" name = "groupids[]" value="'.
$key.'" /> '.$value.'</br>';
$key.'" /> '.$value.'<br>';
}
}
// Then show the fields about where this block appears.
Expand All @@ -75,7 +75,7 @@ public function definition() {
$company->get_name());

if (empty($coursegroups)) {
$mform->addElement('html', "<h3>" . get_string('nogroups', 'block_iomad_company_admin') . "</h3></br>");
$mform->addElement('html', "<h3>" . get_string('nogroups', 'block_iomad_company_admin') . "</h3><br>");
}
$mform->addElement('html', $coursegrouphtml);
$mform->addElement('hidden', 'selectedcourse', $this->courseid);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function definition() {
$company->get_name());

if (empty($coursegroups)) {
$mform->addElement('html', "<h3>" . get_string('nogroups', 'block_iomad_company_admin') . "</h3></br>");
$mform->addElement('html', "<h3>" . get_string('nogroups', 'block_iomad_company_admin') . "</h3><br>");
} else {
$autooptions = array('setmultiple' => false,
'noselectionstring' => '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function definition_after_data() {
$mform->addElement('html', '
<input name="remove" id="remove" type="submit" value="' .
get_string('remove') . '&nbsp;' . $output->rarrow() .
'" title="'.get_string('remove') .'" /></br>');
'" title="'.get_string('remove') .'" /><br>');
}

$mform->addElement('html', '
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ public function definition() {
foreach ($subdepartmentslist as $key => $value) {

$subdepartmenthtml .= '<input type = "checkbox" name = "departmentids[]" value="'.
$key.'" /> '.$value.'</br>';
$key.'" /> '.$value.'<br>';
}
}

if (count($departmentslist) == 1) {
$mform->addElement('html', "<h3>" . get_string('nodepartments', 'block_iomad_company_admin') . "</h3></br>");
$mform->addElement('html', "<h3>" . get_string('nodepartments', 'block_iomad_company_admin') . "</h3><br>");
}

if (!empty($this->action)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ public function col_coursesname($row) {
}
} else {
if ($issiteadmin) {
$coursestring .= ",</br><a href='".new moodle_url('/course/view.php',
$coursestring .= ",<br><a href='".new moodle_url('/course/view.php',
array('id' => $licensecourse->courseid))."'>".format_string($coursename->fullname, true, 1)."</a>";
} else {
$coursestring .= ",</br>". format_string($coursename->fullname, true, 1);
$coursestring .= ",<br>". format_string($coursename->fullname, true, 1);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions blocks/iomad_company_admin/classes/tables/editusers_table.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function col_department($row) {
$returnstr .= format_string($this->departmentsmenu[$department]);

if ($current < $count) {
$returnstr .= ",</br>";
$returnstr .= ",<br>";
}
$current++;
}
Expand Down Expand Up @@ -127,7 +127,7 @@ public function col_managertype($row) {
if (empty($USER->editing)) {
$returnstr .= $this->usertypes[$row->managertype];
if (!empty($row->educator) && empty($CFG->iomad_autoenrol_managers)) {
$returnstr .= ",</br>" . $this->usertypes[3];
$returnstr .= ",<br>" . $this->usertypes[3];
}

return $returnstr;
Expand Down
2 changes: 1 addition & 1 deletion blocks/iomad_company_admin/editusers_table.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function col_department($row) {
foreach($departments as $department) {
$returnstr .= format_string($department->name);
if ($current < $count) {
$returnstr .= ",</br>";
$returnstr .= ",<br>";
}
$current++;
}
Expand Down
2 changes: 1 addition & 1 deletion blocks/iomad_company_admin/iomad_competencies_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
$companyselect = new single_select($linkurl, 'company', $companyids, $company);
$companyselect->label = get_string('company', 'block_iomad_company_admin');
$companyselect->formid = 'choosecompany';
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'</br>';
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'<br>';

// Need a name search in here too.

Expand Down
2 changes: 1 addition & 1 deletion blocks/iomad_company_admin/iomad_courses_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
$companyselect->label = get_string('filtercompany', 'block_iomad_company_admin');
echo html_writer::start_tag('div', array('class' => 'reporttablecontrolscontrol'));
if ($canedit) {
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'</br>';
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'<br>';
}
echo html_writer::start_tag('div', array('class' => 'searchcourseform'));
$mform->display();
Expand Down
2 changes: 1 addition & 1 deletion blocks/iomad_company_admin/iomad_frameworks_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
$companyselect = new single_select($linkurl, 'company', $companyids, $company);
$companyselect->label = get_string('company', 'block_iomad_company_admin');
$companyselect->formid = 'choosecompany';
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'</br>';
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'<br>';

// Need a name search in here too.

Expand Down
2 changes: 1 addition & 1 deletion blocks/iomad_company_admin/iomad_templates_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
$companyselect = new single_select($linkurl, 'company', $companyids, $company);
$companyselect->label = get_string('company', 'block_iomad_company_admin');
$companyselect->formid = 'choosecompany';
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'</br>';
echo html_writer::tag('div', $OUTPUT->render($companyselect), array('id' => 'iomad_company_selector')).'<br>';

// Need a name search in here too.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
$string['iomad_company_admin:view_licenses'] = 'Lizenzen der Organisation anzeigen';
$string['iomad_company_admin:view'] = 'Organisation anzeigen';
$string['isdefaultgroupdelete'] = 'Das ist die Standard-Kursgruppe. Ändern ist möglich, löschen nicht.';
$string['isdefaultgroupusers'] = 'Das ist die Standard-Kursgruppe. Nutzer können nciht entfernt werden.</br>Verschieben in andere Gurppen ist möglich.';
$string['isdefaultgroupusers'] = 'Das ist die Standard-Kursgruppe. Nutzer können nciht entfernt werden.<br>Verschieben in andere Gurppen ist möglich.';
$string['enrol'] = 'Amelden';
$string['enrolunenrollusers'] = 'Nutzer an-/abmelden ';
$string['enroluser'] = 'Kursanmeldungen';
Expand All @@ -289,7 +289,7 @@
$string['invalid_company'] = 'Optional field profile_field_Organisation must match your Organisation\'s Kurzname.';
$string['iomad_frameworks_title'] = 'Kompetenzrahmen verwalten';
$string['iomad_templates_title'] = 'Lernpläne verwalten';
$string['leavepasswordemptytogenerate'] = 'Leave empty to have a password generated.</br>If you are manually setting a password, for</br>security reasons, only select to send by email</br>if the force change password option is selected!';
$string['leavepasswordemptytogenerate'] = 'Leave empty to have a password generated.<br>If you are manually setting a password, for<br>security reasons, only select to send by email<br>if the force change password option is selected!';
$string['licenseaddnew'] = 'Neue Lizenzen erzeugen';
$string['licenseallocate'] = 'Lizenzen zuweisen';
$string['licenseallocateall'] = 'Lizenzen zu allen zuweisen';
Expand Down Expand Up @@ -323,7 +323,7 @@
$string['licensetotal'] = ' Lizenzen have been zugewiesen';
$string['licensetype'] = 'Lizenz type';
$string['licensetype_help'] = 'Standard Lizenzen cannot be taken off of a Nutzerif they have used it. Reusable Lizenz allow for a Lizenz to be taken off of a Nutzereven if they started the courese. Their access is removed but their Kurs information is not removed.';
$string['licenseusedwarning'] = '<span style="text-align: center">* Nutzer who are marked with an asterix are already using their Lizenzzuordnung for a Kurs and so cannot have their Lizenz taken away from them.</br></span>';
$string['licenseusedwarning'] = '<span style="text-align: center">* Nutzer who are marked with an asterix are already using their Lizenzzuordnung for a Kurs and so cannot have their Lizenz taken away from them.<br></span>';
$string['license_users_for'] = 'Nutzer for Lizenz \'{$a}\' ';
$string['licenseusers'] = 'Nutzer Lizenzzuordnungs';
$string['listroles'] = 'Zeige LLL-roles';
Expand Down
12 changes: 6 additions & 6 deletions blocks/iomad_company_admin/lang/en/block_iomad_company_admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
$string['iomad_company_admin:view_my_company_email'] = 'Unused ';
$string['iomad_company_admin:view'] = 'View a company';
$string['isdefaultgroupdelete'] = 'This is the default company course group. You can edit it but not delete it.';
$string['isdefaultgroupusers'] = 'This is the default course group. You cannot remove members from it.</br>If you want to move users out of it, please select another group and add users to that group instead.';
$string['isdefaultgroupusers'] = 'This is the default course group. You cannot remove members from it.<br>If you want to move users out of it, please select another group and add users to that group instead.';
$string['enrol'] = 'Enrol';
$string['enrolall'] = 'Enrol all';
$string['enrolunenrollusers'] = 'Enrol/unenrol users';
Expand All @@ -424,7 +424,7 @@
$string['inuse'] = 'In use';
$string['iomad_frameworks_title'] = 'Manage competency frameworks';
$string['iomad_templates_title'] = 'Manage learning plan templates';
$string['leavepasswordemptytogenerate'] = 'Leave empty to have a password generated.</br>If you are manually setting a password, for</br>security reasons, only select to send by email</br>if the force change password option is selected!';
$string['leavepasswordemptytogenerate'] = 'Leave empty to have a password generated.<br>If you are manually setting a password, for<br>security reasons, only select to send by email<br>if the force change password option is selected!';
$string['licenseaddnew'] = 'Create new license';
$string['licenseallocate'] = 'Allocate license';
$string['licenseallocateall'] = 'Allocate licenses to all';
Expand Down Expand Up @@ -478,7 +478,7 @@
$string['licenseunallocatedtoraw'] = 'License unallocated to';
$string['licenseused'] = 'License used';
$string['licenseupdatedok'] = 'License was successfully updated';
$string['licenseusedwarning'] = '<center>* Users who are marked with an asterix are already using their license allocation for a course and so cannot have their license taken away from them.</br></center>';
$string['licenseusedwarning'] = '<center>* Users who are marked with an asterix are already using their license allocation for a course and so cannot have their license taken away from them.<br></center>';
$string['licenseuserinuse'] = 'License in use';
$string['license_users_for'] = 'Users for license \'{$a}\' ';
$string['licenseusers'] = 'User license allocations';
Expand Down Expand Up @@ -601,9 +601,9 @@
$string['profile_field_company_not_set'] = 'profile_field_company is required when no company has been selected.';
$string['programallocate'] = 'Allocate program license';
$string['programallocate_help'] = 'Selecting yes will allocate all of the courses in this program to the user.';
$string['purgeselectedentriesconfirm'] = 'Are you sure that you want to <b>permanently remove</b> all of the selected report records for this user?</br>This can NOT be undone.';
$string['purgeselectedcourseentriesconfirm'] = 'Are you sure that you want to <b>permanently remove</b> all of the selected report records for this course?</br>This can NOT be undone.';
$string['redoselectedcertificatesconfirm'] = 'Are you sure that you want to regenerate all of the selected certificates?</br>This can NOT be undone.';
$string['purgeselectedentriesconfirm'] = 'Are you sure that you want to <b>permanently remove</b> all of the selected report records for this user?<br>This can NOT be undone.';
$string['purgeselectedcourseentriesconfirm'] = 'Are you sure that you want to <b>permanently remove</b> all of the selected report records for this course?<br>This can NOT be undone.';
$string['redoselectedcertificatesconfirm'] = 'Are you sure that you want to regenerate all of the selected certificates?<br>This can NOT be undone.';
$string['redoselectedcertificates'] = 'Regenerate selected certificates';
$string['reminderemails'] = 'Reminder emails';
$string['reports'] = 'Reports';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function definition() {
foreach ($subdepartmentslist as $key => $value) {

$subdepartmenthtml .= '<input type = "checkbox" name = "departmentids[]" value="'.
$key.'" /> '.$value.'</br>';
$key.'" /> '.$value.'<br>';
}
}

Expand All @@ -73,7 +73,7 @@ public function definition() {
$this->company->get_name());

if (count($departmentslist) == 1) {
$mform->addElement('html', "<h3>" . get_string('nodepartments', 'block_iomad_company_admin') . "</h3></br>");
$mform->addElement('html', "<h3>" . get_string('nodepartments', 'block_iomad_company_admin') . "</h3><br>");
}

$mform->addElement('html', '<p>' . get_string('parentdepartment', 'block_iomad_company_admin') . '</p>');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,17 @@ public function definition_after_data() {
<td id="buttonscell">
<input name="add" id="add" type="submit" value="&nbsp;' .
$output->larrow().'&nbsp;'. get_string('enrol', 'block_iomad_company_admin') .
'" title="Enrol" /></br>
'" title="Enrol" /><br>
<input name="addall" id="addall" type="submit" value="&nbsp;' .
$output->larrow().'&nbsp;'. get_string('enrolall', 'block_iomad_company_admin') .
'" title="Enrolall" /></br>
'" title="Enrolall" /><br>
<input name="remove" id="remove" type="submit" value="' .
$output->rarrow().'&nbsp;'. get_string('unenrol', 'block_iomad_company_admin') .
'&nbsp;" title="Unenrol" /></br>
'&nbsp;" title="Unenrol" /><br>
<input name="removeall" id="removeall" type="submit" value="&nbsp;' .
$output->rarrow().'&nbsp;'. get_string('unenrolall', 'block_iomad_company_admin') .
'" title="Enrolall" /></br>
'" title="Enrolall" /><br>
</td>
<td id="potentialcell">');

Expand Down
Loading

0 comments on commit 2bd6246

Please sign in to comment.