Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/249710
Change subject: UEModulePDF: Improved styling and layout ...................................................................... UEModulePDF: Improved styling and layout * Changed table grid line styling * Changed table pagination behavior * Added BlueSpice content stylings * Added styling for SELECT elements * Updated xhtmlrenderer library in BSHtml2PDF.war to 9.0.8 to fix line break issue with serveral chars like '.', ')', '(', '-', ',', ... ** https://github.com/flyingsaucerproject/flyingsaucer/pull/60 ** https://groups.google.com/forum/#!searchin/flying-saucer-users/split$20word/flying-saucer-users/jqEqh7FwhkE/NOyHCTqhBgAJ ** https://github.com/flyingsaucerproject/flyingsaucer/pull/70 Change-Id: I9b093793098f432793cecf9614405ae692769712 --- M UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.html M UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.php M UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.html M UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.php M UEModulePDF/data/PDFTemplates/BlueSpice/template.html M UEModulePDF/data/PDFTemplates/BlueSpice/template.php A UEModulePDF/data/PDFTemplates/common/stylesheets/bluespice.css M UEModulePDF/data/PDFTemplates/common/stylesheets/mediawiki.css M UEModulePDF/data/PDFTemplates/common/stylesheets/page.css M UEModulePDF/webservices/BShtml2PDF.war 10 files changed, 145 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/10/249710/1 diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.html b/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.html index 814e030..5305f69 100644 --- a/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.html +++ b/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.html @@ -6,6 +6,8 @@ <link href="stylesheets/mediawiki.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/styles.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/geshi-php.css" type="text/css" rel="stylesheet" /> + <link href="stylesheets/bluespice.css" type="text/css" rel="stylesheet" /> + <link href="stylesheets/fonts.css" type="text/css" rel="stylesheet" /> <!-- <link href="stylesheets/debug.css" type="text/css" rel="stylesheet" /> --> <!-- This is where additional resources and meta information is appended to --> </head> @@ -13,7 +15,7 @@ <div id="bs-runningheaderfix"> <h1><bs:meta key="title" /></h1> </div> - + <div id="bs-runningfooterleft"> <bs:msg key="exportdate" /> <bs:meta key="exportdate" /> </div> diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.php b/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.php index 2f8dcfb..ccf123d 100644 --- a/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.php +++ b/UEModulePDF/data/PDFTemplates/BlueSpice Draft/template.php @@ -1,6 +1,6 @@ <?php /** - * This is the main description file for the template. It contains all + * This is the main description file for the template. It contains all * information necessary to load and process the template. */ @@ -16,7 +16,7 @@ ), /** - * The following resources are used in the conversion from xhtml to PDF. + * The following resources are used in the conversion from xhtml to PDF. * You may reference them in your template files */ 'resources' => array( @@ -28,6 +28,7 @@ '../common/stylesheets/mediawiki.css', '../BlueSpice/stylesheets/styles.css', //Inherit from BlueSpice '../common/stylesheets/geshi-php.css', + '../common/stylesheets/bluespice.css', 'stylesheets/draft.css', '../common/stylesheets/fonts.css', //'../common/stylesheets/debug.css', @@ -45,7 +46,7 @@ 'images/bs-draft.png' ) ), - + /* http://markmail.org/message/3or4xlburtrd34lz <-- TABELLEN MIT BODERCOLLAPSE */ /** diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.html b/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.html index 4ca3134..4245b4c 100644 --- a/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.html +++ b/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.html @@ -5,6 +5,7 @@ <link href="stylesheets/mediawiki.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/styles.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/geshi-php.css" type="text/css" rel="stylesheet" /> + <link href="stylesheets/bluespice.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/fonts.css" type="text/css" rel="stylesheet" /> <!-- <link href="stylesheets/debug.css" type="text/css" rel="stylesheet" /> --> <!-- This is where additional resources and meta information is appended to --> diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.php b/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.php index c693524..9e6b6b8 100644 --- a/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.php +++ b/UEModulePDF/data/PDFTemplates/BlueSpice Landscape/template.php @@ -1,6 +1,6 @@ <?php /** - * This is the main description file for the template. It contains all + * This is the main description file for the template. It contains all * information necessary to load and process the template. */ @@ -16,7 +16,7 @@ ), /** - * The following resources are used in the conversion from xhtml to PDF. + * The following resources are used in the conversion from xhtml to PDF. * You may reference them in your template files */ 'resources' => array( @@ -26,6 +26,7 @@ '../common/stylesheets/mediawiki.css', 'stylesheets/styles.css', '../common/stylesheets/geshi-php.css', + '../common/stylesheets/bluespice.css', '../common/stylesheets/fonts.css', //'../common/stylesheets/debug.css', '../common/fonts/DejaVuSans.ttf', diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/template.html b/UEModulePDF/data/PDFTemplates/BlueSpice/template.html index 4ca3134..4245b4c 100644 --- a/UEModulePDF/data/PDFTemplates/BlueSpice/template.html +++ b/UEModulePDF/data/PDFTemplates/BlueSpice/template.html @@ -5,6 +5,7 @@ <link href="stylesheets/mediawiki.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/styles.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/geshi-php.css" type="text/css" rel="stylesheet" /> + <link href="stylesheets/bluespice.css" type="text/css" rel="stylesheet" /> <link href="stylesheets/fonts.css" type="text/css" rel="stylesheet" /> <!-- <link href="stylesheets/debug.css" type="text/css" rel="stylesheet" /> --> <!-- This is where additional resources and meta information is appended to --> diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/template.php b/UEModulePDF/data/PDFTemplates/BlueSpice/template.php index 3ac29bd..26963b5 100644 --- a/UEModulePDF/data/PDFTemplates/BlueSpice/template.php +++ b/UEModulePDF/data/PDFTemplates/BlueSpice/template.php @@ -1,6 +1,6 @@ <?php /** - * This is the main description file for the template. It contains all + * This is the main description file for the template. It contains all * information necessary to load and process the template. */ @@ -16,7 +16,7 @@ ), /** - * The following resources are used in the conversion from xhtml to PDF. + * The following resources are used in the conversion from xhtml to PDF. * You may reference them in your template files */ 'resources' => array( @@ -26,6 +26,7 @@ '../common/stylesheets/mediawiki.css', 'stylesheets/styles.css', '../common/stylesheets/geshi-php.css', + '../common/stylesheets/bluespice.css', '../common/stylesheets/fonts.css', //'../common/stylesheets/debug.css', '../common/fonts/DejaVuSans.ttf', diff --git a/UEModulePDF/data/PDFTemplates/common/stylesheets/bluespice.css b/UEModulePDF/data/PDFTemplates/common/stylesheets/bluespice.css new file mode 100644 index 0000000..f70966a --- /dev/null +++ b/UEModulePDF/data/PDFTemplates/common/stylesheets/bluespice.css @@ -0,0 +1,82 @@ +/* +This file contains parts of BlueSpiceFoundation/resources/bluespice/bluespice.css +The correct way would be to have it included using the +'BSUEModulePDFBeforeAddingStyleBlocks' hook within the BSF but this seems to be +a little too much overhead at the moment. We've got things like 'geshi-php.css' +in this place anyways. +*/ + +.bluebox, +.box-blue { + border:0.2mm solid #6093D2; + background-color:#AEC8E8; + margin:0 0 10px; + padding:.3em .6em; +} + +.beigebox, +.box-beige { + border:0.2mm solid #000; + background-color:#E0B978; + margin:0 0 10px; + padding:.3em .6em; +} + +.greenbox, +.box-green { + border:0.2mm solid #237E14; + background-color:#DEFEBB; + margin:0 0 10px; + padding:.3em .6em; +} + +.yellowbox, +.box-yellow { + border:0.2mm solid #DDDD00; + background-color:#FFFFAA; + margin:0 0 10px; + padding:.3em .6em; +} + +.redbox, +.box-red { + border:0.2mm solid #DD0000; + background-color:#FFAAAA; + margin:0 0 10px; + padding:.3em .6em; +} + +.blueborder, +.border-blue { + border:0.2mm solid #AEC8E8; + margin:0 0 10px; + padding:.3em .6em; +} + +.beigeborder, +.border-beige { + border:0.2mm solid #E0B978; + margin:0 0 10px; + padding:.3em .6em; +} + +.greenborder, +.border-green { + border:0.2mm solid #237E14; + margin:0 0 10px; + padding:.3em .6em; +} + +.yellowborder, +.border-yellow { + border:0.2mm solid #DDDD00; + margin:0 0 10px; + padding:.3em .6em; +} + +.redborder, +.border-red { + border:0.2mm solid #DD0000; + margin:0 0 10px; + padding:.3em .6em; +} \ No newline at end of file diff --git a/UEModulePDF/data/PDFTemplates/common/stylesheets/mediawiki.css b/UEModulePDF/data/PDFTemplates/common/stylesheets/mediawiki.css index 2732a41..43f19ee 100644 --- a/UEModulePDF/data/PDFTemplates/common/stylesheets/mediawiki.css +++ b/UEModulePDF/data/PDFTemplates/common/stylesheets/mediawiki.css @@ -108,7 +108,7 @@ } abbr, acronym, .explain { - border-bottom: 1px dotted black; + border-bottom: 0.1mm dotted black; color: black; background: none; cursor: help; @@ -170,7 +170,7 @@ width: auto; } div.thumbinner { - border: 1px solid #ccc; + border: 0.1mm solid #ccc; padding: 3px !important; background-color: #f9f9f9; font-size: 94%; @@ -179,7 +179,7 @@ } html .thumbimage { - border: 1px solid #ccc; + border: 0.1mm solid #ccc; } html .thumbcaption { @@ -239,7 +239,7 @@ } .bluebox { - border: 1px solid #608E91; + border: 0.1mm solid #608E91; margin: 1em 0em 1em 0em; empty-cells:show; padding:3px; @@ -249,7 +249,7 @@ .box-green { margin: 0; margin-bottom:10px; - border: 1px solid #237E14; + border: 0.1mm solid #237E14; padding: .3em .6em 0em .6em; background-color: #DEFEBB; } @@ -257,7 +257,7 @@ .box-beige { margin: 0; margin-bottom:10px; - border: 1px solid #000000; + border: 0.1mm solid #000000; padding: .3em .6em 0em .6em; background-color: #E0B978; } @@ -282,7 +282,7 @@ .firstHeading, h1, h2, h3, h4, h5, h6 { background: none; text-decoration: none; - border-bottom:1px solid #aaaaaa; + border-bottom: 0.2mm solid #aaaaaa; page-break-after: avoid; } @@ -349,13 +349,13 @@ .wikitable { margin: 1em 1em 1em 0; background: #f9f9f9; - border: 1px #aaa solid; + border: 0.1mm #aaa solid; border-collapse: collapse; color: black; } .wikitable th, .wikitable td { - border: 1px #aaa solid; + border: 0.1mm #aaa solid; padding: 0.2em; } @@ -368,29 +368,29 @@ } .contenttable, -.contenttable-black, -.contenttable-blue, +.contenttable-black, +.contenttable-blue, .contenttable-darkblue { width: 100% !important; - border: 1px #ccc solid; + border: 0.1mm #ccc solid; border-spacing: 0; } .contenttable td,.contenttable tr { - border: 1px #ccc solid; + border: 0.1mm #ccc solid; padding: 0 4px 0 4px; border-spacing: 0; } .contenttable, .sortable { - border: 1px solid #CCCCCC; + border: 0.1mm solid #CCCCCC; border-collapse: collapse; border-spacing: 0; } .contenttable td, .contenttable tr, .sortable td, .sortable tr { - border: 1px solid #CCCCCC; + border: 0.1mm solid #CCCCCC; border-collapse: collapse; border-spacing: 0; padding: 0 4px; @@ -398,54 +398,54 @@ .contenttable th, .sortable th { background-color: #E0E0E0; - border: 1px solid #CCCCCC; + border: 0.1mm solid #CCCCCC; padding: 0 4px; } .contenttable-black td, .contenttable-black tr { - border: 1px solid #000000; + border: 0.1mm solid #000000; border-collapse: collapse; border-spacing: 0; padding: 4px; } .contenttable-black th { background-color: #E0E0E0; - border: 1px solid #000000; + border: 0.1mm solid #000000; padding: 4px; } .contenttable-blue { - border: 1px solid #B1B9CF; + border: 0.1mm solid #B1B9CF; border-collapse: collapse; border-spacing: 0; width: 100%; } .contenttable-blue td, .contenttable-blue tr { - border: 1px solid #B1B9CF; + border: 0.1mm solid #B1B9CF; border-collapse: collapse; border-spacing: 0; padding: 4px; } .contenttable-blue th { background-color: #EFF3F9; - border: 1px solid #B1B9CF; + border: 0.1mm solid #B1B9CF; color: #3E5389; padding: 4px; } .contenttable-darkblue { - border: 1px solid #B1B9CF; + border: 0.1mm solid #B1B9CF; border-collapse: collapse; border-spacing: 0; width: 100%; } .contenttable-darkblue td, .contenttable-darkblue tr { - border: 1px solid #B1B9CF; + border: 0.1mm solid #B1B9CF; border-collapse: collapse; border-spacing: 0; padding: 4px; } .contenttable-darkblue th { background-color: #3E5389; - border: 1px solid #B1B9CF; + border: 0.1mm solid #B1B9CF; color: #FFFFFF; padding: 4px; } @@ -455,7 +455,7 @@ } #toc, .toc, .mw-warning { - border: 1px solid #aaa; + border: 0.1mm solid #aaa; background-color: #f9f9f9; padding: 5px; font-size: 95%; @@ -487,7 +487,7 @@ } #toc a:after, .toc a:after { - content: leader('.') target-counter(attr(href), page); + content: leader('.') target-counter(attr(href), page); } /* @@ -501,7 +501,7 @@ li.gallerybox { vertical-align: top; background-color: #f9f9f9; - border: solid 2px white; + border: solid 0.2mm white; display: -moz-inline-box; } @@ -526,7 +526,7 @@ li.gallerybox div.thumb { text-align: center; - border: 1px solid #ccc; + border: 0.2mm solid #ccc; margin: 2px; } @@ -538,4 +538,14 @@ } div.patrollink { display: none; -} \ No newline at end of file +} + +/* Select box hack START */ + select > option { + display:none; +} + +select > option[selected] { + display: inline-block; +} +/* Select box hack END */ \ No newline at end of file diff --git a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css index 8649993..87806bb 100644 --- a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css +++ b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css @@ -163,4 +163,13 @@ table { clear: both; /* Is this wise? Prevents floating thumbs from overlapping into tables and TOC table */ -fs-table-paginate: paginate; /* special xhtmlrenderer (flying saucer -> fs) property */ + page-break-inside: avoid; +} + +thead { + page-break-after: avoid; +} + +tbody { + page-break-inside: avoid; } \ No newline at end of file diff --git a/UEModulePDF/webservices/BShtml2PDF.war b/UEModulePDF/webservices/BShtml2PDF.war index 06830fb..6dfeaae 100644 --- a/UEModulePDF/webservices/BShtml2PDF.war +++ b/UEModulePDF/webservices/BShtml2PDF.war Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/249710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b093793098f432793cecf9614405ae692769712 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits