MDL-8922: Had to modify another bunch of files to fix a simple problem:

when a config block contains a form, the previous form needs to be closed
properly (it was, but there were non-matching closing divs etc...).

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index b17aa72e2716c3eab376082d53fea249df13dd2e..a5d1169715536d8868517009d401b532c901507f 100644 (file)
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -577,10 +577,8 @@ class block_base {
 
         if (is_file($CFG->dirroot .'/blocks/'. $this->name() .'/config_instance.html')) {
             print_simple_box_start('center', '', '', 5, 'blockconfiginstance');
-            print_location_comment(__FILE__,__LINE__);
             include($CFG->dirroot .'/blocks/'. $this->name() .'/config_instance.html');
             print_simple_box_end();
-            print_location_comment(__FILE__,__LINE__);
         } else {
             notice(get_string('blockconfigbad'), str_replace('blockaction=', 'dummy=', qualified_me()));
         }

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index 8c57700d488e6e738724068b6f0af4f8be83b745..5ff215808a54d86408dfc2177e80d03417c27955 100644 (file)
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -235,7 +235,7 @@
 
                 $item['link'] = str_replace('&', '&', $item['link']);
 
-                $returnstring .= '<li><div class="link"><a href="'. $item['link'] .'" target="_blank">'. $item['title'] . "</a></div>\n";
+                $returnstring .= '<li><div class="link"><a href="'. $item['link'] .'">'. $item['title'] . "</a></div>\n";
 
                 if ($display_description && !empty($item['description'])) {
                     $item['description'] = break_up_long_words($item['description'], 30);
@@ -285,4 +285,4 @@
      }
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/blocks/rss_client/config_instance.html b/blocks/rss_client/config_instance.html
index 982098f98c9035873ed425cc1e589b8fa189c2b1..8c6395b891509d49900de78e6552aec558e082a9 100644 (file)
--- a/blocks/rss_client/config_instance.html
+++ b/blocks/rss_client/config_instance.html
@@ -168,13 +168,12 @@ print_box_start();
     print "<!-- code came from " . __FILE__ . " at line " . __LINE__ . ". -->\n";
 } else {
   global $act, $url, $rssid, $preferredtitle, $shared;
-  print '</form>';   // Closes off page form
-
+  print '</div></form></div>';   // Closes off page form
   $context = get_context_instance(CONTEXT_BLOCK, $this->instance->id);
 
   print_box_start();
   rss_display_feeds($id, $USER->id, '', $context);
   rss_print_form($act, $url, $rssid, $preferredtitle, $shared, $id, $context);
-  print_box_end();
+  // Do NOT print_box_end() here, this is taken care of by blocks/moodleblock.class.php:582
 }
 ?>

diff --git a/blocks/rss_client/styles.php b/blocks/rss_client/styles.php
index 2394a780478d422b52ef0b89b9d88c8f31f61ea2..35298cfd207f0a991dc0baf517e512db59bb8e0a 100644 (file)
--- a/blocks/rss_client/styles.php
+++ b/blocks/rss_client/styles.php
@@ -20,7 +20,9 @@
 }
 
 .blockconfigtable #rssfeeds {
-    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+    background-color: blue;
 }
 
 .blockconfigtable #rssfeeds td.actions {

diff --git a/lib/blocklib.php b/lib/blocklib.php
index e083d82ae6df3be1216d1d56987e9fe971446335..ca481f62f31c352ae7cbde3c913da0651d4c92d4 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -456,7 +456,7 @@ function blocks_execute_action($page, &$pageblocks, $blockaction, $instanceorid,
             if ($blockobject === false) {
                 break;
             }
-
+            
             // First of all check to see if the block wants to be edited
             if(!$blockobject->user_can_edit()) {
                 break;

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 1582ae6c841a871d522e3b4daae5c3df166d9512..499adc8b3d41a5b9f72d35e06a913cc498a82bcd 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1227,10 +1227,15 @@ a.skip-block, .skip-block {
   margin-top: 5px;
 }
 
-#rss_table {
+#rssfeeds {
   margin-left: auto;
   margin-right: auto;
 }
+
+#block_rss {
+  text-align: center;
+}
+
 /***
  *** Blogs
  ***/