Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: Mutualize a lot of duplicate functions into functions.lib.php

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-17 15:56:22 +00:00
parent 20e520d6d8
commit 0adbca4625
25 changed files with 158 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
* \file htdocs/core/class/html.form.class.php
* \ingroup core
* \brief File of class with all html predefined components
* \version $Id: html.form.class.php,v 1.195 2011/08/12 21:29:29 eldy Exp $
* \version $Id: html.form.class.php,v 1.196 2011/08/17 15:56:23 eldy Exp $
*/
@@ -223,7 +223,7 @@ class Form
// Info or help
if ($type == 'info') $img=img_help(0,$alt);
if ($type == 'help' || $type ==1) $img=img_help(1,$alt);
if ($type == 'superadmin') $img=img_redstar($alt);
if ($type == 'superadmin') $img=img_picto($alt,"redstar");
if ($type == 'admin') $img=img_picto($alt,"star");
// Warnings
if ($type == 'warning') $img=img_warning($alt);
@@ -3130,7 +3130,6 @@ class Form
{
$retstring.='<button class="dpInvisibleButtons" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="Now" onClick="'.$reset_scripts.'">';
$retstring.=$langs->trans("Now");
//print img_refresh($langs->trans("Now"));
$retstring.='</button> ';
}
}

8
htdocs/core/class/interfaces.class.php
View File

@@ -21,7 +21,7 @@
* \file htdocs/core/class/interfaces.class.php
* \ingroup core
* \brief Fichier de la classe de gestion des triggers
* \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $
* \version $Id: interfaces.class.php,v 1.10 2011/08/17 15:56:22 eldy Exp $
*/
@@ -71,7 +71,7 @@ class Interfaces
{
$dir=dol_buildpath($reldir,0);
//print "xx".$dir;exit;
// Check if directory exists
if (!is_dir($dir)) continue;
@@ -194,7 +194,7 @@ class Interfaces
{
$dir=dol_buildpath($reldir,0);
//print "xx".$dir;exit;
// Check if directory exists
if (!is_dir($dir)) continue;
@@ -267,7 +267,7 @@ class Interfaces
$triggers[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
$triggers[$j]['file'] = $files[$key];
$triggers[$j]['version'] = $objMod->getVersion();
$triggers[$j]['status'] = img_tick();
$triggers[$j]['status'] = img_picto($langs->trans("Active"),'tick');
if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = "&nbsp;";
$text ='<b>'.$langs->trans("Description").':</b><br>';