Removed THEME from many course files

diff --git a/course/category.php b/course/category.php
index 30568606546249d958a49f2ec419b9203a33f05a..51c3f9ce61d7be85610a427488ced5b4fa2bd6e1 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -282,11 +282,6 @@
         $strallowguests     = get_string("allowguests");
         $strrequireskey     = get_string("requireskey");
 
-        if (empty($THEME->custompix)) {
-            $pixpath = "$CFG->wwwroot/pix";
-        } else {
-            $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
-        }
 
         echo '<form name="movecourses" action="category.php" method="post">';
         echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\">";
@@ -319,33 +314,33 @@
                     echo "<td>";
                     echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.
                          $acourse->id.'">'.
-                         '<img src="'.$pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="" /></a> ';
                     echo '<a title="'.$strassignteachers.'" href="'.$CFG->wwwroot.'/course/teacher.php?id='.
                          $acourse->id.'">'.
-                         '<img src="'.$pixpath.'/t/user.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0" alt="" /></a> ';
                     echo '<a title="'.$strdelete.'" href="delete.php?id='.$acourse->id.'">'.
-                         '<img src="'.$pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="" /></a> ';
                     if (!empty($acourse->visible)) {
                         echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                              '&amp;hide='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$pixpath.'/t/hide.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/hide.gif" height="11" width="11" border="0" alt="" /></a> ';
                     } else {
                         echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                              '&amp;show='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$pixpath.'/t/show.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/show.gif" height="11" width="11" border="0" alt="" /></a> ';
                     }
 
                     echo '<a title="'.$strbackup.'" href="../backup/backup.php?id='.$acourse->id.'">'.
-                         '<img src="'.$pixpath.'/t/backup.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/backup.gif" height="11" width="11" border="0" alt="" /></a> ';
 
                         echo '<a title="'.$strrestore.'" href="../files/index.php?id='.$acourse->id.
                              '&amp;wdir=/backupdata">'.
-                             '<img src="'.$pixpath.'/t/restore.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/restore.gif" height="11" width="11" border="0" alt="" /></a> ';
 
                     if ($up) {
                         echo '<a title="'.$strmoveup.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                              '&amp;moveup='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$pixpath.'/t/up.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/up.gif" height="11" width="11" border="0" alt="" /></a> ';
                     } else {
                         echo '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /></a> ';
                     }
@@ -353,7 +348,7 @@
                     if ($down) {
                         echo '<a title="'.$strmovedown.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                              '&amp;movedown='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$pixpath.'/t/down.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/down.gif" height="11" width="11" border="0" alt="" /></a> ';
                     } else {
                         echo '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /></a> ';
                     }
