From 2b26eb5b4a4ae1f68997460e0bdc981406a61e42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 19 Aug 2009 20:57:15 +0000
Subject: [PATCH] Add a print icon to show a page to print without menus.

---
 ChangeLog                                  |   3 ++-
 htdocs/langs/en_US/main.lang               |   1 +
 htdocs/langs/fr_FR/main.lang               |   1 +
 htdocs/main.inc.php                        |  19 +++++++++------
 htdocs/theme/auguria/auguria.css.php       |  18 +++++++++++---
 htdocs/theme/auguria/img/printer.png       | Bin 0 -> 995 bytes
 htdocs/theme/bluelagoon/bluelagoon.css.php |  27 ++++++++++++++-------
 htdocs/theme/bluelagoon/img/logout.png     | Bin 523 -> 999 bytes
 htdocs/theme/bluelagoon/img/printer.png    | Bin 0 -> 995 bytes
 htdocs/theme/eldy/eldy.css.php             |  14 +++++++++--
 htdocs/theme/eldy/img/printer.png          | Bin 0 -> 995 bytes
 htdocs/theme/freelug/freelug.css.php       |  15 +++++++++---
 htdocs/theme/freelug/img/printer.png       | Bin 0 -> 995 bytes
 htdocs/theme/rodolphe/img/printer.png      | Bin 0 -> 995 bytes
 htdocs/theme/rodolphe/rodolphe.css.php     |  18 +++++++++++---
 htdocs/theme/yellow/img/printer.png        | Bin 0 -> 995 bytes
 htdocs/theme/yellow/yellow.css.php         |  14 +++++++++--
 17 files changed, 97 insertions(+), 33 deletions(-)
 create mode 100644 htdocs/theme/auguria/img/printer.png
 create mode 100644 htdocs/theme/bluelagoon/img/printer.png
 create mode 100644 htdocs/theme/eldy/img/printer.png
 create mode 100644 htdocs/theme/freelug/img/printer.png
 create mode 100644 htdocs/theme/rodolphe/img/printer.png
 create mode 100644 htdocs/theme/yellow/img/printer.png

diff --git a/ChangeLog b/ChangeLog
index 30a7bf8979c..fb02724ea97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@ English Dolibarr changelog
 ***** Changelog for 2.7 compared to 2.6 *****
 
 For users:
-- New: Can add a free text on bank cheque receipts
+- New: Add a print icon to show a page to print without menus.
+- New: Can add a free text on bank cheque receipts.
 - New: Price level can be defined also for prospects.
 - New: Add a help and support center.
 - New: Can export commercial proposals.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 4a57caefc6a..ea6a6d2c3ec 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -525,6 +525,7 @@ FreeZone=Free text
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+PrintContentArea=Show page to print main content area
 # Week day
 Day1=Monday
 Day2=Tuesday
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 9b25049b4d4..53e8cb0612d 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -524,6 +524,7 @@ FreeZone=Zone libre
 CloneMainAttributes=Cloner l'objet avec ces attributs principaux
 PDFMerge=Fusion PDF
 Merge=Fusion
+PrintContentArea=Afficher page d'impression de la zone centrale
 # Week day
 Day1=Lundi
 Day2=Mardi
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 88e418f2f09..00642a2bfc8 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -864,14 +864,14 @@ function top_menu($head, $title='', $target='')
 		$text.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
 		$text.='>';
 		$text.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
-		$text.=' alt="'.$langs->trans("Logout").'" title=""';
+		$text.=' alt="'.dol_escape_htmltag($langs->trans("Logout")).'" title=""';
 		$text.='>';
 		$text.='</a>';
 	}
 	else
 	{
 		$text.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
-		$text.=' alt="'.$langs->trans("Logout").'" title=""';
+		$text.=' alt="'.dol_escape_htmltag($langs->trans("Logout")).'" title=""';
 		$text.='>';
 	}
 	$htmltext.='<u>'.$langs->trans("User").'</u>';
