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.='
';
$text.='';
}
else
{
$text.='
';
}
$htmltext.=''.$langs->trans("User").'';
@@ -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 ='';
- $text.='
';
- $text.='';
- //print $text;
+ // Link to print main content area
+ if (empty($conf->global->MAIN_PRINT_DISABLELINK))
+ {
+ $text ='';
+ $text.='
';
+ $text.='';
+ print $text;
+ }
print "\n\n\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;
+ : 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;
+ : 20px;
top: 3px;
text-decoration:none;
color:white;
font-weight:bold;
}
+img.printer
+{
+ position: absolute;
+ : 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 00000000000..becd7dc553a
Binary files /dev/null and b/htdocs/theme/auguria/img/printer.png differ
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;
+ : 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;
+ : 22px;
+ top: 3px;
- padding:2px;
text-decoration:none;
color:white;
font-weight:bold;
}
+img.printer
+{
+ position: absolute;
+ : 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 3e57c584ed6..3221ecdf926 100644
Binary files a/htdocs/theme/bluelagoon/img/logout.png and b/htdocs/theme/bluelagoon/img/logout.png differ
diff --git a/htdocs/theme/bluelagoon/img/printer.png b/htdocs/theme/bluelagoon/img/printer.png
new file mode 100644
index 00000000000..becd7dc553a
Binary files /dev/null and b/htdocs/theme/bluelagoon/img/printer.png differ
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;
- : 24px;
+ : 30px;
top: 3px;
color: #234046;
@@ -373,7 +373,17 @@ a.login:hover
img.login
{
position: absolute;
- : 8px;
+ : 20px;
+ top: 3px;
+
+ text-decoration: none;
+ color: white;
+ font-weight: bold;
+}
+img.printer
+{
+ position: absolute;
+ : 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 00000000000..becd7dc553a
Binary files /dev/null and b/htdocs/theme/eldy/img/printer.png differ
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;
+ : 30px;
top: 3px;
color: #234046;
@@ -344,14 +344,23 @@ a.login:hover
img.login
{
position: absolute;
- right: 9px;
+ : 20px;
top: 3px;
- padding:2px;
text-decoration:none;
color:white;
font-weight:bold;
}
+img.printer
+{
+ position: absolute;
+ : 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 00000000000..becd7dc553a
Binary files /dev/null and b/htdocs/theme/freelug/img/printer.png differ
diff --git a/htdocs/theme/rodolphe/img/printer.png b/htdocs/theme/rodolphe/img/printer.png
new file mode 100644
index 00000000000..becd7dc553a
Binary files /dev/null and b/htdocs/theme/rodolphe/img/printer.png differ
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;
+ : 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;
+ : 20px;
top: 5px;
text-decoration:none;
color:white;
font-weight:bold;
}
+img.printer
+{
+ position: absolute;
+ : 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 00000000000..becd7dc553a
Binary files /dev/null and b/htdocs/theme/yellow/img/printer.png differ
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;
+ : 30px;
top: 2px;
color: #234046;
@@ -316,13 +316,23 @@ a.login:hover
img.login
{
position: absolute;
- right: 8px;
+ : 20px;
top: 2px;
text-decoration:none;
color:white;
font-weight:bold;
}
+img.printer
+{
+ position: absolute;
+ : 4px;
+ top: 4px;
+
+ text-decoration: none;
+ color: white;
+ font-weight: bold;
+}
/* ============================================================================== */