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

Merge pull request #2107 from frederic34/patch-13

Browse Source 
Fix 1660 ECM tabs help tooltips not showing
This commit is contained in:
Laurent Destailleur 2014-11-27 13:57:01 +01:00
commit 0fc768fefc
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/ecm.lib.php
View File

@ -31,19 +31,21 @@
*/ */
function ecm_prepare_dasboard_head($object) function ecm_prepare_dasboard_head($object)
{ {
global $langs, $conf, $user; global $langs, $conf, $user, $form;
$h = 0; $h = 0;
$head = array(); $head = array();
$helptext =$langs->trans("ECMAreaDesc").'<br>';
$helptext.=$langs->trans("ECMAreaDesc2");
$head[$h][0] = DOL_URL_ROOT.'/ecm/index.php'; $head[$h][0] = DOL_URL_ROOT.'/ecm/index.php';
$head[$h][1] = $langs->trans("ECMSectionsManual").img_help(1,$helptext1); $head[$h][1] = $langs->trans("ECMSectionsManual").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
$head[$h][2] = 'index'; $head[$h][2] = 'index';
$h++; $h++;
if (! empty($conf->global->ECM_AUTO_TREE_ENABLED)) if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
{ {
$head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php'; $head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
$head[$h][1] = $langs->trans("ECMSectionsAuto").img_help(1,$helptext2); $head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
$head[$h][2] = 'index_auto'; $head[$h][2] = 'index_auto';
$h++; $h++;
} }

6
htdocs/ecm/index.php
View File

@ -416,12 +416,6 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager")); print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
$helptext1=''; $helptext2='';
$helptext1.=$langs->trans("ECMAreaDesc");
$helptext1.=$langs->trans("ECMAreaDesc2");
$helptext2.=$langs->trans("ECMAreaDesc");
$helptext2.=$langs->trans("ECMAreaDesc2");
/* /*
print '<div class="hideonsmartphone">'; print '<div class="hideonsmartphone">';
print $langs->trans("ECMAreaDesc")."<br>"; print $langs->trans("ECMAreaDesc")."<br>";