Merged changes from stable to tidy course cats

diff --git a/course/lib.php b/course/lib.php
index d023cf7ceaa33db38baef9516eab524280e9ba78..c05b7fd87fdc64657aa429b8b910245b649320ab 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1676,7 +1676,7 @@ function print_category_info($category, $depth, $files = false) {
             echo '</td>';
         }
 
-        echo '<td valign="top">'.$catimage.'</td>';
+        echo '<td valign="top" class="category image">'.$catimage.'</td>';
         echo '<td valign="top" class="category name">';
         echo '<a '.$catlinkcss.' href="'.$CFG->wwwroot.'/course/category.php?id='.$category->id.'">'.$category->name.'</a>';
         echo '</td>';
@@ -2571,4 +2571,4 @@ function can_delete_course($courseid) {
 
 
 
-?>
\ No newline at end of file
+?>

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 8494a7e9465f44d2fbda8ef790c0b2b98053e85e..54b821b59117cb5387506f36d59b6c4e77f1702f 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1618,7 +1618,13 @@ body#course-index .addcategory {
 }
 
 .categorylist {
-  width:100%;
+  width:90%;
+  margin-left:auto;
+  margin-right:auto;
+}
+
+.categorylist .category.image {
+  width:20px;
 }
 
 .categoryboxcontent {