Merged xhtml fixes for MDL-8755

diff --git a/course/info.php b/course/info.php
index c30390bd4e033f0d7dacf3e59566604e6bac23ff..feb253bf2236326af2bcef0a5aaf9c79b135b4c3 100644 (file)
--- a/course/info.php
+++ b/course/info.php
@@ -30,46 +30,53 @@
 
     print_header(get_string("summaryof", "", $course->fullname));
 
-    echo "<h3 align=\"center\">" . format_string($course->fullname) . "<br />(" . format_string($course->shortname) . ")</h3>";
+    print_heading(format_string($course->fullname) . '<br />(' . format_string($course->shortname) . ')');
 
-    echo "<center>";
-    if ($course->guest) {
-        $strallowguests = get_string("allowguests");
-        echo "<p><font size=\"1\"><img align=\"middle\" alt=\"\" class=\"icon\" src=\"$CFG->pixpath/i/guest.gif\" /></a>&nbsp;$strallowguests</font></p>";
-    }
-    if ($course->password) {
-        $strrequireskey = get_string("requireskey");
-        echo "<p><font size=\"1\"><img align=\"middle\" alt=\"\" class=\"icon\" src=\"$CFG->pixpath/i/key.gif\" /></a>&nbsp;$strrequireskey</font></p>";
+    if ($course->guest || $course->password) {
+        print_box_start('generalbox icons');
+        if ($course->guest) {
+            $strallowguests = get_string('allowguests');
+            echo "<div><img alt=\"\" class=\"icon guest\" src=\"$CFG->pixpath/i/guest.gif\" />&nbsp;$strallowguests</div>";
+        }
+        if ($course->password) {
+            $strrequireskey = get_string('requireskey');
+            echo "<div><img alt=\"\" class=\"icon key\" src=\"$CFG->pixpath/i/key.gif\" />&nbsp;$strrequireskey</div>";
+        }
+        print_box_end();
     }
 
 
-    if ($teachers = get_course_teachers($course->id)) {
-        echo "<table align=\"center\"><tr><td style=\"white-space: nowrap\">";
-        echo "<p><font size=\"1\">\n";
-        foreach ($teachers as $teacher) {
-            if ($teacher->authority > 0) {
-                if (!$teacher->role) {
-                    $teacher->role = $course->teacher;
+    print_box_start('generalbox info');
+
+    echo filter_text(text_to_html($course->summary),$course->id);
+
+    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    if ($managerroles = get_config('', 'coursemanager')) {
+        $coursemanagerroles = split(',', $managerroles);
+        foreach ($coursemanagerroles as $roleid) {
+            $role = get_record('role','id',$roleid);
+            if ($users = get_role_users($roleid, $context, true, '', 'u.lastname ASC', true)) {
+                foreach ($users as $teacher) {
+                    $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context)); 
+                    $namesarray[] = format_string($role->name).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
+                                    $teacher->id.'&amp;course='.SITEID.'">'.$fullname.'</a>';
                 }
-                echo "$teacher->role: ";
-                link_to_popup_window ("/user/view.php?id=$teacher->id&amp;course=$site->id", "opener", 
-                                      fullname($teacher), 400, 500, "$teacher->role", 
-                                      "");
-                echo "<br />";
-            }
+            }          
+        }
+        
+        if (!empty($namesarray)) {
+            echo "<ul class=\"teachers\">\n<li>";
+            echo implode('</li><li>', $namesarray);
+            echo "</li></ul>";
         }
-        echo "</font></p>";
-        echo "</td</tr></table>";
     }
-    echo "<br />";
 
-    print_simple_box_start("center", "100%");
-    echo filter_text(text_to_html($course->summary),$course->id);
-    print_simple_box_end();
+    print_box_end();
 
     echo "<br />";
 
     close_window_button();
 
-?>
+    print_footer();
 
+?>

diff --git a/lib/weblib.php b/lib/weblib.php
index b744cde317753b3d12b84d826a1576b4139ff09e..73e1a22d3f8861e3c0fbfad2506a9da2b010580a 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -597,19 +597,14 @@ function button_to_popup_window ($url, $name='popup', $linkname='click here',
  * Prints a simple button to close a window
  */
 function close_window_button($name='closewindow', $return=false) {
+    global $CFG;
+
     $output = '';
 
     $output .= '<div class="closewindow">' . "\n";
-    $output .= '<script type="text/javascript">' . "\n";
-    $output .= '//<![CDATA[' . "\n";
-    $output .= "document.write('<form>');\n";
-    $output .= "document.write('<input type=\"button\" onclick=\"self.close();\" value=\"".get_string("closewindow")."\" />');\n";
-    $output .= "document.write('<\/form>');\n";
-    $output .= '//]]>' . "\n";
-    $output .= '</script>' . "\n";
-    $output .= '<noscript><p>' . "\n";
-    $output .= get_string($name);
-    $output .= '</p></noscript>' . "\n";
+    $output .= '<form action="'.$CFG->wwwroot.'"><div>';   // We don't use this
+    $output .= '<input type="button" onclick="self.close();" value="'.get_string($name).'" />';
+    $output .= '</div></form>';
     $output .= '</div>' . "\n";
 
     if ($return) {

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 9fe77248e2eae24f18d17bb15a2a80d8f8684e45..14ea7f55e0b5e626edd299b550cf083e9beed545 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -256,7 +256,7 @@ img.grouppicture {
   margin-left:3em;
 }
 
-#help .closewindow,
+.closewindow,
 #help .helpindex {
   text-align: center;
 }
@@ -1641,6 +1641,15 @@ body#course-index .addcategory {
   text-align: center;
 }
 
+body#course-info .generalbox.icons {
+  text-align: center;
+}
+
+body#course-info .generalbox.info {
+  margin-left:auto;
+  margin-right:auto;
+}
+
 .coursebox {
   width: 100%;
   float:left;