MDL-33120 book: changes in code based on amended strings

- Replace numberingoptions_help by numberingoptions_desc.
- Delete the faq code and related styles.
- Bump version to force lang/style refresh.

diff --git a/mod/book/locallib.php b/mod/book/locallib.php
index 96f9f45..238913d 100644 (file)
--- a/mod/book/locallib.php
+++ b/mod/book/locallib.php
@@ -194,12 +194,6 @@ function book_add_fake_block($chapters, $chapter, $book, $cm, $edit) {
 
     $toc = book_get_toc($chapters, $chapter, $book, $cm, $edit, 0);
 
-    if ($edit) {
-        $toc .= '<div class="book_faq">';
-        $toc .=  $OUTPUT->help_icon('faq', 'mod_book', get_string('faq', 'mod_book'));
-        $toc .=  '</div>';
-    }
-
     $bc = new block_contents();
     $bc->title = get_string('toc', 'mod_book');
     $bc->attributes['class'] = 'block';

diff --git a/mod/book/settings.php b/mod/book/settings.php
index 810ad3c..38f87bb 100644 (file)
--- a/mod/book/settings.php
+++ b/mod/book/settings.php
@@ -35,7 +35,7 @@ if ($ADMIN->fulltree) {
     $options = book_get_numbering_types();
 
     $settings->add(new admin_setting_configmultiselect('book/numberingoptions',
-        get_string('numberingoptions', 'mod_book'), get_string('numberingoptions_help', 'mod_book'),
+        get_string('numberingoptions', 'mod_book'), get_string('numberingoptions_desc', 'mod_book'),
         array_keys($options), $options));
 
 
@@ -46,4 +46,4 @@ if ($ADMIN->fulltree) {
     $settings->add(new admin_setting_configselect('book/numbering',
         get_string('numbering', 'mod_book'), '', BOOK_NUM_NUMBERS, $options));
 
-}
\ No newline at end of file
+}

diff --git a/mod/book/styles.css b/mod/book/styles.css
index d09189d..6ddaf09 100644 (file)
--- a/mod/book/styles.css
+++ b/mod/book/styles.css
@@ -29,10 +29,6 @@
 
 /* == Fake toc block == */
 
-.mod_book .book_faq {
-  font-size: 0.7em;
-}
-
 /* toc style NONE */
 .mod_book .book_toc_none {
   font-size: 0.8em;

diff --git a/mod/book/version.php b/mod/book/version.php
index fe07130..fbce66e 100644 (file)
--- a/mod/book/version.php
+++ b/mod/book/version.php
@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die;
 
 $module->component = 'mod_book'; // Full name of the plugin (used for diagnostics)
-$module->version   = 2012052100; // The current module version (Date: YYYYMMDDXX)
+$module->version   = 2012052700; // The current module version (Date: YYYYMMDDXX)
 $module->requires  = 2012051900; // Requires this Moodle version
 $module->cron      = 0;          // Period for cron to check this module (secs)