Add a print icon to show a page to print without menus.
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
|
|
|
|||
BIN
htdocs/theme/auguria/img/printer.png
Normal file
|
After Width: | Height: | Size: 995 B |
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 523 B After Width: | Height: | Size: 999 B |
BIN
htdocs/theme/bluelagoon/img/printer.png
Normal file
|
After Width: | Height: | Size: 995 B |
|
|
@ -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;
|
||||
|
|
|
|||
BIN
htdocs/theme/eldy/img/printer.png
Normal file
|
After Width: | Height: | Size: 995 B |
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
|
|
|
|||
BIN
htdocs/theme/freelug/img/printer.png
Normal file
|
After Width: | Height: | Size: 995 B |
BIN
htdocs/theme/rodolphe/img/printer.png
Normal file
|
After Width: | Height: | Size: 995 B |
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
|
|
|
|||
BIN
htdocs/theme/yellow/img/printer.png
Normal file
|
After Width: | Height: | Size: 995 B |
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
|
|
|
|||