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

Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2014-11-26 08:56:27 +13:00
parent 0b861e92d0 d8389cd6f8
commit 55dc0eb979
2 changed files with 136 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/book/tool/print/index.php
+19 -37
View File
@@ -53,6 +53,11 @@ if ($chapterid) {
$PAGE->set_url('/mod/book/print.php', array('id'=>$id, 'chapterid'=>$chapterid));
// Use "embedded" instead of "print" because Bootstrapbase shows top
// header bar and navbar even on print style - which is inconsistent
// with extant behaviour.
$PAGE->set_pagelayout("embedded");
unset($id);
unset($chapterid);
@@ -65,11 +70,14 @@ $strbooks = get_string('modulenameplural', 'mod_book');
$strbook = get_string('modulename', 'mod_book');
$strtop = get_string('top', 'mod_book');
@header('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
@header('Pragma: no-cache');
@header('Expires: ');
@header('Accept-Ranges: none');
@header('Content-type: text/html; charset=utf-8');
// Page header.
$strtitle = format_string($book->name, true, array('context'=>$context));
$PAGE->set_title($strtitle);
$PAGE->set_heading($strtitle);
$PAGE->requires->css('/mod/book/tool/print/print.css');
// Begin page output.
echo $OUTPUT->header();
if ($chapter) {
@@ -78,22 +86,10 @@ if ($chapter) {
}
\booktool_print\event\chapter_printed::create_from_chapter($book, $context, $chapter)->trigger();
// page header
?>
<!DOCTYPE HTML>
<html>
<head>
<title><?php echo format_string($book->name, true, array('context'=>$context)) ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="description" content="<?php echo s(format_string($book->name, true, array('context'=>$context))) ?>" />
<link rel="stylesheet" type="text/css" href="print.css" />
</head>
<body>
<?php
// Print dialog link.
$printtext = get_string('printchapter', 'booktool_print');
$printicon = $OUTPUT->pix_icon('chapter', $printtext, 'booktool_print', array('class' => 'book_print_icon'));
$printlinkatt = array('onclick' => 'window.print();return false;', 'class' => 'book_no_print');
$printicon = $OUTPUT->pix_icon('chapter', $printtext, 'booktool_print', array('class' => 'icon'));
$printlinkatt = array('onclick' => 'window.print();return false;', 'class' => 'hidden-print');
echo html_writer::link('#', $printicon.$printtext, $printlinkatt);
?>
<a name="top"></a>
@@ -102,8 +98,6 @@ if ($chapter) {
?>
<div class="chapter">
<?php
if (!$book->customtitles) {
if (!$chapter->subchapter) {
$currtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context);
@@ -119,7 +113,6 @@ if ($chapter) {
$chaptertext = file_rewrite_pluginfile_urls($chapter->content, 'pluginfile.php', $context->id, 'mod_book', 'chapter', $chapter->id);
echo format_text($chaptertext, $chapter->contentformat, array('noclean'=>true, 'context'=>$context));
echo '</div>';
echo '</body> </html>';
} else {
\booktool_print\event\book_printed::create_from_book($book, $context)->trigger();
@@ -127,22 +120,10 @@ if ($chapter) {
$allchapters = $DB->get_records('book_chapters', array('bookid'=>$book->id), 'pagenum');
$book->intro = file_rewrite_pluginfile_urls($book->intro, 'pluginfile.php', $context->id, 'mod_book', 'intro', null);
// page header
?>
<!DOCTYPE HTML>
<html>
<head>
<title><?php echo format_string($book->name, true, array('context'=>$context)) ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="description" content="<?php echo s(format_string($book->name, true, array('noclean'=>true, 'context'=>$context))) ?>" />
<link rel="stylesheet" type="text/css" href="print.css" />
</head>
<body>
<?php
// Print dialog link.
$printtext = get_string('printbook', 'booktool_print');
$printicon = $OUTPUT->pix_icon('book', $printtext, 'booktool_print', array('class' => 'book_print_icon'));
$printlinkatt = array('onclick' => 'window.print();return false;', 'class' => 'book_no_print');
$printicon = $OUTPUT->pix_icon('book', $printtext, 'booktool_print', array('class' => 'icon'));
$printlinkatt = array('onclick' => 'window.print();return false;', 'class' => 'hidden-print');
echo html_writer::link('#', $printicon.$printtext, $printlinkatt);
?>
<a name="top"></a>
@@ -195,6 +176,7 @@ if ($chapter) {
echo '</div>';
// echo '<a href="#toc">'.$strtop.'</a>';
}
echo '</body> </html>';
}
// Finish page output.
echo $OUTPUT->footer();
mod/book/tool/print/print.css
+117 -84
View File
@@ -1,149 +1,182 @@
h1, h2, h3, h4, h5, h6 {
margin-left: 0px;
#page-mod-book-print {
color: #000;
background-color: #fff;
font-family: "Times New Roman", Times, serif;
font-size: 1em;
font-weight: normal;
text-decoration: none;
}
#page-mod-book-print.dir-ltr {
margin-left: 50px;
margin-right: 10px;
}
#page-mod-book-print.dir-rtl {
margin-left: 10px;
margin-right: 50px;
}
#page-mod-book-print h1,
#page-mod-book-print h2,
#page-mod-book-print h3,
#page-mod-book-print h4,
#page-mod-book-print h5,
#page-mod-book-print h6 {
page-break-after: avoid;
page-break-inside: avoid;
}
#page-mod-book-print.dir-ltr h1,
#page-mod-book-print.dir-ltr h2,
#page-mod-book-print.dir-ltr h3,
#page-mod-book-print.dir-ltr h4,
#page-mod-book-print.dir-ltr h5,
#page-mod-book-print.dir-ltr h6 {
margin-left: 0px;
}
#page-mod-book-print.dir-rtl h1,
#page-mod-book-print.dir-rtl h2,
#page-mod-book-print.dir-rtl h3,
#page-mod-book-print.dir-rtl h4,
#page-mod-book-print.dir-rtl h5,
#page-mod-book-print.dir-rtl h6 {
margin-left: 0px;
}
.book_summary {
margin-left: -40px;
/* just some hack - ignore user defined <font> */
#page-mod-book-print font {
color: #000;
background-color: #eee;
font-family: "Times New Roman", Times, serif;
font-size: 1em;
font-weight: normal;
text-decoration: none;
}
#page-mod-book-print .book_summary {
text-align: center;
margin-bottom: 120px;
}
#page-mod-book-print.dir-ltr .book_summary {
margin-left: -40px;
}
#page-mod-book-print.dir-rtl .book_summary {
margin-right: -40px;
}
.book_chapter {
#page-mod-book-print .book_chapter {
page-break-before: always;
}
body {
margin-left: 50px;
margin-right: 10px;
color: #000000;
background-color: #FFFFFF;
font-family: "Times New Roman", Times, serif;
font-size: 1em;
font-weight: normal;
text-decoration: none;
}
/* link rewriting for mozilla - collides with filters :-( */
/*
a[href^="http://"]:after, a[href^="ftp://"]:after {
content: " ["attr(href)"]";
}
*/
/* just some hack - ignore user defined <font> */
font {
color: #000000;
background-color: #EEEEEE;
font-family: "Times New Roman", Times, serif;
font-size: 1em;
font-weight: normal;
text-decoration: none;
}
/* ===== TOC numbering styles ===== */
/* numbering == NONE */
.book_toc_none {
#page-mod-book-print .book_toc_none {
page-break-before: always;
}
.book_toc_none ul {
#page-mod-book-print.dir-ltr .book_toc_none ul,
#page-mod-book-print.dir-ltr .book_toc_none ul ul {
margin-left: 0px;
padding-left: 0px;
}
.book_toc_none ul ul {
margin-left: 0px;
padding-left: 0px;
#page-mod-book-print.dir-rtl .book_toc_none ul,
#page-mod-book-print.dir-rtl .book_toc_none ul ul {
margin-right: 0px;
padding-right: 0px;
}
.book_toc_none li {
#page-mod-book-print .book_toc_none li {
margin-top: 10px;
list-style: none;
}
.book_toc_none li li {
#page-mod-book-print .book_toc_none li li {
margin-top: 0px;
list-style: none;
}
/* numbering == NUMBERED */
.book_toc_numbered {
#page-mod-book-print .book_toc_numbered {
page-break-before: always;
}
.book_toc_numbered ul {
margin-left: 0px;
padding-left: 0px;
}
.book_toc_numbered ul ul {
margin-left: 0px;
padding-left: 0px;
}
.book_toc_numbered li {
#page-mod-book-print .book_toc_numbered li {
margin-top: 10px;
list-style: none;
}
.book_toc_numbered li li {
#page-mod-book-print .book_toc_numbered li li {
margin-top: 0px;
list-style: none;
}
#page-mod-book-print.dir-ltr .book_toc_numbered ul,
#page-mod-book-print.dir-ltr .book_toc_numbered ul ul {
margin-left: 0px;
padding-left: 0px;
}
#page-mod-book-print.dir-rtl .book_toc_numbered ul,
#page-mod-book-print.dir-rtl .book_toc_numbered ul ul {
margin-right: 0px;
padding-right: 0px;
}
/* numbering == BULLETS */
.book_toc_bullets {
#page-mod-book-print .book_toc_bullets {
page-break-before: always;
}
.book_toc_bullets ul {
margin-left: 0px;
padding-left: 0px;
}
.book_toc_bullets ul ul {
margin-left: 20px;
padding-left: 0px;
}
.book_toc_bullets li {
#page-mod-book-print .book_toc_bullets li {
margin-top: 10px;
list-style: none;
}
.book_toc_bullets li li {
#page-mod-book-print .book_toc_bullets li li {
margin-top: 0px;
list-style: circle;
}
/* numbering == INDENTED */
.book_toc_indented {
page-break-before: always;
}
.book_toc_indented ul {
#page-mod-book-print.dir-ltr .book_toc_bullets ul {
margin-left: 0px;
padding-left: 0px;
}
.book_toc_indented ul ul {
#page-mod-book-print.dir-ltr .book_toc_bullets ul ul {
margin-left: 20px;
padding-left: 0px;
}
.book_toc_indented li {
#page-mod-book-print.dir-rtl .book_toc_bullets ul {
margin-right: 0px;
padding-right: 0px;
}
#page-mod-book-print.dir-rtl .book_toc_bullets ul ul {
margin-right: 20px;
padding-right: 0px;
}
/* numbering == INDENTED */
#page-mod-book-print .book_toc_indented {
page-break-before: always;
}
#page-mod-book-print .book_toc_indented li {
margin-top: 10px;
list-style: none;
}
.book_toc_indented li li {
#page-mod-book-print .book_toc_indented li li {
margin-top: 0px;
list-style: none;
}
/* Print dialog link icon */
.book_print_icon {
padding-left: 0;
padding-right: 3px;
height: 16px;
vertical-align: text-bottom;
width: 16px;
border-width: 0;
#page-mod-book-print.dir-ltr .book_toc_indented ul {
margin-left: 0px;
padding-left: 0px;
}
#page-mod-book-print.dir-ltr .book_toc_indented ul ul {
margin-left: 20px;
padding-left: 0px;
}
#page-mod-book-print.dir-rtl .book_toc_indented ul {
margin-right: 0px;
padding-right: 0px;
}
#page-mod-book-print.dir-rtl .book_toc_indented ul ul {
margin-right: 20px;
padding-right: 0px;
}
/* Exclude elements from printing */
/* Exclude elements from printing. */
@media print
{
.book_no_print {
display: none;
.hidden-print {
display: none !important;
}
}