moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 08:09:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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...).
This commit is contained in:
nicolasconnault 2007-03-26 03:06:45 +00:00
parent 7b44777ef7
commit 5db0cffcf6
6 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blocks/moodleblock.class.php
View file

@ -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()));
}

4
blocks/rss_client/block_rss_client.php
View file

@ -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 @@
}
}
?>
?>

5
blocks/rss_client/config_instance.html
View file

@ -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
}
?>

4
blocks/rss_client/styles.php
View file

@ -20,7 +20,9 @@
}
.blockconfigtable #rssfeeds {
width: 100%;
margin-left: auto;
margin-right: auto;
background-color: blue;
}
.blockconfigtable #rssfeeds td.actions {

2
lib/blocklib.php
View file

@ -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;

7
theme/standard/styles_layout.css
View file

@ -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
***/