diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index fdd69a26a5bd50c94b5ae94e860634f277b16663..1f5e8493d7b29d98ba25a5cac7da83d76c54a724 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 '<div id="dialog" title="'.$nblines." ".$langs->trans("ActionsToDo").'">'; + print '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">'; print '<table width=100%>'; for ($line=0, $n=$nblines; $line < $n; $line++) { @@ -219,11 +220,11 @@ class box_actions extends ModeleBoxes if ($actioncejour) { print '<script>'; - print '$( "#dialog" ).dialog({ autoOpen: true });'; - if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1) + print '$("#dialogboxaction").dialog({ autoOpen: true });'; + if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1) // autoclose after this delay { print 'setTimeout(function(){'; - print '$("#dialog").dialog("close");'; + print '$("#dialogboxaction").dialog("close");'; print '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE*1000).');'; } print '</script>'; @@ -231,7 +232,7 @@ class box_actions extends ModeleBoxes else { print '<script>'; - print '$( "#dialog" ).dialog({ autoOpen: false });'; + print '$("#dialogboxaction").dialog({ autoOpen: false });'; print '</script>'; } } diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php index aad079d2b0eab8761d7d3b539655de5aafc5820f..234a23485900f4d03a8e4cc8dfe7bb15f6b4b11b 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(/<br>/g,"\n"); - var newElem = '<textarea id="coords" style="border: none; width: 90%; height: 120px;">'+text+'</textarea><br><br>'+text2; - $("#dialog").html(newElem); - $("#dialog").dialog(); - $("#coords").select(); + var newElem = '<textarea id="coordsforpopup" style="border: none; width: 90%; height: 120px;">'+text+'</textarea><br><br>'+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 c7b370b287f0967b73f3b9bb3d3179e40376c003..fc544a51d9317be3e7dbcf8fda12796d3449d317 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 '</form>'."\n"; - // A div for the address popup - print '<div id="dialog" title="'.dol_escape_htmltag($langs->trans('Address')).'" style="display: none;"></div>'; - return $i; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1c35968790cf9eaf9166009e70d4b92eed223a73..1da5fa8f86457b495035d8577d45c100692c998d 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}); }); </script>' . "\n"; - + + // A div for the address popup + print "\n<!-- A div to allow dialog popup -->\n"; + print '<div id="dialogforpopup" style="display: none;"></div>'."\n"; print "</body>\n"; print "</html>\n"; diff --git a/htdocs/theme/common/gmap.png b/htdocs/theme/common/gmap.png index 201577281f048ad530a5ffc90ae5ddcde1ea09cb..2d91b4634190a80ef1002cfef6b03cac54633ed1 100644 Binary files a/htdocs/theme/common/gmap.png and b/htdocs/theme/common/gmap.png differ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 5983243341ea3d193e2cc4a1abbb98854a0e39c8..c349a2e2944ddb624d00d371d75bfe466c9ff02d 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -80,7 +80,7 @@ $dol_use_jmobile=$conf->dol_use_jmobile; //var_dump($user->conf->THEME_ELDY_RGB); // Colors -$colorbackhmenu1='0,0,0'; // topmenu +$colorbackhmenu1='0,0,80'; // topmenu $colorbackvmenu1='255,255,255'; // vmenu $colorbacktitle1='230,230,230'; // title of array $colorbacktabcard1='255,255,255'; // card @@ -102,7 +102,7 @@ $useboldtitle=1; // Case of option always editable if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody; -if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='0,0,0'; +if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='50,50,60'; if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1=$colorbacktitle1; if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252'; if (! isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB=$colortexttitlenotab;