diff --git a/admin/mnet/delete.html b/admin/mnet/delete.html index d42352b296b..bb11f2e2884 100644 --- a/admin/mnet/delete.html +++ b/admin/mnet/delete.html @@ -5,8 +5,8 @@ print_header("$site->shortname: $strmnetsettings", "$site->fullname", print_heading(get_string('mnetsettings', 'mnet')); ?> -
- +
+
@@ -14,7 +14,7 @@ print_heading(get_string('mnetsettings', 'mnet')); 0): + if (count($warn) > 0){ ?> diff --git a/admin/mnet/enr_course_enrol.html b/admin/mnet/enr_course_enrol.html index 09212f91d78..67c5cb169ce 100755 --- a/admin/mnet/enr_course_enrol.html +++ b/admin/mnet/enr_course_enrol.html @@ -1,10 +1,11 @@ +
-
Deleting a Server
:
@@ -22,7 +22,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
: "name; ?>"?
+
@@ -99,4 +100,5 @@
+ diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php index f1157dbe1b9..a0af7e86d04 100644 --- a/admin/mnet/enr_courses.php +++ b/admin/mnet/enr_courses.php @@ -29,9 +29,10 @@ print_box('' . s($host->name) . '
' . get_string("enrolcourses_desc", "mnet")); - echo "
"; + echo '
'; - print (''); + echo '
' + . '
'; $icon = "pixpath/i/course.gif\"". " class=\"icon\" alt=\"".get_string("course")."\" />"; @@ -39,7 +40,7 @@ foreach ($courses as $course) { $link = $CFG->wwwroot . '/admin/mnet/enr_course_enrol.php?' . "host={$mnethost}&courseid={$course->id}&sesskey={$USER->sesskey}"; - print ('' + echo '' . "" . "" . '' @@ -48,9 +49,9 @@ . '' . '' . "" - . ''); + . ''; } - print ('
$icon".format_string($course->fullname). "
{$course->summary}
'); + echo '
'; admin_externalpage_print_footer($adminroot); diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php index 35a1f0d622a..2f78fa556f2 100644 --- a/admin/mnet/enr_hosts.php +++ b/admin/mnet/enr_hosts.php @@ -22,19 +22,20 @@ print_box(get_string("remoteenrolhosts_desc", "mnet")); - echo "
"; + echo '
'; if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') { print_box(get_string('mnetdisabled','mnet')); } - print ('' + echo '
' + . '
' . '' . '' . '' . '' // . '' - . ''); + . ''; $hosts = $enrolment->list_remote_servers(); foreach ($hosts as $host) { $coursesurl = "{$CFG->wwwroot}/admin/mnet/enr_courses.php?host={$host->id}&sesskey={$USER->sesskey}"; @@ -44,16 +45,17 @@ } $enrolcount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_assignments WHERE hostid={$host->id}"); - print ('' + echo '' . "" . "" . "" // TODO: teach report/log/index.php to show per-host-logs // . '' - . ''); + . ''; } - print ('
'.get_string('host', 'mnet').' '.get_string('enrolments', 'mnet').' '.get_string('courses', 'mnet').'  
{$host->name}$enrolcount$coursecount - ".get_string('editenrolments', 'mnet')."' // . get_string('logs', 'mnet').'
'); + echo '' + . ''; admin_externalpage_print_footer($adminroot); diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html index f017df6153d..8733b51661d 100644 --- a/admin/mnet/mnet_review.html +++ b/admin/mnet/mnet_review.html @@ -19,6 +19,7 @@ print_tabs(array($tabs), 'mnetdetails'); print_simple_box_start("center", ""); ?>
+
@@ -74,7 +75,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) { @@ -85,18 +86,18 @@ if(!empty($currentkey)):
id) && $mnet_peer->id > 0): +if (isset($mnet_peer->id) && $mnet_peer->id > 0) { ?> : last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?> deleted) && $mnet_peer->deleted > 0): +if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0){ ?> : @@ -106,9 +107,9 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0): ip_address) && '' != $mnet_peer->ip_address): +if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){ ?> ip_address) && '' != $mnet_peer->ip_address): " /> +
+
$versions): + foreach($myservices as $name => $versions) { $version = current($versions); ?>

name); ?>

-

name); ?>

