lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: New: Differentiate text and img for better accessibility.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-07-29 21:34:23 +02:00
parent b57371bfa1
commit 0f9aa69e4e
10 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@ -222,7 +222,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfBillsByMonthHT"); $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfBillsByMonthHT");
$stringtoshow.='<br>'; $stringtoshow.='<br>';
$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">'; $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">'; $stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
$stringtoshow.='</form>'; $stringtoshow.='</form>';
$stringtoshow.='</div>'; $stringtoshow.='</div>';
if ($shownb && $showtot) if ($shownb && $showtot)

2
htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
View File

@ -221,7 +221,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfBillsByMonthHT"); $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfBillsByMonthHT");
$stringtoshow.='<br>'; $stringtoshow.='<br>';
$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">'; $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">'; $stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
$stringtoshow.='</form>'; $stringtoshow.='</form>';
$stringtoshow.='</div>'; $stringtoshow.='</div>';
if ($shownb && $showtot) if ($shownb && $showtot)

2
htdocs/core/boxes/box_graph_orders_permonth.php
View File

@ -222,7 +222,7 @@ class box_graph_orders_permonth extends ModeleBoxes
$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfOrdersByMonthHT"); $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfOrdersByMonthHT");
$stringtoshow.='<br>'; $stringtoshow.='<br>';
$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">'; $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">'; $stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
$stringtoshow.='</form>'; $stringtoshow.='</form>';
$stringtoshow.='</div>'; $stringtoshow.='</div>';
if ($shownb && $showtot) if ($shownb && $showtot)

2
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
View File

@ -221,7 +221,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfOrdersByMonthHT"); $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfOrdersByMonthHT");
$stringtoshow.='<br>'; $stringtoshow.='<br>';
$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">'; $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">'; $stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
$stringtoshow.='</form>'; $stringtoshow.='</form>';
$stringtoshow.='</div>'; $stringtoshow.='</div>';
if ($shownb && $showtot) if ($shownb && $showtot)

2
htdocs/core/boxes/box_graph_product_distribution.php
View File

@ -337,7 +337,7 @@ class box_graph_product_distribution extends ModeleBoxes
} }
$stringtoshow.='<br>'; $stringtoshow.='<br>';
$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">'; $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">'; $stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
$stringtoshow.='</form>'; $stringtoshow.='</form>';
$stringtoshow.='</div>'; $stringtoshow.='</div>';

2
htdocs/core/boxes/box_graph_propales_permonth.php
View File

@ -227,7 +227,7 @@ class box_graph_propales_permonth extends ModeleBoxes
$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfProposalsByMonthHT"); $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfProposalsByMonthHT");
$stringtoshow.='<br>'; $stringtoshow.='<br>';
$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">'; $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">'; $stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
$stringtoshow.='</form>'; $stringtoshow.='</form>';
$stringtoshow.='</div>'; $stringtoshow.='</div>';
if ($shownb && $showtot) if ($shownb && $showtot)

2
htdocs/core/boxes/modules_boxes.php
View File

@ -225,7 +225,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
if (! empty($contents[$i][$j]['logo'])) if (! empty($contents[$i][$j]['logo']))
{ {
$logo=preg_replace("/^object_/i","",$contents[$i][$j]['logo']); $logo=preg_replace("/^object_/i","",$contents[$i][$j]['logo']);
print img_object(':'.$langs->trans("Show"),$logo); print img_object($langs->trans("Show"),$logo);
} }
$maxlength=$MAXLENGTHBOX; $maxlength=$MAXLENGTHBOX;

200
htdocs/core/lib/functions.lib.php
View File

