Add a print icon to show a page to print without menus.

This commit is contained in:
Laurent Destailleur 2009-08-19 20:57:15 +00:00
parent 550d1d79fa
commit 2b26eb5b4a
17 changed files with 97 additions and 33 deletions

View File

@ -4,7 +4,8 @@ English Dolibarr changelog
***** Changelog for 2.7 compared to 2.6 ***** ***** Changelog for 2.7 compared to 2.6 *****
For users: 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: Price level can be defined also for prospects.
- New: Add a help and support center. - New: Add a help and support center.
- New: Can export commercial proposals. - New: Can export commercial proposals.

View File

@ -525,6 +525,7 @@ FreeZone=Free text
CloneMainAttributes=Clone object with its main attributes CloneMainAttributes=Clone object with its main attributes
PDFMerge=PDF Merge PDFMerge=PDF Merge
Merge=Merge Merge=Merge
PrintContentArea=Show page to print main content area
# Week day # Week day
Day1=Monday Day1=Monday
Day2=Tuesday Day2=Tuesday

View File

@ -524,6 +524,7 @@ FreeZone=Zone libre
CloneMainAttributes=Cloner l'objet avec ces attributs principaux CloneMainAttributes=Cloner l'objet avec ces attributs principaux
PDFMerge=Fusion PDF PDFMerge=Fusion PDF
Merge=Fusion Merge=Fusion
PrintContentArea=Afficher page d'impression de la zone centrale
# Week day # Week day
Day1=Lundi Day1=Lundi
Day2=Mardi Day2=Mardi

View File

@ -864,14 +864,14 @@ function top_menu($head, $title='', $target='')
$text.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):''; $text.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
$text.='>'; $text.='>';
$text.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"'; $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.='>';
$text.='</a>'; $text.='</a>';
} }
else else
{ {
$text.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"'; $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.='>';
} }
$htmltext.='<u>'.$langs->trans("User").'</u>'; $htmltext.='<u>'.$langs->trans("User").'</u>';
@ -895,12 +895,15 @@ function top_menu($head, $title='', $target='')
$html=new Form($db); $html=new Form($db);
print $html->textwithtooltip('',$htmltext,2,1,$text); print $html->textwithtooltip('',$htmltext,2,1,$text);
// Link to print // Link to print main content area
$text ='<a class="print" href="'.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].'&optioncss=print" target="_new">'; if (empty($conf->global->MAIN_PRINT_DISABLELINK))
$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 href="'.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].'&optioncss=print" target="_new">';
$text.='</a>'; $text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"';
//print $text; $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"; print "\n</div>\n<!-- End top horizontal menu -->\n";
} }

View File

@ -305,11 +305,11 @@ li.tmenu {
a.login a.login
{ {
position: absolute; position: absolute;
right: 24px; <?php print $right; ?>: 30px;
top: 3px; top: 3px;
color: #234046; color: #234046;
padding: 0em 1em; padding: 0px 8px;
margin: 0px 0px 1.5px 0px; margin: 0px 0px 1px 0px;
font-weight:bold; font-weight:bold;
font-size:12px; font-size:12px;
} }
@ -321,13 +321,23 @@ a.login:hover
img.login img.login
{ {
position: absolute; position: absolute;
right: 8px; <?php print $right; ?>: 20px;
top: 3px; top: 3px;
text-decoration:none; text-decoration:none;
color:white; color:white;
font-weight:bold; font-weight:bold;
} }
img.printer
{
position: absolute;
<?php print $right; ?>: 4px;
top: 3px;
text-decoration: none;
color: white;
font-weight: bold;
}
/* ============================================================================== */ /* ============================================================================== */

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

View File

@ -225,12 +225,12 @@ li.tmenu a:link
a.login a.login
{ {
position: absolute; position: absolute;
right: 24px; <?php print $right; ?>: 30px;
top: 4px; top: 3px;
padding: 0em 1em; padding: 0px 8px;
margin: 0em 0em 1em 0em; margin: 0px 0px 1px 0px;
font-weight:bold; font-weight: bold;
font-size:12px; font-size: 12px;
} }
a.login:hover a.login:hover
{ {
@ -241,14 +241,23 @@ a.login:hover
img.login img.login
{ {
position: absolute; position: absolute;
right: 9px; <?php print $right; ?>: 22px;
top: 1px; top: 3px;
padding:2px;
text-decoration:none; text-decoration:none;
color:white; color:white;
font-weight:bold; font-weight:bold;
} }
img.printer
{
position: absolute;
<?php print $right; ?>: 4px;
top: 3px;
text-decoration: none;
color: white;
font-weight: bold;
}
/* ============================================================================== */ /* ============================================================================== */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 523 B

After

Width:  |  Height:  |  Size: 999 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

View File

@ -356,7 +356,7 @@ li.tmenu {
a.login a.login
{ {
position: absolute; position: absolute;
<?php print $right; ?>: 24px; <?php print $right; ?>: 30px;
top: 3px; top: 3px;
color: #234046; color: #234046;
@ -373,7 +373,17 @@ a.login:hover
img.login img.login
{ {
position: absolute; 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; top: 3px;
text-decoration: none; text-decoration: none;

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

View File

@ -326,7 +326,7 @@ li.tmenu a:link
a.login a.login
{ {
position: absolute; position: absolute;
right: 24px; <?php print $right; ?>: 30px;
top: 3px; top: 3px;
color: #234046; color: #234046;
@ -344,14 +344,23 @@ a.login:hover
img.login img.login
{ {
position: absolute; position: absolute;
right: 9px; <?php print $right; ?>: 20px;
top: 3px; top: 3px;
padding:2px;
text-decoration:none; text-decoration:none;
color:white; color:white;
font-weight:bold; font-weight:bold;
} }
img.printer
{
position: absolute;
<?php print $right; ?>: 4px;
top: 4px;
text-decoration: none;
color: white;
font-weight: bold;
}
/* ============================================================================== */ /* ============================================================================== */

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

View File

@ -252,11 +252,11 @@ li.tmenu a:link
a.login a.login
{ {
position: absolute; position: absolute;
right: 24px; <?php print $right; ?>: 32px;
top: 3px; top: 4px;
color: #234046; color: #234046;
padding: 0em 1em; padding: 0px 4px;
margin: 0px 0px 1px 0px; margin: 0px 0px 1px 0px;
border: 1px solid #ded8d2; border: 1px solid #ded8d2;
font-weight:bold; font-weight:bold;
@ -270,13 +270,23 @@ a.login:hover
img.login img.login
{ {
position: absolute; position: absolute;
right: 8px; <?php print $right; ?>: 20px;
top: 5px; top: 5px;
text-decoration:none; text-decoration:none;
color:white; color:white;
font-weight:bold; font-weight:bold;
} }
img.printer
{
position: absolute;
<?php print $right; ?>: 4px;
top: 4px;
text-decoration: none;
color: white;
font-weight: bold;
}
/* ============================================================================== */ /* ============================================================================== */

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

View File

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