+ name); ?> 1) { $versionstring = '('.get_string('version','mnet') .' '.$version['apiversion'].')'; } else { @@ -40,16 +41,37 @@ print_simple_box_start("center", ""); echo $breakstring; ?> - />name).'">√ '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish'])); ?>
- />name).'">√ '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?>
-]" /> +name).'">√ '; + } + if (!empty($version['allhosts_publish'])) { + print_string("enabled_for_all",'mnet',!empty($version['I_publish'])); + } + echo '
'; +?> + /> +name).'">√ '; + } + if (!empty($version['allhosts_subscribe'])) { + print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); + } + + echo '
'; $breakstring = '. . . . . . . . . . . . . . . . . . . . . . . .
'; - endforeach; + } // end foreach ?>
@@ -70,6 +92,7 @@ print_simple_box_start("center", "");
+
mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' print_box(get_string('mnetdisabled','mnet')); } ?> -
-
- - - - - - - - - - - - - - - - -
mnet_register_allhosts)) echo 'checked="checked" '; ?>/>
-
- - - - - - - +
+
+
+ + +
+ + + + + + + + + + + + + +
mnet_register_allhosts)) echo 'checked="checked" '; ?>/>
+ + + + + + + + + last_connect_time == 0) { $last_connect = get_string('never'); @@ -46,43 +48,46 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' - + - - - +
name; ?> wwwroot; ?>id != $CFG->mnet_all_hosts_id) echo $last_connect; ?>id != $CFG->mnet_all_hosts_id) echo $last_connect; ?> -id != $CFG->mnet_all_hosts_id): ?> +id != $CFG->mnet_all_hosts_id){ ?>
+
+
- +
 
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
+ + + +
- -
+ \ No newline at end of file +?> diff --git a/admin/mnet/trustedhosts.html b/admin/mnet/trustedhosts.html index c924e7a8588..f2f4b88fb69 100644 --- a/admin/mnet/trustedhosts.html +++ b/admin/mnet/trustedhosts.html @@ -1,26 +1,29 @@ -
- +
+
- + -
- -
- +
+ +
+ +
+ +
- +
- + '; + echo '
'; print_string('validated_by', 'mnet', $validated_by); } else { print_string('not_in_range', 'mnet', $test_ip_address); @@ -48,15 +51,18 @@ admin_externalpage_print_header($adminroot); endif; ?> -
- - - +
+ +
+ + + +
-
+ \ No newline at end of file +?> diff --git a/auth/mnet/config.html b/auth/mnet/config.html index d85b9b304d9..fb87bc40fed 100644 --- a/auth/mnet/config.html +++ b/auth/mnet/config.html @@ -15,7 +15,8 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' } ?> - +
+
@@ -59,29 +60,30 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
: :
:
:
:
+ diff --git a/course/lib.php b/course/lib.php index 0fca9adaf81..433f6f45013 100644 --- a/course/lib.php +++ b/course/lib.php @@ -520,7 +520,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per echo ''; if ($course->id == SITEID) { echo "\n"; - echo " wwwroot}/course/view.php?id={$log->course}\">".$courses[$log->course]."\n"; + echo " wwwroot}/course/view.php?id={$log->course}\">". format_string($courses[$log->course])."\n"; echo "\n"; } echo "".userdate($log->time, '%a'). diff --git a/enrol/flatfile/config.html b/enrol/flatfile/config.html index ce2571019f8..bb27df8bc08 100644 --- a/enrol/flatfile/config.html +++ b/enrol/flatfile/config.html @@ -44,12 +44,12 @@ enrol_flatfilemapping: -enrol_flatfilemapping as $id => $record): +enrol_flatfilemapping as $id => $record) { list($name, $mapping) = $record; ?> - + diff --git a/enrol/ldap/config.html b/enrol/ldap/config.html index 77c92dcb5df..cb4daa1709e 100755 --- a/enrol/ldap/config.html +++ b/enrol/ldap/config.html @@ -216,13 +216,13 @@ if (!isset($frm->enrol_ldap_template)) { - + name, ENT_COMPAT, 'UTF-8'); ?> - + diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index 39b1537e70a..62604adbb74 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -1044,6 +1044,20 @@ body#admin-modules table.generaltable td.c0 float: none; } +#trustedhosts .generaltable { + margin-left: auto; + margin-right: auto; + width: 500px; +} + +#trustedhosts .standard { + width: auto; +} + +#mnetconfig table { + margin-left: auto; + margin-right: auto; +} /*** *** Blocks