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

Code style improved, removed duplicated code, also removed img_phone function as it is no longer used in Dolibarr

Browse Source
This commit is contained in:
Marcos García 2012-07-30 22:36:43 +02:00
parent 4f1814d486
commit 0e0cf98c4f
3 changed files with 124 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/core/class/html.form.class.php
View File

@ -346,7 +346,7 @@ class Form
* @return string Code html du tooltip (texte+picto) * @return string Code html du tooltip (texte+picto)
* @see Use function textwithpicto if you can. * @see Use function textwithpicto if you can.
*/ */
function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='',$notabs=0,$incbefore='',$noencodehtmltext=0) function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 0, $incbefore = '', $noencodehtmltext = 0)
{ {
global $conf; global $conf;
@ -402,18 +402,24 @@ class Form
* @param int $noencodehtmltext Do not encode into html entity the htmltext * @param int $noencodehtmltext Do not encode into html entity the htmltext
* @return string HTML code of text, picto, tooltip * @return string HTML code of text, picto, tooltip
*/ */
function textwithpicto($text,$htmltext,$direction=1,$type='help',$extracss='',$noencodehtmltext=0) function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0)
{ {
global $conf; global $conf;
if ("$type" == "0") $type='info'; // For backward compatibility $alt = '';
//For backwards compatibility
if ($type == '0') $type = 'info';
elseif ($type == '1') $type = 'help';
$alt='';
// If info or help with no javascript, show only text // If info or help with no javascript, show only text
if (empty($conf->use_javascript_ajax)) if (empty($conf->use_javascript_ajax))
{ {
if ($type == 'info' || $type == 'help') return $text; if ($type == 'info' || $type == 'help') return $text;
else { $alt=$htmltext; $htmltext=''; else
{
$alt = $htmltext;
$htmltext = '';
} }
} }
// If info or help with smartphone, show only text // If info or help with smartphone, show only text
@ -421,15 +427,14 @@ class Form
{ {
if ($type == 'info' || $type == 'help') return $text; if ($type == 'info' || $type == 'help') return $text;
} }
// Info or help
if ($type == 'info') $img=img_help(0,$alt); if ($type == 'info') $img = img_help(0, $alt);
if ($type == 'help' || $type ==1) $img=img_help(1,$alt); elseif ($type == 'help') $img = img_help(1, $alt);
if ($type == 'superadmin') $img=img_picto($alt,"redstar"); elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
if ($type == 'admin') $img=img_picto($alt,"star"); elseif ($type == 'admin') $img = img_picto($alt, 'star');
// Warnings elseif ($type == 'warning') $img = img_warning($alt);
if ($type == 'warning') $img=img_warning($alt);
return $this->textwithtooltip($text,$htmltext,2,$direction,$img,$extracss,0,'',$noencodehtmltext); return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, 0, '', $noencodehtmltext);
} }
/** /**

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

@ -1739,11 +1739,13 @@ function img_action($alt, $numaction)
* @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($alt = 'default', $size = 3)
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Show");
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/pdf'.$size.'.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; if ($alt == 'default') $alt = $langs->trans('Show');
return img_picto($alt, 'pdf'.$size.'.png');
} }
/** /**
@ -1752,11 +1754,13 @@ function img_pdf($alt = "default",$size=3)
* @param string $alt Texte sur le alt de l'image * @param string $alt Texte sur le alt de l'image
* @return string Return tag img * @return string Return tag img
*/ */
function img_edit_add($alt = "default") function img_edit_add($alt = 'default')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Add");
return img_picto($alt,'edit_add.png'); if ($alt == 'default') $alt = $langs->trans('Add');
return img_picto($alt, 'edit_add.png');
} }
/** /**
* Show logo - * Show logo -
@ -1764,11 +1768,13 @@ function img_edit_add($alt = "default")
* @param string $alt Texte sur le alt de l'image * @param string $alt Texte sur le alt de l'image
* @return string Retourne tag img * @return string Retourne tag img
*/ */
function img_edit_remove($alt = "default") function img_edit_remove($alt = 'default')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Remove");
return img_picto($alt,'edit_remove.png'); if ($alt == 'default') $alt = $langs->trans('Remove');
return img_picto($alt, 'edit_remove.png');
} }
/** /**
@ -1779,15 +1785,13 @@ function img_edit_remove($alt = "default")
* @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_edit($alt = "default", $float=0, $other='') function img_edit($alt = 'default', $float = 0, $other = '')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Modify");
$img='<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/edit.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'; if ($alt == 'default') $alt = $langs->trans('Modify');
if ($float) $img.=' style="float: right"';
if ($other) $img.=' '.$other; return img_picto($alt, 'edit.png', ($float ? 'style="float: right"' : $other));
$img.='>';
return $img;
} }
/** /**
@ -1798,15 +1802,13 @@ function img_edit($alt = "default", $float=0, $other='')
* @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_view($alt = "default", $float=0, $other='') function img_view($alt = 'default', $float = 0, $other = '')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("View");
$img='<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/view.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'; if ($alt == 'default') $alt = $langs->trans('View');
if ($float) $img.=' style="float: right"';
if ($other) $img.=' '.$other; return img_picto($alt, 'view.png', ($float ? 'style="float: right"' : $other));
$img.='>';
return $img;
} }
/** /**
@ -1816,13 +1818,14 @@ function img_view($alt = "default", $float=0, $other='')
* @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($alt = 'default', $other = '')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Delete");
return img_picto($alt,'delete.png',$other);
}
if ($alt == 'default') $alt = $langs->trans('Delete');
return img_picto($alt, 'delete.png', $other);
}
/** /**
* Show help logo with cursor "?" * Show help logo with cursor "?"
@ -1853,11 +1856,13 @@ function img_help($usehelpcursor=1,$usealttitle=1)
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @return string Return img tag * @return string Return img tag
*/ */
function img_info($alt = "default") function img_info($alt = 'default')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Informations");
return img_picto($alt,'info.png'); if ($alt == 'default') $alt = $langs->trans('Informations');
return img_picto($alt, 'info.png');
} }
/** /**
@ -1867,70 +1872,58 @@ function img_info($alt = "default")
* @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($alt = 'default', $float = 0)
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Warning");
return img_picto($alt,'warning.png',$float?'style="float: right"':''); if ($alt == 'default') $alt = $langs->trans('Warning');
return img_picto($alt, 'warning.png', ($float ? 'style="float: right"' : ''));
} }
/** /**
* Affiche logo error * Show logo error
* *
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @return string Return img tag * @return string Return img tag
*/ */
function img_error($alt = "default") function img_error($alt = 'default')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Error");
return img_picto($alt,'error.png'); if ($alt == 'default') $alt = $langs->trans('Error');
return img_picto($alt, 'error.png');
} }
/** /**
* Affiche logo telephone * Show logo next
*
* @param string $alt Text to show on alt image
* @param int $option Option
* @return string Return img tag
*/
function img_phone($alt = "default",$option=0)
{
global $conf,$langs;
if ($alt=="default") $alt=$langs->trans("Call");
$img='call_out';
if ($option == 1) $img='call';
$img='object_commercial';
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$img.'.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">';
}
/**
* Affiche logo suivant
* *
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @return string Return img tag * @return string Return img tag
*/ */
function img_next($alt = "default") function img_next($alt = 'default')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") {
$alt=$langs->trans("Next"); if ($alt == 'default') $alt = $langs->trans('Next');
}
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/next.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; return img_picto($alt, 'next.png');
} }
/** /**
* Affiche logo precedent * Show logo previus
* *
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @return string Return img tag * @return string Return img tag
*/ */
function img_previous($alt = "default") function img_previous($alt = 'default')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Previous");
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/previous.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; if ($alt == 'default') $alt = $langs->trans('Previous');
return img_picto($alt, 'previous.png');
} }
/** /**
@ -1940,12 +1933,13 @@ function img_previous($alt = "default")
* @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($alt = 'default', $selected = 0)
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Down");
if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgdown">'; if ($alt == 'default') $alt = $langs->trans('Down');
else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgdown">';
return img_picto($alt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown"');
} }
/** /**
@ -1955,42 +1949,45 @@ function img_down($alt = "default", $selected=0)
* @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($alt = 'default', $selected = 0)
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Up");
if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgup">'; if ($alt == 'default') $alt = $langs->trans('Up');
else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgup">';
return img_picto($alt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgup"');
} }
/** /**
* Affiche logo gauche * Show logo left arrow
* *
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @param int $selected Selected * @param int $selected Selected
* @return string Return img tag * @return string Return img tag
*/ */
function img_left($alt = "default", $selected=0) function img_left($alt = 'default', $selected = 0)
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Left");
if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1leftarrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; if ($alt == 'default') $alt = $langs->trans('Left');
else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1leftarrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">';
return img_picto($alt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'));
} }
/** /**
* Affiche logo droite * Show logo right arrow
* *
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @param int $selected Selected * @param int $selected Selected
* @return string Return img tag * @return string Return img tag
*/ */
function img_right($alt = "default", $selected=0) function img_right($alt = 'default', $selected = 0)
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Right");
if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1rightarrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; if ($alt == 'default') $alt = $langs->trans('Right');
else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1rightarrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">';
return img_picto($alt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'));
} }
/** /**
@ -2000,19 +1997,14 @@ function img_right($alt = "default", $selected=0)
* @param string $alt Text to show on alt image * @param string $alt Text to show on alt image
* @return string Return img tag * @return string Return img tag
*/ */
function img_allow($allow,$alt='default') function img_allow($allow, $alt = 'default')
{ {
global $conf,$langs; global $conf, $langs;
if ($alt=="default") $alt=$langs->trans("Active");
if ($allow == 1) if ($alt == 'default') $alt = $langs->trans('Active');
{
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tick.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; if ($allow == 1) return img_picto($alt, 'tick.png');
} else return '-';
else
{
return "-";
}
} }
@ -2025,7 +2017,7 @@ function img_allow($allow,$alt='default')
*/ */
function img_mime($file,$alt='') function img_mime($file,$alt='')
{ {
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);

8
htdocs/ecm/index.php
View File

@ -466,7 +466,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
print img_picto_common('','treemenu/base.gif'); print img_picto_common('','treemenu/base.gif');
print '</td><td align="left">'; print '</td><td align="left">';
$txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsAuto").')'; $txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsAuto").')';
print $form->textwithpicto($txt,$htmltooltip,1,0); print $form->textwithpicto($txt, $htmltooltip, 1, 0);
print '</td>'; print '</td>';
print '</tr></table>'; print '</tr></table>';
print '</td>'; print '</td>';
@ -512,7 +512,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
$htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>'; $htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>';
$htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$langs->trans("ECMTypeAuto").'<br>'; $htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$langs->trans("ECMTypeAuto").'<br>';
$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['desc']; $htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['desc'];
print $form->textwithpicto('',$htmltooltip,1,"info"); print $form->textwithpicto('', $htmltooltip, 1, 'info');
print '</div>'; print '</div>';
print '</li>'; print '</li>';
@ -534,7 +534,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
print img_picto_common('','treemenu/base.gif'); print img_picto_common('','treemenu/base.gif');
print '</td><td align="left">'; print '</td><td align="left">';
$txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsManual").')'; $txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsManual").')';
print $form->textwithpicto($txt,$htmltooltip,1,"info"); print $form->textwithpicto($txt, $htmltooltip, 1, 'info');
print '</td>'; print '</td>';
print '</tr></table></td>'; print '</tr></table></td>';
print '<td align="right">'; print '<td align="right">';
@ -745,7 +745,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>'; $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
if ($nbofsubdir) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir; if ($nbofsubdir) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>'; else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
print $form->textwithpicto('',$htmltooltip,1,"info"); print $form->textwithpicto('', $htmltooltip, 1, 'info');
print "</td>"; print "</td>";
print '</tr></table>'; print '</tr></table>';