Juan Carlos Raña 14 vuotta sitten
vanhempi
commit
a2cd34a060

+ 3 - 3
main/inc/lib/fckeditor/toolbars/default/wiki.php

@@ -9,13 +9,13 @@
 
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('NewPage','Templates','Save','PageBreak','Preview','FitWindow','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
+	array('FitWindow','Save','NewPage','Templates','PageBreak','Preview','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
 	array('Wikilink','Link','Unlink','Anchor'),
 	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'),
-	array('Table','Smiley','SpecialChar','googlemaps'),
+	array('Table','Rule','Smiley','SpecialChar','googlemaps'),
 	array('FontFormat','FontName','FontSize'),
 	array('Bold','Italic','Underline'),
-	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
+	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
 	array('Source')
 );
 

+ 2 - 2
main/inc/lib/fckeditor/toolbars/default/wiki_student.php

@@ -9,10 +9,10 @@
 
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('NewPage','Save','PageBreak','Preview','FitWindow','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
+	array('FitWindow','Save','NewPage','PageBreak','Preview','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
 	array('Wikilink','Link','Unlink','Anchor'),
 	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'),
-	array('Table','Smiley','SpecialChar','googlemaps'),
+	array('Table','Rule','Smiley','SpecialChar','googlemaps'),
 	array('FontFormat','FontName','FontSize'),
 	array('Bold','Italic','Underline'),
 	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),

+ 3 - 3
main/inc/lib/fckeditor/toolbars/extended/wiki.php

@@ -9,13 +9,13 @@
 
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('NewPage','Templates','Save','PageBreak','Preview','FitWindow','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
+	array('FitWindow','Save','NewPage','Templates','PageBreak','Preview','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
 	array('Wikilink','Link','Unlink','Anchor'),
 	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'),
-	array('Table','Smiley','SpecialChar','googlemaps'),
+	array('Table','Rule','Smiley','SpecialChar','googlemaps'),
 	array('FontFormat','FontName','FontSize'),
 	array('Bold','Italic','Underline'),
-	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
+	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
 	array('Source')
 );
 

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/wiki_student.php

@@ -9,10 +9,10 @@
 
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('NewPage','Save','PageBreak','Preview','FitWindow','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
+	array('FitWindow','Save','NewPage','PageBreak','Preview','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
 	array('Wikilink','Link','Unlink','Anchor'),
 	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'),
-	array('Table','Smiley','SpecialChar','googlemaps'),
+	array('Table','Rule','Smiley','SpecialChar','googlemaps'),
 	array('FontFormat','FontName','FontSize'),
 	array('Bold','Italic','Underline'),
 	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),

+ 17 - 14
main/wiki/export_mpdf.php

@@ -18,20 +18,23 @@ require_once _MPDF_PATH.'mpdf.php';
 $content_pdf = api_html_entity_decode($_POST['contentPDF'], ENT_QUOTES, api_get_system_encoding());
 $title_pdf = api_html_entity_decode($_POST['titlePDF'], ENT_QUOTES, api_get_system_encoding());
 
-$html = '
-<page backtop="10mm" backbottom="10mm" footer="page">
-      <page_header>
-{TITLE_PDF}<br/><hr/>
-      </page_header>
-{CONTENT_PDF}
-      <page_footer>
-            <hr/>
-      </page_footer>
- </page>
-';
-
-$html = api_utf8_encode(str_replace(array('{TITLE_PDF}', '{CONTENT_PDF}'), array($title_pdf, $content_pdf), $html), api_get_system_encoding());
 $title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding());
+$content_pdf = api_utf8_encode($content_pdf, api_get_system_encoding());
+
+$html='
+<!-- defines the headers/footers - this must occur before the headers/footers are set -->
+
+<!--mpdf
+<pageheader name="odds" content-left="'.$title_pdf.'"  header-style-left="color: #880000; font-style: italic;"  line="1" />
+<pagefooter name="odds" content-right="{PAGENO}/{nb}" line="1" />
+
+<!-- set the headers/footers - they will occur from here on in the document -->
+<!--mpdf
+<setpageheader name="odds" page="odd" value="on" show-this-page="1" />
+<setpagefooter name="odds" page="O" value="on" />
+
+mpdf-->'.$content_pdf;
+
 
 $css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css';
 if (file_exists($css_file)) {
@@ -40,7 +43,7 @@ if (file_exists($css_file)) {
 	$css = '';
 }
 
-$pdf = new mPDF('UTF-8', 'A4', '', '', 32, 25, 27, 25, 16, 13, 'P');
+$pdf = new mPDF('UTF-8', 'A4', '', '', 30, 20, 27, 25, 16, 13, 'P');
 
 $pdf->directionality = api_get_text_direction();