diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index fdd69a26a5b..1f5e8493d7b 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -173,7 +173,8 @@ class box_actions extends ModeleBoxes
{
global $langs, $conf;
parent::showBox($this->info_box_head, $this->info_box_contents);
- if ($conf->global->SHOW_DIALOG_HOMEPAGE) {
+ if (! empty($conf->global->SHOW_DIALOG_HOMEPAGE))
+ {
$actioncejour=false;
$contents=$this->info_box_contents;
$nblines=count($contents);
@@ -182,7 +183,7 @@ class box_actions extends ModeleBoxes
$bcx[1] = 'class="box_impair"';
if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
{
- print '
trans("ActionsToDo").'">';
+ print '
trans("ActionsToDo").'">';
print '
';
for ($line=0, $n=$nblines; $line < $n; $line++)
{
@@ -219,11 +220,11 @@ class box_actions extends ModeleBoxes
if ($actioncejour)
{
print '';
@@ -231,7 +232,7 @@ class box_actions extends ModeleBoxes
else
{
print '';
}
}
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index aad079d2b0e..234a2348590 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -940,10 +940,11 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
function copyToClipboard(text,text2)
{
text = text.replace(/
/g,"\n");
- var newElem = '
'+text2;
- $("#dialog").html(newElem);
- $("#dialog").dialog();
- $("#coords").select();
+ var newElem = '
'+text2;
+ /* alert(newElem); */
+ $("#dialogforpopup").html(newElem);
+ $("#dialogforpopup").dialog();
+ $("#coordsforpopup").select();
return false;
}
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c7b370b287f..fc544a51d93 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -767,9 +767,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print ''."\n";
- // A div for the address popup
- print '';
-
return $i;
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1c35968790c..1da5fa8f864 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1952,7 +1952,10 @@ if (! function_exists("llxFooter"))
jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(600,'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
});
' . "\n";
-
+
+ // A div for the address popup
+ print "\n\n";
+ print ''."\n";
print "