L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-33198-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-09-18 20:06:03 +02:00
parent 631aedabb4 ec5c45c4ed
commit b437a680d2
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/book/tool/print/index.php
+9 -4
View File
@@ -91,6 +91,7 @@ if ($chapter) {
</head>
<body>
<a name="top"></a>
<h1 class="book_title"><?php echo format_string($book->name, true, array('context'=>$context)) ?></h1>
<div class="chapter">
<?php
@@ -98,11 +99,11 @@ if ($chapter) {
if (!$book->customtitles) {
if (!$chapter->subchapter) {
$currtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context);
echo '<p class="book_chapter_title">'.$currtitle.'</p>';
echo '<h2 class="book_chapter_title">'.$currtitle.'</h2>';
} else {
$currtitle = book_get_chapter_title($chapters[$chapter->id]->parent, $chapters, $book, $context);
$currsubtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context);
echo '<p class="book_chapter_title">'.$currtitle.'<br />'.$currsubtitle.'</p>';
echo '<h2 class="book_chapter_title">'.$currtitle.'</h2><h3 class="book_chapter_title">'.$currsubtitle.'</h3>';
}
}
@@ -128,7 +129,7 @@ if ($chapter) {
</head>
<body>
<a name="top"></a>
<p class="book_title"><?php echo format_string($book->name, true, array('context'=>$context)) ?></p>
<h1 class="book_title"><?php echo format_string($book->name, true, array('context'=>$context)) ?></h1>
<p class="book_summary"><?php echo format_text($book->intro, $book->introformat, array('noclean'=>true, 'context'=>$context)) ?></p>
<div class="book_info"><table>
<tr>
@@ -162,7 +163,11 @@ if ($chapter) {
}
echo '<div class="book_chapter"><a name="ch'.$ch->id.'"></a>';
if (!$book->customtitles) {
echo '<p class="book_chapter_title">'.$titles[$ch->id].'</p>';
if (!$chapter->subchapter) {
echo '<h2 class="book_chapter_title">'.$titles[$ch->id].'</h2>';
} else {
echo '<h3 class="book_chapter_title">'.$titles[$ch->id].'</h3>';
}
}
$content = str_replace($link1, '#ch', $chapter->content);
$content = str_replace($link2, '#top', $content);
mod/book/tool/print/locallib.php
+1 -5
View File
@@ -60,11 +60,7 @@ function booktool_print_get_toc($chapters, $book, $cm) {
$toc .= html_writer::tag('a', '', array('name' => 'toc')); // Representation of toc (HTML).
if ($book->customtitles) {
$toc .= html_writer::tag('h1', get_string('toc', 'mod_book'));
} else {
$toc .= html_writer::tag('p', get_string('toc', 'mod_book'), array('class' => 'book_chapter_title'));
}
$toc .= html_writer::tag('h2', get_string('toc', 'mod_book'), array('class' => 'book_chapter_title'));
$toc .= html_writer::start_tag('ul');
foreach ($chapters as $ch) {
if (!$ch->hidden) {
mod/book/view.php
+3 -2
View File
@@ -181,11 +181,12 @@ if (!$book->customtitles) {
$hidden = $chapter->hidden ? 'dimmed_text' : '';
if (!$chapter->subchapter) {
$currtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context);
echo '<p class="book_chapter_title '.$hidden.'">'.$currtitle.'</p>';
echo $OUTPUT->heading($currtitle, 2, array('class' => 'book_chapter_title '.$hidden));
} else {
$currtitle = book_get_chapter_title($chapters[$chapter->id]->parent, $chapters, $book, $context);
$currsubtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context);
echo '<p class="book_chapter_title '.$hidden.'">'.$currtitle.'<br />'.$currsubtitle.'</p>';
echo $OUTPUT->heading($currtitle, 2, array('class' => 'book_chapter_title '.$hidden));
echo $OUTPUT->heading($currsubtitle, 3, array('class' => 'book_chapter_title '.$hidden));
}
}
$chaptertext = file_rewrite_pluginfile_urls($chapter->content, 'pluginfile.php', $context->id, 'mod_book', 'chapter', $chapter->id);