Merge branch 'MDL-36628-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:10:04 +0000 (10:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:10:04 +0000 (10:10 +0800)
19 files changed:
mod/book/locallib.php
mod/book/pix/add.png
mod/book/pix/add.svg [new file with mode: 0644]
mod/book/pix/nav_exit.png
mod/book/pix/nav_exit.svg [new file with mode: 0644]
mod/book/pix/nav_next.png
mod/book/pix/nav_next.svg [new file with mode: 0644]
mod/book/pix/nav_next_dis.png [new file with mode: 0644]
mod/book/pix/nav_next_dis.svg [new file with mode: 0644]
mod/book/pix/nav_prev.png
mod/book/pix/nav_prev.svg [new file with mode: 0644]
mod/book/pix/nav_prev_dis.png
mod/book/pix/nav_prev_dis.svg [new file with mode: 0644]
mod/book/styles.css
mod/book/tool/print/pix/book.png
mod/book/tool/print/pix/book.svg [new file with mode: 0644]
mod/book/tool/print/pix/chapter.png
mod/book/tool/print/pix/chapter.svg [new file with mode: 0644]
mod/book/view.php

index 9502805..bc52dc7 100644 (file)
@@ -166,7 +166,7 @@ function book_add_fake_block($chapters, $chapter, $book, $cm, $edit) {
 
     $bc = new block_contents();
     $bc->title = get_string('toc', 'mod_book');
-    $bc->attributes['class'] = 'block';
+    $bc->attributes['class'] = 'block block_book_toc';
     $bc->content = $toc;
 
     $regions = $PAGE->blocks->get_regions();
@@ -196,16 +196,16 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
 
     switch ($book->numbering) {
         case BOOK_NUM_NONE:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_none'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_none clearfix'));
             break;
         case BOOK_NUM_NUMBERS:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_numbered'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_numbered clearfix'));
             break;
         case BOOK_NUM_BULLETS:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_bullets'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_bullets clearfix'));
             break;
         case BOOK_NUM_INDENTED:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_indented'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_indented clearfix'));
             break;
     }
 