@@ -895,12 +895,15 @@ function top_menu($head, $title='', $target='')
 	$html=new Form($db);
 	print $html->textwithtooltip('',$htmltext,2,1,$text);
 
-	// Link to print
-	$text ='<a class="print" href="'.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].'&optioncss=print" target="_new">';
-	$text.='<img class="print" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
-	$text.=' alt="'.$langs->trans("Print").'" title="">';
-	$text.='</a>';
-	//print $text;
+	// Link to print main content area
+	if (empty($conf->global->MAIN_PRINT_DISABLELINK))
+	{
+		$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].'&optioncss=print" target="_new">';
+		$text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"';
+		$text.=' title="'.dol_escape_htmltag($langs->trans("PrintContentArea")).'" alt="'.dol_escape_htmltag($langs->trans("PrintContentArea")).'">';
+		$text.='</a>';
+		print $text;
+	}
 
 	print "\n</div>\n<!-- End top horizontal menu -->\n";
 }
diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php
index aace2a21c44..17359349426 100644
--- a/htdocs/theme/auguria/auguria.css.php
+++ b/htdocs/theme/auguria/auguria.css.php
@@ -305,11 +305,11 @@ li.tmenu {
 a.login
 {
   position: absolute;
-  right: 24px;
+  <?php print $right; ?>: 30px;
   top: 3px;
   color: #234046;
-  padding: 0em 1em;
-  margin: 0px 0px 1.5px 0px;
+  padding: 0px 8px;
+  margin: 0px 0px 1px 0px;
   font-weight:bold;
   font-size:12px;
 }
@@ -321,13 +321,23 @@ a.login:hover
 img.login
 {
   position: absolute;
-  right: 8px;
+  <?php print $right; ?>: 20px;
   top: 3px;
 
   text-decoration:none;
   color:white;
   font-weight:bold;
 }
+img.printer
+{
+  position: absolute;
+  <?php print $right; ?>: 4px;
+  top: 3px;
+
+  text-decoration: none;
+  color: white;
+  font-weight: bold;
+}
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/auguria/img/printer.png b/htdocs/theme/auguria/img/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..becd7dc553aba87ad1176727b78d3e7763791894
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3-otS@yI7DfSXiUsv{<9Ks?hBGoEc4L~8z
z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{<g{W`+Qt5Z7tb7OY;qdhOb^>({T}
zv17;1ojVU4IB@vz;bX^+oj7q~>(;HeZ{L3Q?AgngFF$|&{Qdj)|Ns93jT!}`Auv2b
zpz>4cY@kmBOM?7@foU5BFsQDbnFN&d^mK6yskl{o&Xeze0*`axdl|tc1^+K^o6zF8
zrT*uW){E;txT|_=Ro~)FZ_e8LBAL}=OUE<ctfXa6UeDRD;?`ZWMAPy1G0zvQw($X6
UMUg9V_JP9A)78&qol`;+05au!i2wiq

literal 0
HcmV?d00001

diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/bluelagoon.css.php
index 3cda1f28a99..336d456af1d 100644
--- a/htdocs/theme/bluelagoon/bluelagoon.css.php
+++ b/htdocs/theme/bluelagoon/bluelagoon.css.php
@@ -225,12 +225,12 @@ li.tmenu a:link
 a.login
 {
   position: absolute;
-  right: 24px;
-  top: 4px;
-  padding: 0em 1em;
-  margin: 0em 0em 1em 0em;
-  font-weight:bold;
-  font-size:12px;
+  <?php print $right; ?>: 30px;
+  top: 3px;
+  padding: 0px 8px;
+  margin: 0px 0px 1px 0px;
+  font-weight: bold;
+  font-size: 12px;
 }
 a.login:hover
 {
@@ -241,14 +241,23 @@ a.login:hover
 img.login
 {
   position: absolute;
-  right: 9px;
-  top: 1px;
+  <?php print $right; ?>: 22px;
+  top: 3px;
 
-  padding:2px;
   text-decoration:none;
   color:white;
   font-weight:bold;
 }
+img.printer
+{
+  position: absolute;
+  <?php print $right; ?>: 4px;
+  top: 3px;
+
+  text-decoration: none;
+  color: white;
+  font-weight: bold;
+}
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/bluelagoon/img/logout.png b/htdocs/theme/bluelagoon/img/logout.png
index 3e57c584ed6a2752aa18fe5e73a89fe9cb60b688..3221ecdf92655861edcef7acce7936410ed19038 100644
GIT binary patch
literal 999
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBj3jVG%<aCoh&|Kq1Zo
zkH}&M2Cfev%;>bnWCl=>CEd~2k%3`jKlh(RRt5%Uh5(-sSD-ip3lMRD01prea0q~b
zh=7EQqJ)B?A`q!)YHDa|>Hv|Up@E^HiKV55rKOFNlcSTDr<a#+kXK+(P-s+8WK>ja
za&lsFa%y&RW_C6Z<rWtgRu`96S68-F*S7R@_4M>jS-WoQ)=gWtZri(e*Rj3(jvYIE
z?%e5X=gwcdcmMhG=kMRY|Ni~+e~_z2!DtB3J_PPx+w})%3u8%;UoeBivm0qZPOPVk
zV@SoV<b(xU4+O=Yxj*ARu`*MGn_2Qtl8}Rfrsm@8j1}to2Ne{SE?u~8>B^N0GZQir
zR%jhOps-F!RZ&}6cj<!kj1}uSL=ptrW+*OMvUagnQ_`vxGZaei^0G5b^y6@ttJ1s?
O<Tp=OKbLh*2~7abcz*!^

delta 508
zcmV<Y0R#T$2a5!d8Gi-<001BJ|6u?C00(qQO+^RQ1P&7_J6m|p>Hq)$32;bRa{vGf
z5&!@T5&_cPe*6Fc00d`2O+f$vv5yP<VFdsH0h&ofK~#9!)lxl613?g-(+!T~lsia~
zLlh4pdVUl}5Ry{SA}Ra@7II)?V`HsoIt2@{w-BuS2_}VLM1Lef6a<?~k$BMvw@NUp
zp3&JP_S%RJ%<k-C=gr%h1^D;Y{)4-1z(Au_g*v>_xh_HFTd52Uv)^0}hm9FJ1vvL|
zPT_h>RK;bJfI$}`MgTC-B2@@$!)DB6ay%9vnVLx)(!J-CY&MzBq?P>n$vh*V$BbAh
z(==x(ereT|iGLqN(vYsJy090Q)~$$jApy%8J|z{~<+5utYslKM#-cHM!QK?2hTw}1
zRCN!0kZL}JUkf1XERl*UsYduhF+$-A6}-_@9Az%&8Kde=keun<<#m)uf_g~5ZxHyR
zz2-v)CES<;<{IsH$Pjpyce}3JD}*>><$|-D^WojA@O2gb;2scot7%$H`0xloE2(f)
zZ5*+4Bbi9-%O0eU({uUrY?o7X_r9hOkiDSf62))iLGt&O*HOhmdjG0n7?U&+g{nI=
yg%p3_N8cM`)2IgaQDYeuD$*05e(}HlY5N4e5ucESp<<f=0000<MNUMnLSTX*jpB^}

diff --git a/htdocs/theme/bluelagoon/img/printer.png b/htdocs/theme/bluelagoon/img/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..becd7dc553aba87ad1176727b78d3e7763791894
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3-otS@yI7DfSXiUsv{<9Ks?hBGoEc4L~8z
z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{<g{W`+Qt5Z7tb7OY;qdhOb^>({T}
zv17;1ojVU4IB@vz;bX^+oj7q~>(;HeZ{L3Q?AgngFF$|&{Qdj)|Ns93jT!}`Auv2b
zpz>4cY@kmBOM?7@foU5BFsQDbnFN&d^mK6yskl{o&Xeze0*`axdl|tc1^+K^o6zF8
zrT*uW){E;txT|_=Ro~)FZ_e8LBAL}=OUE<ctfXa6UeDRD;?`ZWMAPy1G0zvQw($X6
UMUg9V_JP9A)78&qol`;+05au!i2wiq

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index e1e7917e1f7..1833f274050 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -356,7 +356,7 @@ li.tmenu {
 a.login
 {
   position: absolute;
-  <?php print $right; ?>: 24px;
+  <?php print $right; ?>: 30px;
   top: 3px;
 
   color: #234046;
@@ -373,7 +373,17 @@ a.login:hover
 img.login
 {
   position: absolute;
-  <?php print $right; ?>: 8px;
+  <?php print $right; ?>: 20px;
+  top: 3px;
+
+  text-decoration: none;
+  color: white;
+  font-weight: bold;
+}
+img.printer
+{
+  position: absolute;
+  <?php print $right; ?>: 4px;
   top: 3px;
 
   text-decoration: none;
diff --git a/htdocs/theme/eldy/img/printer.png b/htdocs/theme/eldy/img/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..becd7dc553aba87ad1176727b78d3e7763791894
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3-otS@yI7DfSXiUsv{<9Ks?hBGoEc4L~8z
z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{<g{W`+Qt5Z7tb7OY;qdhOb^>({T}
zv17;1ojVU4IB@vz;bX^+oj7q~>(;HeZ{L3Q?AgngFF$|&{Qdj)|Ns93jT!}`Auv2b
zpz>4cY@kmBOM?7@foU5BFsQDbnFN&d^mK6yskl{o&Xeze0*`axdl|tc1^+K^o6zF8
zrT*uW){E;txT|_=Ro~)FZ_e8LBAL}=OUE<ctfXa6UeDRD;?`ZWMAPy1G0zvQw($X6
UMUg9V_JP9A)78&qol`;+05au!i2wiq

literal 0
HcmV?d00001

diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php
index d6d51d5e82b..53eba27d382 100644
--- a/htdocs/theme/freelug/freelug.css.php
+++ b/htdocs/theme/freelug/freelug.css.php
@@ -326,7 +326,7 @@ li.tmenu a:link
 a.login
 {
   position: absolute;
-  right: 24px;
+  <?php print $right; ?>: 30px;
   top: 3px;
 
   color: #234046;
@@ -344,14 +344,23 @@ a.login:hover
 img.login
 {
   position: absolute;
-  right: 9px;
+  <?php print $right; ?>: 20px;
   top: 3px;
 
-  padding:2px;
   text-decoration:none;
   color:white;
   font-weight:bold;
 }
+img.printer
+{
+  position: absolute;
+  <?php print $right; ?>: 4px;
+  top: 4px;
+
+  text-decoration: none;
+  color: white;
+  font-weight: bold;
+}
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/freelug/img/printer.png b/htdocs/theme/freelug/img/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..becd7dc553aba87ad1176727b78d3e7763791894
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3-otS@yI7DfSXiUsv{<9Ks?hBGoEc4L~8z
z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{<g{W`+Qt5Z7tb7OY;qdhOb^>({T}
zv17;1ojVU4IB@vz;bX^+oj7q~>(;HeZ{L3Q?AgngFF$|&{Qdj)|Ns93jT!}`Auv2b
zpz>4cY@kmBOM?7@foU5BFsQDbnFN&d^mK6yskl{o&Xeze0*`axdl|tc1^+K^o6zF8
zrT*uW){E;txT|_=Ro~)FZ_e8LBAL}=OUE<ctfXa6UeDRD;?`ZWMAPy1G0zvQw($X6
UMUg9V_JP9A)78&qol`;+05au!i2wiq

literal 0
HcmV?d00001

diff --git a/htdocs/theme/rodolphe/img/printer.png b/htdocs/theme/rodolphe/img/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..becd7dc553aba87ad1176727b78d3e7763791894
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3-otS@yI7DfSXiUsv{<9Ks?hBGoEc4L~8z
z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{<g{W`+Qt5Z7tb7OY;qdhOb^>({T}
zv17;1ojVU4IB@vz;bX^+oj7q~>(;HeZ{L3Q?AgngFF$|&{Qdj)|Ns93jT!}`Auv2b
zpz>4cY@kmBOM?7@foU5BFsQDbnFN&d^mK6yskl{o&Xeze0*`axdl|tc1^+K^o6zF8
zrT*uW){E;txT|_=Ro~)FZ_e8LBAL}=OUE<ctfXa6UeDRD;?`ZWMAPy1G0zvQw($X6
UMUg9V_JP9A)78&qol`;+05au!i2wiq

literal 0
HcmV?d00001

diff --git a/htdocs/theme/rodolphe/rodolphe.css.php b/htdocs/theme/rodolphe/rodolphe.css.php
index 1ea24597b10..a7d39d8de22 100644
--- a/htdocs/theme/rodolphe/rodolphe.css.php
+++ b/htdocs/theme/rodolphe/rodolphe.css.php
@@ -252,11 +252,11 @@ li.tmenu a:link
 a.login
 {
   position: absolute;
-  right: 24px;
-  top: 3px;
+  <?php print $right; ?>: 32px;
+  top: 4px;
 
   color: #234046;
-  padding: 0em 1em;
+  padding: 0px 4px;
   margin: 0px 0px 1px 0px;
   border: 1px solid #ded8d2;
   font-weight:bold;
@@ -270,13 +270,23 @@ a.login:hover
 img.login
 {
   position: absolute;
-  right: 8px;
+  <?php print $right; ?>: 20px;
   top: 5px;
 
   text-decoration:none;
   color:white;
   font-weight:bold;
 }
+img.printer
+{
+  position: absolute;
+  <?php print $right; ?>: 4px;
+  top: 4px;
+
+  text-decoration: none;
+  color: white;
+  font-weight: bold;
+}
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/yellow/img/printer.png b/htdocs/theme/yellow/img/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..becd7dc553aba87ad1176727b78d3e7763791894
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3-otS@yI7DfSXiUsv{<9Ks?hBGoEc4L~8z
z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{<g{W`+Qt5Z7tb7OY;qdhOb^>({T}
zv17;1ojVU4IB@vz;bX^+oj7q~>(;HeZ{L3Q?AgngFF$|&{Qdj)|Ns93jT!}`Auv2b
zpz>4cY@kmBOM?7@foU5BFsQDbnFN&d^mK6yskl{o&Xeze0*`axdl|tc1^+K^o6zF8
zrT*uW){E;txT|_=Ro~)FZ_e8LBAL}=OUE<ctfXa6UeDRD;?`ZWMAPy1G0zvQw($X6
UMUg9V_JP9A)78&qol`;+05au!i2wiq

literal 0
HcmV?d00001

diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php
index 29f9848baba..88cef2ab743 100644
--- a/htdocs/theme/yellow/yellow.css.php
+++ b/htdocs/theme/yellow/yellow.css.php
@@ -298,7 +298,7 @@ li.tmenu a:link
 a.login
 {
   position: absolute;
-  right: 24px;
+  <?php print $right; ?>: 30px;
   top: 2px;
 
   color: #234046;
@@ -316,13 +316,23 @@ a.login:hover
 img.login
 {
   position: absolute;
-  right: 8px;
+  <?php print $right; ?>: 20px;
   top: 2px;
 
   text-decoration:none;
   color:white;
   font-weight:bold;
 }
+img.printer
+{
+  position: absolute;
+  <?php print $right; ?>: 4px;
+  top: 4px;
+
+  text-decoration: none;
+  color: white;
+  font-weight: bold;
+}
 
 
 /* ============================================================================== */