more help cleanup

lang/en/book.php

@@ -2,12 +2,40 @@
 
 $string['modulename'] = 'Book';
 $string['modulenameplural'] = 'Books';
+$string['modulename_help'] = 'Book is a simple multipage study material.';
 $string['pluginname'] = 'Book';
+$string['pluginadministration'] = 'Book administration';
 
 $string['toc'] = 'Table of Contents';
 $string['tocwidth'] = 'Select width of the Table of Contents for all books.';
 $string['book_tocwidth'] = 'Table of Contents width';
 $string['faq'] = 'Book FAQ';
+$string['faq_help'] = '
+*Why only two levels?*
+
+Two levels are generally enough for all books, three levels would lead to poorly structured documents. Book module is designed for
+creation of short multipage study materials. It is usually better to use PDF format for longer documents. The easiest way to create PDFs are
+virtual printers (see
+<a  href="http://sector7g.wurzel6.de/pdfcreator/index_en.htm"  target="_blank">PDFCreator</a>,
+<a  href="http://fineprint.com/products/pdffactory/index.html"  target="_blank">PDFFactory</a>,
+<a  href="http://www.adobe.com/products/acrobatstd/main.html"  target="_blank">Adobe Acrobat</a>,
+etc.).
+
+*Can students edit books?*
+
+Only teachers can create and edit books. There are no plans to implement student editing for books, but somebody may create something
+similar for students (Portfolio?). The main reason is to keep Book module as simple as possible.
+
+*How do I search the books?*
+
+At present there is only one way, use browser\'s search capability in print page. Global searching is now possible only in Moodle forums.
+It would be nice to have global searching for all resources including books, any volunteers?
+
+*My titles do not fit on one line.*
+
+Either rephrase your titles or ask your site admin to change TOC
+width. It is defined globally for all books in module configuration
+page.';
 
 $string['disableprinting'] = 'Disable Printing';
 $string['disableprinting_help'] = 'Hide print icons.';

lang/en/help/book/faq.html

-<p align="center">
-  <b>Frequently Asked Questions about Books</b>
-</p>
-<dl>
-  <dt>
-    <b>Why only two levels?</b>
-  </dt>
-  <dd>
-    Two levels are generally enough for all books, three levels would
-    lead to poorly structured documents. Book module is designed for
-    creation of short multipage study materials. It is usually better to
-    use PDF format for longer documents. The easiest way to create PDFs are
-    virtual printers (see
-    <a  href="http://sector7g.wurzel6.de/pdfcreator/index_en.htm"  target="_blank">PDFCreator</a>,
-    <a  href="http://fineprint.com/products/pdffactory/index.html"  target="_blank">
-      PDFFactory</a>,
-    <a  href="http://www.adobe.com/products/acrobatstd/main.html"  target="_blank">Adobe Acrobat</a>,
-    etc.).
-    <br />
-  </dd>
-  <br />
-  <dt>
-    <b>Can students edit books?</b>
-  </dt>
-  <dd>
-    Only teachers can create and edit books. There are no plans to
-    implement student editing for books, but somebody may create something
-    similar for students (Portfolio?). The main reason is to keep Book
-    module as simple as possible.
-  </dd>
-  <br />
-  <dt>
-    <b>How do I search the books?</b>
-  </dt>
-  <dd>
-    At present there is only one way, use browser's search capability
-    in print page. Global searching is now possible only in Moodle forums.
-    It would be nice to have global searching for all resources including
-    books, any volunteers?
-  </dd>
-  <br />
-  <dt>
-    <b>My titles do not fit on one line.</b>
-  </dt>
-  <dd>
-    Either rephrase your titles or ask your site admin to change TOC
-    width. It is defined globally for all books in module configuration
-    page.
-  </dd>
-  <br />
-</dl>

lang/en/help/book/index.html