@@ -218,11 +218,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
             if (!$ch->subchapter) {
 
                 if ($first) {
-                    $toc .= html_writer::start_tag('li');
+                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                 } else {
                     $toc .= html_writer::end_tag('ul');
                     $toc .= html_writer::end_tag('li');
-                    $toc .= html_writer::start_tag('li');
+                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                 }
 
                 if (!$ch->hidden) {
@@ -240,11 +240,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
             } else {
 
                 if ($first) {
-                    $toc .= html_writer::start_tag('li');
+                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                     $toc .= html_writer::start_tag('ul');
-                    $toc .= html_writer::start_tag('li');
+                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                 } else {
-                    $toc .= html_writer::start_tag('li');
+                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                 }
 
                 if (!$ch->hidden) {
@@ -269,7 +269,8 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
             } else {
                 $toc .= html_writer::link(new moodle_url('view.php', array('id' => $cm->id, 'chapterid' => $ch->id)), $title, array('title' => s($title)));
             }
-            $toc .=  '&nbsp;&nbsp;';
+
+            $toc .= html_writer::start_tag('div', array('class' => 'action-list'));
             if ($i != 1) {
                 $toc .= html_writer::link(new moodle_url('move.php', array('id' => $cm->id, 'chapterid' => $ch->id, 'up' => '1', 'sesskey' => $USER->sesskey)),
                                             $OUTPUT->pix_icon('t/up', get_string('up')), array('title' => get_string('up')));
@@ -291,7 +292,7 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
             }
             $toc .= html_writer::link(new moodle_url('edit.php', array('cmid' => $cm->id, 'pagenum' => $ch->pagenum, 'subchapter' => $ch->subchapter)),
                                             $OUTPUT->pix_icon('add', get_string('addafter', 'mod_book'), 'mod_book'), array('title' => get_string('addafter', 'mod_book')));
-
+            $toc .= html_writer::end_tag('div');
 
             if (!$ch->subchapter) {
                 $toc .= html_writer::start_tag('ul');
@@ -315,11 +316,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
                     $ns = 0;
 
                     if ($first) {
-                        $toc .= html_writer::start_tag('li');
+                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                     } else {
                         $toc .= html_writer::end_tag('ul');
                         $toc .= html_writer::end_tag('li');
-                        $toc .= html_writer::start_tag('li');
+                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                     }
 
                     if ($book->numbering == BOOK_NUM_NUMBERS) {
@@ -329,11 +330,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
                     $ns++;
 
                     if ($first) {
-                        $toc .= html_writer::start_tag('li');
+                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                         $toc .= html_writer::start_tag('ul');
-                        $toc .= html_writer::start_tag('li');
+                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                     } else {
-                        $toc .= html_writer::start_tag('li');
+                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
                     }
 
                     if ($book->numbering == BOOK_NUM_NUMBERS) {
index bda131f..fd8cbbe 100644 (file)
Binary files a/mod/book/pix/add.png and b/mod/book/pix/add.png differ
diff --git a/mod/book/pix/add.svg b/mod/book/pix/add.svg
new file mode 100644 (file)
index 0000000..9197663
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M11,4.5H7.5V1c0-0.5-0.5-1-1-1h-1c-0.5,0-1,0.5-1,1v3.5L1,4.5c-0.5,0-1,0.5-1,1v1c0,0.5,0.5,1,1,1\r
+       h3.5V11c0,0.5,0.5,1,1,1h1c0.5,0,1-0.5,1-1V7.5H11c0.6,0,1-0.5,1-1l0-1C12,5,11.6,4.5,11,4.5z"/>\r
+</svg>\r
index 4c129f0..53602e3 100644 (file)
Binary files a/mod/book/pix/nav_exit.png and b/mod/book/pix/nav_exit.png differ
diff --git a/mod/book/pix/nav_exit.svg b/mod/book/pix/nav_exit.svg
new file mode 100644 (file)
index 0000000..9c165a9
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.2 -0.3 16 16"\r
+        style="overflow:visible;enable-background:new -0.2 -0.3 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M6.9,0.7c0.5-1,1.3-1,1.8,0l6.7,12.9c0.5,1,0,1.8-1.1,1.8h-13c-1.1,0-1.6-0.8-1.1-1.8L6.9,0.7z"/>\r
+</svg>\r
index 1e11bd9..5205899 100644 (file)
Binary files a/mod/book/pix/nav_next.png and b/mod/book/pix/nav_next.png differ
diff --git a/mod/book/pix/nav_next.svg b/mod/book/pix/nav_next.svg
new file mode 100644 (file)
index 0000000..1d2d9f9
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.2 -0.2 16 16"\r
+        style="overflow:visible;enable-background:new -0.2 -0.2 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M14.7,6.9c1,0.5,1,1.3,0,1.8L1.8,15.4c-1,0.5-1.8,0-1.8-1.1v-13c0-1.1,0.8-1.6,1.8-1.1L14.7,6.9z"/>\r
+</svg>\r
diff --git a/mod/book/pix/nav_next_dis.png b/mod/book/pix/nav_next_dis.png
new file mode 100644 (file)
index 0000000..092cd06
Binary files /dev/null and b/mod/book/pix/nav_next_dis.png differ
diff --git a/mod/book/pix/nav_next_dis.svg b/mod/book/pix/nav_next_dis.svg
new file mode 100644 (file)
index 0000000..7e16572
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 -0.2 16 16" style="overflow:visible;enable-background:new 0 -0.2 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M15,6.9L1.9,0.2C0.9-0.3,0,0.2,0,1.3v13c0,1.1,0.9,1.6,1.9,1.1L15,8.7C15.9,8.2,16,7.4,15,6.9z\r
+        M10.6,8.7l-6.7,3.4c-1,0.5-1.9,0-1.9-1.1V4.6C2,3.5,2.9,3,3.9,3.5l6.6,3.4C11.5,7.4,11.6,8.2,10.6,8.7z"/>\r
+</svg>\r
index b08bbda..039e8a9 100644 (file)
Binary files a/mod/book/pix/nav_prev.png and b/mod/book/pix/nav_prev.png differ
diff --git a/mod/book/pix/nav_prev.svg b/mod/book/pix/nav_prev.svg
new file mode 100644 (file)
index 0000000..0d657d8
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.3 -0.2 16 16"\r
+        style="overflow:visible;enable-background:new -0.3 -0.2 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M0.7,6.9c-1,0.5-1,1.3,0,1.8l12.9,6.7c1,0.5,1.8,0,1.8-1.1v-13c0-1.1-0.8-1.6-1.8-1.1L0.7,6.9z"/>\r
+</svg>\r
index 3f61922..afc5639 100644 (file)
Binary files a/mod/book/pix/nav_prev_dis.png and b/mod/book/pix/nav_prev_dis.png differ
diff --git a/mod/book/pix/nav_prev_dis.svg b/mod/book/pix/nav_prev_dis.svg
new file mode 100644 (file)
index 0000000..27dedca
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.3 -0.2 16 16"\r
+        style="overflow:visible;enable-background:new -0.3 -0.2 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M13.8,0.2L0.7,6.9c-1,0.5-1,1.3,0,1.8l13.1,6.7c1,0.5,1.9,0,1.9-1.1v-13C15.7,0.2,14.8-0.3,13.8,0.2z\r
+        M13.7,13L3.6,7.8l10.1-5.2V13z"/>\r
+</svg>\r
index 39b9417..b868560 100644 (file)
     font-size: large;
     font-weight: bold;
 
-    margin-left: 0px;
+    margin-left: 0;
     margin-bottom: 20px;
 }
+.dir-rtl.path-mod-book .book_chapter_title {
+    text-align: right;
+}
 
-.path-mod-book img.bigicon {
-  vertical-align: middle;
+.path-mod-book .navtop img.icon,
+.path-mod-book .navbotton img.icon {
   margin-right: 4px;
   margin-left: 4px;
-  width: 24px;
-  height: 24px;
-  border: 0px;
+  border: 0;
+  padding: 0;
 }
 
+
+.path-mod-book .navbottom,
 .path-mod-book .navtop {
     text-align: right;
-    margin-bottom: 0.5em;
 }
-
-.path-mod-book .navbottom {
-    text-align: right;
+.dir-rtl.path-mod-book .navbottom,
+.dir-rtl.path-mod-book .navtop {
+    text-align: left;
+}
+.path-mod-book .navtop {
+    margin-bottom: 0.5em;
 }
 
 /* == Fake toc block == */
 
-/* toc style NONE */
-.path-mod-book .book_toc_none {
-  font-size: 0.8em;
-}
-.path-mod-book .book_toc_none ul {
-    margin-left: 5px;
-    padding-left: 0px;
-}
-.path-mod-book .book_toc_none ul ul {
-    margin-left: 0px;
-    padding-left: 0px;
-}
-.path-mod-book .book_toc_none li {
-    margin-top: 5px;
+.path-mod-book .block_book_toc ul {
+    margin: 0 0 0 5px;
+    padding-left: 0;
+    padding-right: 0;
+}
+.dir-rtl.path-mod-book .block_book_toc ul { margin: 0 5px 0 0; }
+.path-mod-book .block_book_toc li {
+    clear: both;
     list-style: none;
+    margin-top: .5em;
 }
-.path-mod-book .book_toc_none li li {
-    margin-top: 0px;
+.path-mod-book .block_book_toc li li {
     list-style: none;
 }
+.path-mod-book .block_book_toc .action-list { float: right; }
+.dir-rtl.path-mod-book .block_book_toc .action-list { float: left; }
+.path-mod-book .block_book_toc .action-list img.smallicon {
+    margin: 0 3px;
+}
 
+/* toc style NONE */
+.path-mod-book .book_toc_none {
+  font-size: 0.8em;
+}
+.path-mod-book .book_toc_none ul ul,
+.dir-rtl.path-mod-book .book_toc_none ul ul {
+    margin-left: 0;
+    margin-right: 0;
+}
 
 /* toc style NUMBERED */
 .path-mod-book .book_toc_numbered {
   font-size: 0.8em;
 }
-.path-mod-book .book_toc_numbered ul {
-    margin-left: 5px;
-    padding-left: 0px;
-}
-.path-mod-book .book_toc_numbered ul ul {
-    margin-left: 0px;
-    padding-left: 0px;
-}
-.path-mod-book .book_toc_numbered li {
-    margin-top: 5px;
-    list-style: none;
-}
-.path-mod-book .book_toc_numbered li li {
-    margin-top: 0px;
-    list-style: none;
-}
-
 
 /*toc style BULLETS */
 .path-mod-book .book_toc_bullets {
   font-size: 0.8em;
 }
-.path-mod-book .book_toc_bullets ul {
-    margin-left: 5px;
-    padding-left: 0px;
-}
 .path-mod-book .book_toc_bullets ul ul {
     margin-left: 20px;
-    padding-left: 0px;
 }
-.path-mod-book .book_toc_bullets li {
-    margin-top: 5px;
-    list-style: none;
+.dir-rtl.path-mod-book .book_toc_bullets ul ul {
+    margin-left: 0;
+    margin-right: 20px;
 }
 .path-mod-book .book_toc_bullets li li {
-    margin-top: 0px;
     list-style: circle;
 }
 
-
 /* toc style INDENTED*/
 .path-mod-book .book_toc_indented {
   font-size: 0.8em;
 }
 .path-mod-book .book_toc_indented ul {
     margin-left: 5px;
-    padding-left: 0px;
+}
+.dir-rtl.path-mod-book .book_toc_indented ul {
+    margin-left: 0;
+    margin-right: 5px;
 }
 .path-mod-book .book_toc_indented ul ul {
     margin-left: 15px;
-    padding-left: 0px;
 }
-.path-mod-book .book_toc_indented li {
-    margin-top: 5px;
-    list-style: none;
+.dir-rtl.path-mod-book .book_toc_indented ul ul {
+    margin-left: 0;
+    margin-right: 15px;
 }
 .path-mod-book .book_toc_indented li li {
-    margin-top: 0px;
     list-style: none;
 }
index a5c9080..5d02847 100644 (file)
Binary files a/mod/book/tool/print/pix/book.png and b/mod/book/tool/print/pix/book.png differ
diff --git a/mod/book/tool/print/pix/book.svg b/mod/book/tool/print/pix/book.svg
new file mode 100644 (file)
index 0000000..f05747b
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M4,16H0V2l2-2h8.5C11.3,0,12,0.7,12,1.5V4h-1V2.5C11,1.7,10.3,1,9.5,1H3.1l-1,1h6.4\r
+       C9.3,2,10,2.7,10,3.5V4H8.6L6,6.6v3.6c-1.2,0.4-2,1.5-2,2.8V16z M16,16v-3c0-1.1-0.9-2-2-2H7c-1.1,0-2,0.9-2,2v3H16z M14,15H7v-1h7\r
+       V15z M9,5L7,7v3h7V5H9z M13,9H8V8h2V6h3V9z"/>\r
+</svg>\r
index 99ecd29..057a440 100644 (file)
Binary files a/mod/book/tool/print/pix/chapter.png and b/mod/book/tool/print/pix/chapter.png differ
diff --git a/mod/book/tool/print/pix/chapter.svg b/mod/book/tool/print/pix/chapter.svg
new file mode 100644 (file)
index 0000000..df78a87
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M4,12c-2,0-4,1.2-4,1.2L0,1.1c0,0,2-1.1,4-1.1S7.1,0.5,8,1c0.9-0.5,2-1,4-1s4,1.1,4,1.1v9.6\r
+       c-0.3-0.3-0.6-0.5-1-0.6V4V1.8c0,0-2.1-0.8-3.6-0.8C10.1,1,8.8,1.7,8,2.1C7.2,1.7,5.9,1,4.6,1C3.1,1,1,1.8,1,1.8l0,9.9\r
+       c0,0,2-0.8,3.6-0.8c0,0,0.1,0,0.1,0c-0.3,0.3-0.5,0.6-0.6,1C4.1,12,4.1,12,4,12z M5.9,10.2C5.9,10.2,6,10.2,5.9,10.2L6,6.6L8.6,4H14\r
+       V2.5c0,0-1.2-0.5-2.6-0.5C9.8,2,8,3.3,8,3.3C8,3.3,6.2,2,4.6,2C3.2,2,2,2.5,2,2.5v7.9c0,0,1.2-0.4,2.6-0.4C5.1,10,5.5,10.1,5.9,10.2\r
+       z M16,16v-3c0-1.1-0.9-2-2-2H7c-1.1,0-2,0.9-2,2v3H16z M14,15H7v-1h7V15z M9,5L7,7v3h7V5H9z M13,9H8V8h2V6h3V9z"/>\r
+</svg>\r
index af131a0..cf9ed55 100644 (file)
@@ -142,21 +142,25 @@ foreach ($chapters as $ch) {
     $last = $ch->id;
 }
 
+$navprevicon = right_to_left() ? 'nav_next' : 'nav_prev';
+$navnexticon = right_to_left() ? 'nav_prev' : 'nav_next';
+$navprevdisicon = right_to_left() ? 'nav_next_dis' : 'nav_prev_dis';
+
 $chnavigation = '';
 if ($previd) {
     $chnavigation .= '<a title="'.get_string('navprev', 'book').'" href="view.php?id='.$cm->id.
-            '&amp;chapterid='.$previd.'"><img src="'.$OUTPUT->pix_url('nav_prev', 'mod_book').'" class="bigicon" alt="'.get_string('navprev', 'book').'"/></a>';
+            '&amp;chapterid='.$previd.'"><img src="'.$OUTPUT->pix_url($navprevicon, 'mod_book').'" class="icon" alt="'.get_string('navprev', 'book').'"/></a>';
 } else {
-    $chnavigation .= '<img src="'.$OUTPUT->pix_url('nav_prev_dis', 'mod_book').'" class="bigicon" alt="" />';
+    $chnavigation .= '<img src="'.$OUTPUT->pix_url($navprevdisicon, 'mod_book').'" class="icon" alt="" />';
 }
 if ($nextid) {
     $chnavigation .= '<a title="'.get_string('navnext', 'book').'" href="view.php?id='.$cm->id.
-            '&amp;chapterid='.$nextid.'"><img src="'.$OUTPUT->pix_url('nav_next', 'mod_book').'" class="bigicon" alt="'.get_string('navnext', 'book').'" /></a>';
+            '&amp;chapterid='.$nextid.'"><img src="'.$OUTPUT->pix_url($navnexticon, 'mod_book').'" class="icon" alt="'.get_string('navnext', 'book').'" /></a>';
 } else {
     $sec = $DB->get_field('course_sections', 'section', array('id' => $cm->section));
     $returnurl = course_get_url($course, $sec);
     $chnavigation .= '<a title="'.get_string('navexit', 'book').'" href="'.$returnurl.'"><img src="'.$OUTPUT->pix_url('nav_exit', 'mod_book').
-            '" class="bigicon" alt="'.get_string('navexit', 'book').'" /></a>';
+            '" class="icon" alt="'.get_string('navexit', 'book').'" /></a>';
 
     // we are cheating a bit here, viewing the last page means user has viewed the whole book
     $completion = new completion_info($course);