[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: UEModulePDF: PDF Templates with new BlueSpice Logo

2017-08-08 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368128 )

Change subject: UEModulePDF: PDF Templates with new BlueSpice Logo
..


UEModulePDF: PDF Templates with new BlueSpice Logo

* modified page margin
* new header logo

Change-Id: I9e02c039a49f6dd2bf7323b46bfc4eea5a53e72f
---
M UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg
M UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
M UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
M UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg
M UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/page.css
M UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css
M UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/template.php
7 files changed, 10 insertions(+), 12 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg 
b/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg
index ae0352d..436a6f3 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg
Binary files differ
diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css 
b/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
index fa576c1..4ed4eac 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
@@ -4,13 +4,12 @@
margin: 0 0 0 -2.5cm;
background: url('../images/bs-header.jpg') no-repeat 0 0;
background-size: 21cm;
-   height: 3cm;
+   height: 3.5cm;
width: 21cm;
-   border-bottom: 1px solid;
 }
 
 #bs-runningheaderfix h1 {
-   margin: 2.5cm 0 0 2.5cm;
+   margin: 2.3cm 0 0 2.5cm;
font-size: small;
color:#6c6d6f;
border: none;
@@ -33,7 +32,7 @@
 }
 
 .bs-runningheader table td{
-   vertical-align: bottom; 
+   vertical-align: bottom;
 }
 
 .bs-booktitle {
diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
index f9d1bab..feb4545 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
@@ -11,7 +11,7 @@
'name'  => 'BlueSpice Draft',
'author'=> 'Hallo Welt!',
'copyright' => 'Hallo Welt! GmbH',
-   'url'   => 'http://www.hallowelt.biz',
+   'url'   => 'http://www.hallowelt.com',
'description'  => 'This is the default BlueSpice Draft PDF 
Template'
),
 
diff --git 
a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg
index 3eb0352..436a6f3 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg
Binary files differ
diff --git 
a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/page.css 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/page.css
index 5d9a0f2..99ee09b 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/page.css
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/page.css
@@ -15,7 +15,7 @@
   */
 @page {
size: A4 landscape;
-   margin: 3.5cm 1cm 2.5cm 2.5cm;
+   margin: 4.5cm 1cm 2.5cm 2.5cm;
background: url('../images/bs-page-background.png') repeat-x bottom;
background-size: 29.7cm 2.3cm;
 
diff --git 
a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css
index b7bd610..1aae1d4 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css
@@ -1,16 +1,15 @@
 /*** PAGE LAYOUT ELEMENTS ***/
 #bs-runningheaderfix {
position: running( topleft );
-   margin: 0 0 0 -0.5cm;
+   margin: 0 0 0 -2.5cm;
background: url('../images/bs-header.jpg') no-repeat 0 0;
-   background-size: 21cm;
-   height: 3cm;
+   background-size: 29.7cm;
+   height: 4cm;
width: 29.7cm;
-   border-bottom: 1px solid;
 }
 
 #bs-runningheaderfix h1 {
-   margin: 2.5cm 0 0 2.5cm;
+   margin: 3.3cm 0 0 2.5cm;
font-size: small;
color:#6c6d6f;
border: none;
diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/template.php 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/template.php
index 300a6f1..9035959 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/template.php

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: UEModulePDF: PDF Templates with new BlueSpice Logo

2017-07-27 Thread Dvogel hallowelt (Code Review)
Dvogel hallowelt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368128 )

Change subject: UEModulePDF: PDF Templates with new BlueSpice Logo
..

UEModulePDF: PDF Templates with new BlueSpice Logo

Change-Id: I9e02c039a49f6dd2bf7323b46bfc4eea5a53e72f
---
D UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg
A UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.png
M UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
M UEModulePDF/data/PDFTemplates/BlueSpice/template.php
M UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
D UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg
A UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.png
M UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css
M UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/template.php
9 files changed, 12 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/28/368128/1

diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg 
b/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg
deleted file mode 100644
index ae0352d..000
--- a/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.jpg
+++ /dev/null
Binary files differ
diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.png 
b/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.png
new file mode 100644
index 000..aa95e76
--- /dev/null
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice/images/bs-header.png
Binary files differ
diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css 
b/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
index fa576c1..47b2b32 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice/stylesheets/styles.css
@@ -2,7 +2,7 @@
 #bs-runningheaderfix {
position: running( topleft );
margin: 0 0 0 -2.5cm;
-   background: url('../images/bs-header.jpg') no-repeat 0 0;
+   background: url('../images/bs-header.png') no-repeat 0 0;
background-size: 21cm;
height: 3cm;
width: 21cm;
@@ -33,7 +33,7 @@
 }
 
 .bs-runningheader table td{
-   vertical-align: bottom; 
+   vertical-align: bottom;
 }
 
 .bs-booktitle {
diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice/template.php 
b/UEModulePDF/data/PDFTemplates/BlueSpice/template.php
index 7052ec7..c3febfc 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice/template.php
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice/template.php
@@ -41,7 +41,7 @@
'../common/fonts/DejaVuSansMono-BoldOblique.ttf'
),
'IMAGE' => array(
-   'images/bs-header.jpg',
+   'images/bs-header.png',
'images/bs-page-background.png'
)
),
diff --git a/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
index f9d1bab..dd38799 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice_Draft/template.php
@@ -11,7 +11,7 @@
'name'  => 'BlueSpice Draft',
'author'=> 'Hallo Welt!',
'copyright' => 'Hallo Welt! GmbH',
-   'url'   => 'http://www.hallowelt.biz',
+   'url'   => 'http://www.hallowelt.com',
'description'  => 'This is the default BlueSpice Draft PDF 
Template'
),
 
@@ -43,7 +43,7 @@
'../common/fonts/DejaVuSansMono-BoldOblique.ttf'
),
'IMAGE' => array(
-   '../BlueSpice/images/bs-header.jpg',
+   '../BlueSpice/images/bs-header.png',
'images/bs-draft.png'
)
),
diff --git 
a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg
deleted file mode 100644
index 3eb0352..000
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.jpg
+++ /dev/null
Binary files differ
diff --git 
a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.png 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.png
new file mode 100644
index 000..aa95e76
--- /dev/null
+++ b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/images/bs-header.png
Binary files differ
diff --git 
a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css 
b/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css
index b7bd610..38dfddf 100644
--- a/UEModulePDF/data/PDFTemplates/BlueSpice_Landscape/stylesheets/styles.css
+++