-<h2>Book module</h2>
-<ul>
-  <li><a href="help.php?module=book&amp;file=numberingtype.html">Chapter Numbering</a></li>
-  <li><a href="help.php?module=book&amp;file=disableprinting.html">Disable Printing</a></li>
-  <li><a href="help.php?module=book&amp;file=customtitles.html">Custom Titles</a></li>
-  <li><a href="help.php?module=book&amp;file=summary.html">Reading Summary</a></li>
-  <li><a href="help.php?module=book&amp;file=edit.html">Chapter editing</a></li>
-  <li><a href="help.php?module=book&amp;file=import.html">Import</a></li>
-  <li><a href="help.php?module=book&amp;file=faq.html">Book FAQ</a></li>
-</ul>
-

lang/en/help/book/mods.html

-<p><img valign="absmiddle" src="<?php echo $CFG->wwwroot?>/mod/book/icon.gif">&nbsp;<b>Books</b></p>
-<ul>
-<p>Book is a simple multipage study material</p>
-</ul>

view.php

@@ -48,6 +48,8 @@ $allowprint  = has_capability('mod/book:print', $context) and !$book->disablepri
 $allowexport = has_capability('mod/book:exportimscp', $context);
 $viewhidden  = has_capability('mod/book:viewhiddenchapters', $context);
 
+$PAGE->set_url('/mod/book/view.php', array('id'=>$id, 'chpterid'=>'chapterid'));
+
 if ($allowedit) {
     if ($edit != -1) {
         $USER->editing = $edit;
@@ -112,14 +114,12 @@ add_to_log($course->id, 'book', 'view', 'view.php?id='.$cm->id.'&chapterid='
 ///read standard strings
 $strbooks = get_string('modulenameplural', 'book');
 $strbook  = get_string('modulename', 'book');
-$strTOC = get_string('TOC', 'book');
+$strtoc   = get_string('toc', 'book');
 
 /// prepare header
 $navigation = build_navigation('', $cm);
 
-$buttons = $allowedit ? '<table cellspacing="0" cellpadding="0"><tr><td>'.update_module_button($cm->id, $course->id, $strbook).'</td>'.
-           '<td>&nbsp;</td><td>'.book_edit_button($book, $cm, $chapter).'</td></tr></table>'
-           : '&nbsp;';
+$buttons = $allowedit ? book_edit_button($book, $cm, $chapter) : '&nbsp;';
 
 print_header( "$course->shortname: $book->name ($chapter->title)",
               $course->fullname,
@@ -217,19 +217,19 @@ $generateimscp = ($allowexport) ? '<a title="'.get_string('generateimscp', 'book
 <tr class="tocandchapter">
     <td style="width:<?php echo $tocwidth ?>px" align="left"><div class="clearer">&nbsp;</div>
         <?php
-        print_box_start('generalbox');
+        echo $OUTPUT->box_start('generalbox');
         echo $toc;
-        print_box_end();
+        echo $OUTPUT->box_end();
         if ($allowedit and $edit) {
             echo '<div class="faq">';
-            helpbutton('faq', get_string('faq','book'), 'book', true, true);
+            echo $OUTPUT->help_icon('faq', 'mod_book', get_string('faq', 'mod_book'));
             echo '</div>';
         }
         ?>
     </td>
     <td align="right"><div class="clearer">&nbsp;</div>
         <?php
-        print_box_start('generalbox');
+        echo $OUTPUT->box_start('generalbox');
         $content = '';
         if (!$book->customtitles) {
           if ($currsubtitle == '&nbsp;') {
@@ -245,7 +245,7 @@ $generateimscp = ($allowexport) ? '<a title="'.get_string('generateimscp', 'book
         echo '<div class="book_content">';
         echo format_text($content, FORMAT_HTML, $nocleanoption, $course->id);
         echo '</div>';
-        print_box_end();
+        echo $OUTPUT->box_end();
         /// lower navigation
         echo '<div class="booknav">'.$chnavigation.'</div>';
         ?>
@@ -254,5 +254,5 @@ $generateimscp = ($allowexport) ? '<a title="'.get_string('generateimscp', 'book
 </table>
 
 <?php
-print_footer($course);
+echo $OUTPUT->footer();