@@ -366,9 +361,9 @@
                 } else if (isteacheredit($acourse->id)) {
                     echo "<td>";
                     echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.$acourse->id.'">'.
-                         '<img src="'.$pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="" /></a> ';
                     echo '<a title="'.$strassignteachers.'" href="'.$CFG->wwwroot.'/course/teacher.php?id='.$acourse->id.'">'.
-                         '<img src="'.$pixpath.'/t/user.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0" alt="" /></a> ';
                 }
                 echo "</td>";
             } else {
@@ -376,16 +371,16 @@
                 if (!empty($acourse->guest)) {
                     echo '<a href="view.php?id='.$acourse->id.'"><img hspace="2" title="'.
                          $strallowguests.'" alt="" height="16" width="16" border="0" src="'.
-                         $pixpath.'/i/user.gif" /></a>';
+                         $CFG->pixpath.'/i/user.gif" /></a>';
                 }
                 if (!empty($acourse->password)) {
                     echo '<a href="view.php?id='.$acourse->id.'"><img hspace="2" title="'.
                          $strrequireskey.'" alt="" height="16" width="16" border="0" src="'.
-                         $pixpath.'/i/key.gif" /></a>';
+                         $CFG->pixpath.'/i/key.gif" /></a>';
                 }
                 if (!empty($acourse->summary)) {
                     link_to_popup_window ("/course/info.php?id=$acourse->id", "courseinfo",
-                                          '<img hspace="2" alt="info" height="16" width="16" border="0" src="'.$pixpath.'/i/info.gif" />',
+                                          '<img hspace="2" alt="info" height="16" width="16" border="0" src="'.$CFG->pixpath.'/i/info.gif" />',
                                            400, 500, $strsummary);
                 }
                 echo "</td>";

diff --git a/course/edit.php b/course/edit.php
index cf131f4d302eae5a9698e56a76d362e9eb50341b..02a85642624ad0a64f295dd0a868935d30b435a5 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -207,7 +207,7 @@
     $form->sesskey = !empty($USER->id) ? $USER->sesskey : '';
 
     print_heading($streditcoursesettings);
-    print_simple_box_start("center", "", "$THEME->cellheading");
+    print_simple_box_start("center");
     include("edit.html");
     print_simple_box_end();
 

diff --git a/course/editsection.php b/course/editsection.php
index 5bc78ead0daa1054429314733fed97bbc5ce7a1b..97a487aaf56e6294d8bd0a4bb80ba96d1b3950ca 100644 (file)
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -55,7 +55,7 @@
                   -> $stredit");
 
     print_heading(get_string("summaryof", "", "$sectionname $form->section"));
-    print_simple_box_start("center", "", "$THEME->cellheading");
+    print_simple_box_start("center");
     include("editsection.html");
     print_simple_box_end();
 

diff --git a/course/enrol.html b/course/enrol.html
index 41c6eba4dee013828ae391e6ea7d60083c97763f..b71692e43372c7a53aea33ade9c38978d86212c1 100644 (file)
--- a/course/enrol.html
+++ b/course/enrol.html
@@ -32,7 +32,7 @@
 
   <tr valign="top">
 
-    <td class="generalbox" bgcolor="<?php p($THEME->cellheading)?>"><center><?php if (isset ($errormsg)) {formerr($errormsg);} ?></center>
+    <td class="generalbox"><center><?php if (isset ($errormsg)) {formerr($errormsg);} ?></center>
 
       <form name="form" method="post" action="enrol.php">
 

diff --git a/course/groups-summary.html b/course/groups-summary.html
index 55e227523a6a10917930b1811ca3758751111dc1..03acc17039ecc1a52bce4254672a212ecdedd743 100644 (file)
--- a/course/groups-summary.html
+++ b/course/groups-summary.html
@@ -2,7 +2,7 @@
  <tr>
    <th colspan="2"><?php echo $t->name ?></th>
  </tr>
- <tr><td class="generalboxcontent" bgcolor="<?php echo $THEME->cellcontent ?>">
+ <tr><td class="generalboxcontent">
    <table width="100%">
      <tr>
       <td valign="top" width="120">
@@ -12,14 +12,14 @@
         <p><?php echo $t->description ?></p>
         <?php
           if (!empty($t->linkeditprofile)) {
-              echo '<p style="font-size: small" align="right"><a href="'.$t->linkeditprofile->url.'">'.$t->linkeditprofile->text.'</a>...</p>';
+              echo '<p align="right"><a href="'.$t->linkeditprofile->url.'">'.$t->linkeditprofile->text.'</a>...</p>';
           }
         ?>
       </td>
     </tr>
-    <tr bgcolor="<?php echo $THEME->cellcontent ?>">
+    <tr>
       <td colspan="2" align="left">
-        <p style="font-size: x-small"><?php 
+        <?php 
           if ($t->users) {
               $countusers = count($t->users);
               foreach ($t->users as $user) {
@@ -31,14 +31,13 @@
               }
           }
           ?>
-        </p>
       </td>
     </tr>
-    <tr bgcolor="<?php echo $THEME->cellcontent ?>">
+    <tr>
       <td colspan="2" align="right">
         <?php 
           if (!empty($t->linkfullprofile)) {
-              echo '<p style="font-size: small" align="right"><a href="'.$t->linkfullprofile->url.'">'.$t->linkfullprofile->text.'</a>...</p>';
+              echo '<p align="right"><a href="'.$t->linkfullprofile->url.'">'.$t->linkfullprofile->text.'</a>...</p>';
           }
         ?>
       </td>

diff --git a/course/importstudents.php b/course/importstudents.php
index dfbee66204d1cd42324a1aff7872a39fee453003..7e5d72f8185ed7e96012220d67256cad8d35088c 100644 (file)
--- a/course/importstudents.php
+++ b/course/importstudents.php
@@ -119,7 +119,7 @@
     $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
     $previoussearch = ($previoussearch) ? '1' : '0';
 
-    print_simple_box_start("center", "", "$THEME->cellheading");
+    print_simple_box_start("center");
 
     include('importstudents.html');
 
@@ -131,4 +131,4 @@
 
 
 
-?>
\ No newline at end of file
+?>

diff --git a/course/index.php b/course/index.php
index 8b3f113796ea8b07e86121cde37b035a26cecd79..b07b2b22171c1e0a6a88dd07fb107f80cf996cdc 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -309,10 +309,9 @@
 function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $up=false, $down=false) {
 /// Recursive function to print all the categories ready for editing
 
-    global $THEME, $CFG, $USER;
+    global $CFG, $USER;
 
     static $str = '';
-    static $pixpath = '';
     
     if (empty($str)) {
         $str->delete   = get_string("delete");
@@ -323,16 +322,8 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
         $str->show     = get_string("show");
     }
     
-    if (empty($pixpath)) {
-        if (empty($THEME->custompix)) {
-            $pixpath = "$CFG->wwwroot/pix";
-        } else {
-            $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
-        }
-    }
-
     if ($category) {
-        echo "<tr><td align=\"left\" nowrap=\"nowrap\" bgcolor=\"$THEME->cellcontent\">";
+        echo "<tr><td align=\"left\" nowrap=\"nowrap\">";
         echo "<p>";
         for ($i=0; $i<$depth;$i++) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
@@ -347,23 +338,23 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
         echo "<td nowrap=\"nowrap\">";    /// Print little icons
 
         echo "<a title=\"$str->delete\" href=\"index.php?delete=$category->id&amp;sesskey=$USER->sesskey\"><img".
-             " src=\"$pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+             " src=\"$CFG->pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
 
         if (!empty($category->visible)) {
             echo "<a title=\"$str->hide\" href=\"index.php?hide=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
         } else {
             echo "<a title=\"$str->show\" href=\"index.php?show=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"\" /></a> ";
         }
 
         if ($up) {
             echo "<a title=\"$str->moveup\" href=\"index.php?moveup=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$pixpath/t/up.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/up.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
         }
         if ($down) {
             echo "<a title=\"$str->movedown\" href=\"index.php?movedown=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$pixpath/t/down.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/down.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"\" /></a> ";
         }
         echo "</td>";
 

diff --git a/course/info.php b/course/info.php
index 14a92a51e4a907e99348d5f22498b499e1b5532a..e1a5cdad861620bbd84cfaff789af1e6e950ab2d 100644 (file)
--- a/course/info.php
+++ b/course/info.php
@@ -28,12 +28,6 @@
         require_login();
     }
 
-    if (empty($THEME->custompix)) {
-        $pixpath = "$CFG->wwwroot/pix";
-    } else {
-        $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
-    }
-
     print_header(get_string("summaryof", "", $course->fullname));
 
     echo "<h3 align=\"center\">$course->fullname<br />($course->shortname)</h3>";
@@ -41,11 +35,11 @@
     echo "<center>";
     if ($course->guest) {
         $strallowguests = get_string("allowguests");
-        echo "<p><font size=\"1\"><img align=\"middle\" alt=\"\" height=\"16\" width=\"16\" border=\"0\" src=\"$pixpath/i/guest.gif\" /></a>&nbsp;$strallowguests</font></p>";
+        echo "<p><font size=\"1\"><img align=\"middle\" alt=\"\" height=\"16\" width=\"16\" border=\"0\" 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=\"\" height=\"16\" width=\"16\" border=\"0\" src=\"$pixpath/i/key.gif\" /></a>&nbsp;$strrequireskey</font></p>";
+        echo "<p><font size=\"1\"><img align=\"middle\" alt=\"\" height=\"16\" width=\"16\" border=\"0\" src=\"$CFG->pixpath/i/key.gif\" /></a>&nbsp;$strrequireskey</font></p>";
     }
 
 

diff --git a/course/lib.php b/course/lib.php
index 22c6dee3514f646d8a6ae73120f85c1f6577b0e6..9b1a9a01603cb3b5885385703169b4f4867de5e8 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -659,7 +659,7 @@ function print_recent_activity($course) {
     // This function trawls through the logs looking for
     // anything new since the user's last login
 
-    global $CFG, $USER, $THEME, $SESSION;
+    global $CFG, $USER, $SESSION;
 
     $isteacher = isteacher($course->id);
 
@@ -1132,10 +1132,9 @@ function rebuild_course_cache($courseid=0) {
 
 
 function print_heading_block($heading, $width="100%", $class="headingblock") {
-    global $THEME;
 
     echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"5\">";
-    echo "<tr><td bgcolor=\"$THEME->cellheading\" class=\"$class\">";
+    echo "<tr><td class=\"$class\">";
     echo stripslashes($heading);
     echo "</td></tr></table>";
 }
@@ -1312,7 +1311,7 @@ function print_category_info($category, $depth) {
 function print_courses($category, $width="100%") {
 /// Category is 0 (for all courses) or an object
 
-    global $CFG, $THEME;
+    global $CFG;
 
     if (empty($category)) {
         $categories = get_categories(0);  // Parent = 0   ie top-level categories only
@@ -1342,7 +1341,7 @@ function print_courses($category, $width="100%") {
 
 function print_course($course, $width="100%") {
 
-    global $CFG, $THEME;
+    global $CFG;
 
     static $enrol;
 
@@ -1351,7 +1350,7 @@ function print_course($course, $width="100%") {
         $enrol = new enrolment_plugin;
     }
 
-    print_simple_box_start("center", "$width", $THEME->cellcontent, 5, "coursebox");
+    print_simple_box_start("center", "$width", '', 5, "coursebox");
 
     $linkcss = $course->visible ? "" : " class=\"dimmed\" ";
 
@@ -1762,7 +1761,7 @@ function move_module($cm, $move) {
 }
 
 function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-1) {
-    global $CFG, $THEME, $USER;
+    global $CFG, $USER;
 
     static $str;
 
@@ -1790,32 +1789,26 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
         $path = ".";
     }
 
-    if (empty($THEME->custompix)) {
-        $pixpath = "$path/../pix";
-    } else {
-        $pixpath = "$path/../theme/$CFG->theme/pix";
-    }
-
     if ($mod->visible) {
         $hideshow = "<a title=\"$str->hide\" href=\"$path/mod.php?hide=$mod->id&amp;sesskey=$USER->sesskey\"><img".
-                    " src=\"$pixpath/t/hide.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->hide\" /></a> ";
+                    " src=\"$CFG->pixpath/t/hide.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->hide\" /></a> ";
     } else {
         $hideshow = "<a title=\"$str->show\" href=\"$path/mod.php?show=$mod->id&amp;sesskey=$USER->sesskey\"><img".
-                    " src=\"$pixpath/t/show.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
+                    " src=\"$CFG->pixpath/t/show.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
                     "border=\"0\" alt=\"$str->show\" /></a> ";
     }
     if ($mod->groupmode !== false) {
         if ($mod->groupmode == SEPARATEGROUPS) {
             $grouptitle = $str->groupsseparate;
-            $groupimage = "$pixpath/t/groups.gif";
+            $groupimage = "$CFG->pixpath/t/groups.gif";
             $grouplink  = "$path/mod.php?id=$mod->id&amp;groupmode=0&amp;sesskey=$USER->sesskey";
         } else if ($mod->groupmode == VISIBLEGROUPS) {
             $grouptitle = $str->groupsvisible;
-            $groupimage = "$pixpath/t/groupv.gif";
+            $groupimage = "$CFG->pixpath/t/groupv.gif";
             $grouplink  = "$path/mod.php?id=$mod->id&amp;groupmode=1&amp;sesskey=$USER->sesskey";
         } else {
             $grouptitle = $str->groupsnone;
-            $groupimage = "$pixpath/t/groupn.gif";
+            $groupimage = "$CFG->pixpath/t/groupn.gif";
             $grouplink  = "$path/mod.php?id=$mod->id&amp;groupmode=2&amp;sesskey=$USER->sesskey";
         }
         if ($mod->groupmodelink) {
@@ -1833,37 +1826,37 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
 
     if ($moveselect) {
         $move =     "<a title=\"$str->move\" href=\"$path/mod.php?copy=$mod->id&amp;sesskey=$USER->sesskey\"><img".
-                    " src=\"$pixpath/t/move.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
+                    " src=\"$CFG->pixpath/t/move.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
                     " border=\"0\" alt=\"$str->move\" /></a>";
     } else {
         $move =     "<a title=\"$str->moveup\" href=\"$path/mod.php?id=$mod->id&amp;move=-1&amp;sesskey=$USER->sesskey\"><img".
-                    " src=\"$pixpath/t/up.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
+                    " src=\"$CFG->pixpath/t/up.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
                     " border=\"0\" alt=\"$str->moveup\" /></a>".
                     "<a title=\"$str->movedown\" href=\"$path/mod.php?id=$mod->id&amp;move=1&amp;sesskey=$USER->sesskey\"><img".
-                    " src=\"$pixpath/t/down.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
+                    " src=\"$CFG->pixpath/t/down.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
                     " border=\"0\" alt=\"$str->movedown\" /></a>";
     }
 
     $leftright = "";
     if ($indent > 0) {
         $leftright .= "<a title=\"$str->moveleft\" href=\"$path/mod.php?id=$mod->id&amp;indent=-1&amp;sesskey=$USER->sesskey\"><img".
-                      " src=\"$pixpath/t/left.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
+                      " src=\"$CFG->pixpath/t/left.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
                       " border=\"0\" alt=\"$str->moveleft\" /></a>";
     }
     if ($indent >= 0) {
         $leftright .= "<a title=\"$str->moveright\" href=\"$path/mod.php?id=$mod->id&amp;indent=1&amp;sesskey=$USER->sesskey\"><img".
-                      " src=\"$pixpath/t/right.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
+                      " src=\"$CFG->pixpath/t/right.gif\" hspace=\"2\" height=\"11\" width=\"11\" ".
                       " border=\"0\" alt=\"$str->moveright\" /></a>";
     }
 
     return "$leftright$move".
            "<a title=\"$str->update\" href=\"$path/mod.php?update=$mod->id&amp;sesskey=$USER->sesskey\"><img".
-           " src=\"$pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" ".
+           " src=\"$CFG->pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" ".
            " alt=\"$str->update\" /></a>".
       //   Following line is commented out until this feature is more definite -- martin
       //     "<a title=\"$str->duplicate\" href=\"$path/mod.php?duplicate=$mod->id&amp;sesskey=$USER->sesskey\"> 2 </a>".
            "<a title=\"$str->delete\" href=\"$path/mod.php?delete=$mod->id&amp;sesskey=$USER->sesskey\"><img".
-           " src=\"$pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" ".
+           " src=\"$CFG->pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" ".
            " alt=\"$str->delete\" /></a>$hideshow$groupmode";
 }
 

diff --git a/course/mod.php b/course/mod.php
index e87056ef9573ee8fe3811087f7ac90a8dd233cad..ab6c37e8c960afa3ec21c65a2c0ba3e45d4151cf 100644 (file)
--- a/course/mod.php
+++ b/course/mod.php
@@ -617,7 +617,7 @@
         $icon = "<img align=\"middle\" height=\"16\" width=\"16\" src=\"$CFG->modpixpath/$module->name/icon.gif\" alt=\"\" />&nbsp;";
 
         print_heading_with_help($pageheading, "mods", $module->name, $icon);
-        print_simple_box_start("center", "", "$THEME->cellheading");
+        print_simple_box_start("center");
         include_once($modform);
         print_simple_box_end();
 

diff --git a/course/scales.php b/course/scales.php
index df580428600b6711c148c1f743a081ad83c8bffa..d0af904ed30834c8e22ed8883bf3e9cf7129f836 100644 (file)
--- a/course/scales.php
+++ b/course/scales.php
@@ -422,12 +422,6 @@
     if ($scales) {
         //Calculate the base path
         $path = "$CFG->wwwroot/course";
-        //Calculate pixpath
-        if (empty($THEME->custompix)) {
-            $pixpath = "$path/../pix";
-        } else {
-            $pixpath = "$path/../theme/$CFG->theme/pix";
-        }
 
         $data = array();
         $incustom = true;
@@ -454,17 +448,17 @@
             $buttons = "";
             if (empty($scales_uses) && ($incustom || isadmin())) {
                 $buttons .= "<a title=\"$stredit\" href=\"$path/scales.php?id=$course->id&amp;scaleid=$scale->id&amp;action=edit\"><img".
-                            " src=\"$pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                            " src=\"$CFG->pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
                 if ($incustom && isadmin()) {
                     $buttons .= "<a title=\"$strdown\" href=\"$path/scales.php?id=$course->id&amp;scaleid=$scale->id&amp;action=down&amp;sesskey=$USER->sesskey\"><img".
-                                " src=\"$pixpath/t/down.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                                " src=\"$CFG->pixpath/t/down.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
                 }
                 if (!$incustom && isadmin()) {
                     $buttons .= "<a title=\"$strup\" href=\"$path/scales.php?id=$course->id&amp;scaleid=$scale->id&amp;action=up&amp;sesskey=$USER->sesskey\"><img".
-                                " src=\"$pixpath/t/up.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                                " src=\"$CFG->pixpath/t/up.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
                 }
                 $buttons .= "<a title=\"$strdelete\" href=\"$path/scales.php?id=$course->id&amp;scaleid=$scale->id&amp;action=delete&amp;sesskey=$USER->sesskey\"><img".
-                            " src=\"$pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                            " src=\"$CFG->pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
             }
             $line[] = $buttons;
             

diff --git a/course/student.php b/course/student.php
index 132a38a147ba6814bc158c8fdf6fb17e2ec755e8..11f364fbb7ff2267ea94a18a2f8e6249b83713ed 100644 (file)
--- a/course/student.php
+++ b/course/student.php
@@ -142,7 +142,7 @@
     $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
     $previoussearch = ($previoussearch) ? '1' : '0';
 
-    print_simple_box_start("center", "", "$THEME->cellheading");
+    print_simple_box_start("center");
 
     $sesskey = !empty($USER->id) ? $USER->sesskey : '';