Merged display footer fixes for block course_list

diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index ba7329c6a83451f1a5b003b23ad0fba0cadde0fa..cf3fac55a0465d8916a04ec147a6793350fec55e 100644 (file)
--- a/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@ -51,7 +51,7 @@ class block_course_list extends block_list {
                 $this->title = get_string('mycourses');
             /// If we can update any course of the view all isn't hidden, show the view all courses link
                 if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
-                    $this->content->footer = "<a href=\"$CFG->wwwroot/course/index.php\">".get_string("fulllistofcourses")."</a>...";
+                    $this->content->footer = "<a href=\"$CFG->wwwroot/course/index.php\">".get_string("fulllistofcourses")."</a> ...";
                 }
                 $this->get_remote_courses();
                 if ($this->content->items) { // make sure we don't return an empty list
@@ -68,12 +68,10 @@ class block_course_list extends block_list {
                     $this->content->items[]="<a $linkcss href=\"$CFG->wwwroot/course/category.php?id=$category->id\">" . format_string($category->name) . "</a>";
                     $this->content->icons[]=$icon;
                 }
-                $this->content->icons[] = '';
-                $this->content->items[] = "&nbsp;&nbsp;&nbsp;<a href=\"$CFG->wwwroot/course/\">".get_string("searchcourses")."</a>...<br />";
+                $this->content->footer .= "<a href=\"$CFG->wwwroot/course/index.php\">".get_string('searchcourses').'</a> ...<br />';
             /// If we can update any course of the view all isn't hidden, show the view all courses link
                 if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
-                    $this->content->icons[] = '';
-                    $this->content->items[] = "&nbsp;&nbsp;&nbsp;<a href=\"$CFG->wwwroot/course/index.php\">".get_string("fulllistofcourses")."</a>...";
+                    $this->content->footer .= "<a href=\"$CFG->wwwroot/course/index.php\">".get_string('fulllistofcourses').'</a> ...';
                 }
                 $this->title = get_string('categories');
             } else {                          // Just print course names of single category
@@ -92,9 +90,7 @@ class block_course_list extends block_list {
                     }
                 /// If we can update any course of the view all isn't hidden, show the view all courses link
                     if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
-                        $this->content->icons[] = '';
-                        $this->content->items[] = "&nbsp;&nbsp;&nbsp;<a href=\"$CFG->wwwroot/course/index.php\">"
-                            .get_string("fulllistofcourses")."</a>...";
+                        $this->content->footer .= "<a href=\"$CFG->wwwroot/course/index.php\">".get_string('fulllistofcourses').'</a> ...';
                     }
                     $this->get_remote_courses();
                 } else {
@@ -102,8 +98,7 @@ class block_course_list extends block_list {
                     $this->content->icons[] = '';
                     $this->content->items[] = get_string('nocoursesyet');
                     if (has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id))) {
-                        $this->content->icons[] = '';    
-                        $this->content->items[] = '&nbsp;&nbsp;&nbsp;<a href="'.$CFG->wwwroot.'/course/edit.php?category='.$category->id.'">'.get_string("addnewcourse").'</a>...';
+                        $this->content->footer = '<a href="'.$CFG->wwwroot.'/course/edit.php?category='.$category->id.'">'.get_string("addnewcourse").'</a> ...';
                     }
                     $this->get_remote_courses();
                 }

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 36f95f9d791bb377d0e8248df43d5da437c1cc3e..5c1bc0140039eeae39cbd98d90683e817099d287 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1141,6 +1141,10 @@ a.skip-block, .skip-block {
   padding-top:5px;
 }
 
+.block_recent_activitysideblock .h3 {
+  padding-top:5px;
+}
+
 .block_online_users .listentry div.user,
 .block_messages .listentry div.user {
   float:left;
@@ -1151,6 +1155,10 @@ a.skip-block, .skip-block {
   float:right;
 }
 
+.block_course_list .footer {
+  margin-top: 5px;
+}
+
 
 /***
  *** Blogs
@@ -1935,7 +1943,7 @@ body#grade-index .grades .weighted {
 
 .block_login .loginform div {
   margin:0.3em 0.8em;
-  text-align:right;
+  text-align:left;
 }
 
 .block_login .btn input {