@ -1785,7 +1785,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
/** /**
* Show picto whatever it's its name (generic function) * Show picto whatever it's its name (generic function)
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on title and alt. If text is "TextA:TextB", use Text A on alt and Text B on title. Alt only if param notitle is set to 1.
* @param string $picto Name of image file to show ('filenew', ...) * @param string $picto Name of image file to show ('filenew', ...)
* If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory. * If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.
* Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img * Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img
@ -1798,7 +1798,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
* @return string Return img tag * @return string Return img tag
* @see #img_object, #img_picto_common * @see #img_object, #img_picto_common
*/ */
function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srconly=0, $notitle=0) function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
{ {
global $conf; global $conf;
@ -1844,9 +1844,9 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
if ($srconly) return $fullpathpicto; if ($srconly) return $fullpathpicto;
else else
{ {
$tmparray=explode(':',$alt); $tmparray=explode(':',$titlealt);
$alt=$tmparray[0]; $title=$tmparray[0];
$title=empty($tmparray[1])?$alt:$tmparray[1]; $alt=empty($tmparray[1])?'':$tmparray[1];
return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($options?' '.$options:'').'>'; // Alt is used for accessibility, title for popup return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($options?' '.$options:'').'>'; // Alt is used for accessibility, title for popup
} }
} }
@ -1854,7 +1854,7 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
/** /**
* Show a picto called object_picto (generic function) * Show a picto called object_picto (generic function)
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $picto Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...) * @param string $picto Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
* For external modules use imagename@mymodule to search into directory "img" of module. * For external modules use imagename@mymodule to search into directory "img" of module.
* @param string $options Add more attribute on img tag (ie: class="datecallink") * @param string $options Add more attribute on img tag (ie: class="datecallink")
@ -1862,22 +1862,22 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
* @return string Return img tag * @return string Return img tag
* @see #img_picto, #img_picto_common * @see #img_picto, #img_picto_common
*/ */
function img_object($alt, $picto, $options = '', $pictoisfullpath = false) function img_object($titlealt, $picto, $options = '', $pictoisfullpath = false)
{ {
return img_picto($alt, 'object_'.$picto, $options, $pictoisfullpath); return img_picto($titlealt, 'object_'.$picto, $options, $pictoisfullpath);
} }
/** /**
* Show picto (generic function) * Show picto (generic function)
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory. * @param string $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
* @param string $options Add more attribute on img tag * @param string $options Add more attribute on img tag
* @param int $pictoisfullpath If 1, image path is a full path * @param int $pictoisfullpath If 1, image path is a full path
* @return string Return img tag * @return string Return img tag
* @see #img_object, #img_picto * @see #img_object, #img_picto
*/ */
function img_picto_common($alt, $picto, $options = '', $pictoisfullpath = 0) function img_picto_common($titlealt, $picto, $options = '', $pictoisfullpath = 0)
{ {
global $conf; global $conf;
@ -1896,141 +1896,141 @@ function img_picto_common($alt, $picto, $options = '', $pictoisfullpath = 0)
} }
} }
return img_picto($alt, $path, $options, 1); return img_picto($titlealt, $path, $options, 1);
} }
/** /**
* Show logo action * Show logo action
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $numaction Action to show * @param int $numaction Action to show
* @return string Return an img tag * @return string Return an img tag
*/ */
function img_action($alt, $numaction) function img_action($titlealt, $numaction)
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') if ($titlealt == 'default')
{ {
if ($numaction == -1) $alt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); if ($numaction == -1) $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact');
if ($numaction == 0) $alt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); if ($numaction == 0) $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted');
if ($numaction == 1) $alt = $langs->transnoentitiesnoconv('ChangeToContact'); if ($numaction == 1) $titlealt = $langs->transnoentitiesnoconv('ChangeToContact');
if ($numaction == 2) $alt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); if ($numaction == 2) $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess');
if ($numaction == 3) $alt = $langs->transnoentitiesnoconv('ChangeContactDone'); if ($numaction == 3) $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');
} }
return img_picto($alt, 'stcomm'.$numaction.'.png'); return img_picto($titlealt, 'stcomm'.$numaction.'.png');
} }
/** /**
* Show pdf logo * Show pdf logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $size Taille de l'icone : 3 = 16x16px , 2 = 14x14px * @param int $size Taille de l'icone : 3 = 16x16px , 2 = 14x14px
* @return string Retourne tag img * @return string Retourne tag img
*/ */
function img_pdf($alt = 'default', $size = 3) function img_pdf($titlealt = 'default', $size = 3)
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Show'); if ($titlealt == 'default') $titlealt = $langs->trans('Show');
return img_picto($alt, 'pdf'.$size.'.png'); return img_picto($titlealt, 'pdf'.$size.'.png');
} }
/** /**
* Show logo + * Show logo +
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Return tag img * @return string Return tag img
*/ */
function img_edit_add($alt = 'default') function img_edit_add($titlealt = 'default')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Add'); if ($titlealt == 'default') $titlealt = $langs->trans('Add');
return img_picto($alt, 'edit_add.png'); return img_picto($titlealt, 'edit_add.png');
} }
/** /**
* Show logo - * Show logo -
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Retourne tag img * @return string Return tag img
*/ */
function img_edit_remove($alt = 'default') function img_edit_remove($titlealt = 'default')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Remove'); if ($titlealt == 'default') $titlealt = $langs->trans('Remove');
return img_picto($alt, 'edit_remove.png'); return img_picto($titlealt, 'edit_remove.png');
} }
/** /**
* Show logo editer/modifier fiche * Show logo editer/modifier fiche
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param float $float Si il faut y mettre le style "float: right" * @param float $float Si il faut y mettre le style "float: right"
* @param string $other Add more attributes on img * @param string $other Add more attributes on img
* @return string Retourne tag img * @return string Return tag img
*/ */
function img_edit($alt = 'default', $float = 0, $other = '') function img_edit($titlealt = 'default', $float = 0, $other = '')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Modify'); if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
return img_picto($alt, 'edit.png', ($float ? 'style="float: right"' : $other)); return img_picto($titlealt, 'edit.png', ($float ? 'style="float: right"' : $other));
} }
/** /**
* Show logo view card * Show logo view card
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param float $float Si il faut y mettre le style "float: right" * @param float $float Si il faut y mettre le style "float: right"
* @param string $other Add more attributes on img * @param string $other Add more attributes on img
* @return string Retourne tag img * @return string Return tag img
*/ */
function img_view($alt = 'default', $float = 0, $other = '') function img_view($titlealt = 'default', $float = 0, $other = '')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('View'); if ($titlealt == 'default') $titlealt = $langs->trans('View');
$options = ($float ? 'style="float: right" ' : '').$other; $options = ($float ? 'style="float: right" ' : '').$other;
return img_picto($alt, 'view.png', $options); return img_picto($titlealt, 'view.png', $options);
} }
/** /**
* Show delete logo * Show delete logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $other Add more attributes on img * @param string $other Add more attributes on img
* @return string Retourne tag img * @return string Retourne tag img
*/ */
function img_delete($alt = 'default', $other = '') function img_delete($titlealt = 'default', $other = '')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Delete'); if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
return img_picto($alt, 'delete.png', $other); return img_picto($titlealt, 'delete.png', $other);
} }
/** /**
* Show printer logo * Show printer logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $other Add more attributes on img * @param string $other Add more attributes on img
* @return string Retourne tag img * @return string Retourne tag img
*/ */
function img_printer($alt = "default", $other='') function img_printer($titlealt = "default", $other='')
{ {
global $conf,$langs; global $conf,$langs;
if ($alt=="default") $alt=$langs->trans("Print"); if ($titlealt=="default") $titlealt=$langs->trans("Print");
return img_picto($alt,'printer.png',$other); return img_picto($titlealt,'printer.png',$other);
} }
/** /**
@ -2056,159 +2056,159 @@ function img_help($usehelpcursor = 1, $usealttitle = 1)
/** /**
* Show info logo * Show info logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Return img tag * @return string Return img tag
*/ */
function img_info($alt = 'default') function img_info($titlealt = 'default')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Informations'); if ($titlealt == 'default') $titlealt = $langs->trans('Informations');
return img_picto($alt, 'info.png'); return img_picto($titlealt, 'info.png');
} }
/** /**
* Show warning logo * Show warning logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $float If we must add style "float: right" * @param int $float If we must add style "float: right"
* @return string Return img tag * @return string Return img tag
*/ */
function img_warning($alt = 'default', $float = 0) function img_warning($titlealt = 'default', $float = 0)
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Warning'); if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
return img_picto($alt, 'warning.png', ($float ? 'style="float: right"' : '')); return img_picto($titlealt, 'warning.png', ($float ? 'style="float: right"' : ''));
} }
/** /**
* Show error logo * Show error logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Return img tag * @return string Return img tag
*/ */
function img_error($alt = 'default') function img_error($titlealt = 'default')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Error'); if ($titlealt == 'default') $titlealt = $langs->trans('Error');
return img_picto($alt, 'error.png'); return img_picto($titlealt, 'error.png');
} }
/** /**
* Show next logo * Show next logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Return img tag * @return string Return img tag
*/ */
function img_next($alt = 'default') function img_next($titlealt = 'default')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Next'); if ($titlealt == 'default') $titlealt = $langs->trans('Next');
return img_picto($alt, 'next.png'); return img_picto($titlealt, 'next.png');
} }
/** /**
* Show previous logo * Show previous logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Return img tag * @return string Return img tag
*/ */
function img_previous($alt = 'default') function img_previous($titlealt = 'default')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Previous'); if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
return img_picto($alt, 'previous.png'); return img_picto($titlealt, 'previous.png');
} }
/** /**
* Show down arrow logo * Show down arrow logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $selected Selected * @param int $selected Selected
* @return string Return img tag * @return string Return img tag
*/ */
function img_down($alt = 'default', $selected = 0) function img_down($titlealt = 'default', $selected = 0)
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Down'); if ($titlealt == 'default') $titlealt = $langs->trans('Down');
return img_picto($alt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown"'); return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown"');
} }
/** /**
* Show top arrow logo * Show top arrow logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $selected Selected * @param int $selected Selected
* @return string Return img tag * @return string Return img tag
*/ */
function img_up($alt = 'default', $selected = 0) function img_up($titlealt = 'default', $selected = 0)
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Up'); if ($titlealt == 'default') $titlealt = $langs->trans('Up');
return img_picto($alt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup"'); return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup"');
} }
/** /**
* Show left arrow logo * Show left arrow logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $selected Selected * @param int $selected Selected
* @param string $options Add more attribute on img tag (For example 'style="float: right"') * @param string $options Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag * @return string Return img tag
*/ */
function img_left($alt = 'default', $selected = 0, $options='') function img_left($titlealt = 'default', $selected = 0, $options='')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Left'); if ($titlealt == 'default') $titlealt = $langs->trans('Left');
return img_picto($alt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $options); return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $options);
} }
/** /**
* Show right arrow logo * Show right arrow logo
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $selected Selected * @param int $selected Selected
* @param string $options Add more attribute on img tag (For example 'style="float: right"') * @param string $options Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag * @return string Return img tag
*/ */
function img_right($alt = 'default', $selected = 0, $options='') function img_right($titlealt = 'default', $selected = 0, $options='')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Right'); if ($titlealt == 'default') $titlealt = $langs->trans('Right');
return img_picto($alt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $options); return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $options);
} }
/** /**
* Show tick logo if allowed * Show tick logo if allowed
* *
* @param string $allow Allow * @param string $allow Allow
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Return img tag * @return string Return img tag
*/ */
function img_allow($allow, $alt = 'default') function img_allow($allow, $titlealt = 'default')
{ {
global $conf, $langs; global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Active'); if ($titlealt == 'default') $titlealt = $langs->trans('Active');
if ($allow == 1) return img_picto($alt, 'tick.png'); if ($allow == 1) return img_picto($titlealt, 'tick.png');
return '-'; return '-';
} }
@ -2218,19 +2218,19 @@ function img_allow($allow, $alt = 'default')
* Show MIME img of a file * Show MIME img of a file
* *
* @param string $file Filename * @param string $file Filename
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @return string Return img tag * @return string Return img tag
*/ */
function img_mime($file, $alt = '') function img_mime($file, $titlealt = '')
{ {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$mimetype = dol_mimetype($file, '', 1); $mimetype = dol_mimetype($file, '', 1);
$mimeimg = dol_mimetype($file, '', 2); $mimeimg = dol_mimetype($file, '', 2);
if (empty($alt)) $alt = 'Mime type: '.$mimetype; if (empty($titlealt)) $titlealt = 'Mime type: '.$mimetype;
return img_picto_common($alt, 'mime/'.$mimeimg); return img_picto_common($titlealt, 'mime/'.$mimeimg);
} }
@ -2238,21 +2238,21 @@ function img_mime($file, $alt = '')
* Show phone logo. * Show phone logo.
* Use img_picto instead. * Use img_picto instead.
* *
* @param string $alt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param int $option Option * @param int $option Option
* @return string Return img tag * @return string Return img tag
* @deprecated * @deprecated
*/ */
function img_phone($alt = 'default', $option = 0) function img_phone($titlealt = 'default', $option = 0)
{ {
global $conf,$langs; global $conf,$langs;
if ($alt == 'default') $alt = $langs->trans('Call'); if ($titlealt == 'default') $titlealt = $langs->trans('Call');
if ($option == 1) $img = 'call'; if ($option == 1) $img = 'call';
else $img = 'call_out'; else $img = 'call_out';
return img_picto($alt, $img); return img_picto($titlealt, $img);
} }

6
htdocs/holiday/admin/holiday.php
View File

@ -357,15 +357,15 @@ if($cp_events == 1) {
print '</tr>'."\n"; print '</tr>'."\n";
foreach($cp->events as $infos_event) { foreach($cp->events as $infos_event)
{
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'."\n"; print '<tr '.$bc[$var].'>'."\n";
print '<td><input class="flat" type="text" size="40" name="optName['.$infos_event['rowid'].']" value="'.$infos_event['name'].'" /></td>'."\n"; print '<td><input class="flat" type="text" size="40" name="optName['.$infos_event['rowid'].']" value="'.$infos_event['name'].'" /></td>'."\n";
print '<td><input class="flat" type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('DurationDays').'</td>'."\n"; print '<td><input class="flat" type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('DurationDays').'</td>'."\n";
print '<td><input type="submit" class="button" name="update_event['.$infos_event['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'"/></td>'."\n"; print '<td><input type="submit" class="button" name="update_event['.$infos_event['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'"/></td>'."\n";
print '<td width="20px" align="right"><input type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n"; print '<td width="20px" align="right"><input type="image" alt="'.$langs->trans("Delete").'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n";
print '</tr>'; print '</tr>';
$i++; $i++;

8
htdocs/main.inc.php
View File

@ -1403,6 +1403,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$logintext.='>'.$user->login.'</a>'; $logintext.='>'.$user->login.'</a>';
if ($user->societe_id) $logintext.=$companylink; if ($user->societe_id) $logintext.=$companylink;
$logintext.='</div>'; $logintext.='</div>';
$loginhtmltext.='<u>'.$langs->trans("User").'</u>'; $loginhtmltext.='<u>'.$langs->trans("User").'</u>';
$loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->getFullName($langs); $loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->getFullName($langs);
$loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login; $loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
@ -1436,7 +1437,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
} }
else $appli.=" ".DOL_VERSION; else $appli.=" ".DOL_VERSION;
// Link info
$logouttext=''; $logouttext='';
$logouthtmltext=$appli.'<br>'; $logouthtmltext=$appli.'<br>';
if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
@ -1446,13 +1446,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php"'; $logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php"';
//$logouttext .=empty($atarget?(' target="'.$atarget.'"'):''; //$logouttext .=empty($atarget?(' target="'.$atarget.'"'):'';
$logouttext .='>'; $logouttext .='>';
$logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1); $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
$logouttext .='</a>'; $logouttext .='</a>';
} }
else else
{ {
$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]); $logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
$logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1); $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
} }
print '<div class="login_block">'."\n"; print '<div class="login_block">'."\n";
@ -1483,7 +1483,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$qs=$_SERVER["QUERY_STRING"]; $qs=$_SERVER["QUERY_STRING"];
$qs.=(($qs && $morequerystring)?'&':'').$morequerystring; $qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">'; $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
$text.= img_picto('', 'printer.png', 'class="printer"'); $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer.png', 'class="printer"');
$text.='</a>'; $text.='</a>';
$toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2); $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
} }