diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 677efccfdee..10a31b215f7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -113,7 +113,7 @@ class FormFile
if (! empty($options)) $out .= '| '.$options.' | ';
- $out .= '';
+ $out .= ' | ';
$max=$conf->global->MAIN_UPLOAD_DOC; // En Kb
$maxphp=@ini_get('upload_max_filesize'); // En inconnu
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9e7bb7f7ce8..26d9f50b3b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4886,7 +4886,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
global $conf;
$path = '';
-
+
$arrayforoldpath=array('cheque','user','category','holiday','supplier_invoice','invoice_supplier','mailing','supplier_payment');
if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
if (! empty($level) && in_array($modulepart, $arrayforoldpath))
@@ -5133,7 +5133,7 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
* @param int $removelasteolbr 1=Remove last br or lasts \n (default), 0=Do nothing
* @return string String encoded
*/
-function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$removelasteolbr=1)
+function dol_htmlentitiesbr($stringtoencode, $nl2brmode=0, $pagecodefrom='UTF-8', $removelasteolbr=1)
{
$newstring=$stringtoencode;
if (dol_textishtml($stringtoencode)) // Check if text is already HTML or not
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0f0372867a0..467f685dfe5 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -5002,12 +5002,12 @@ div.tabsElem a.tab {
{
.side-nav {
z-index: 200;
- background: #FFF;
+ background: rgb();
padding-top: 70px;
}
#id-left {
z-index: 201;
- background: #FFF;
+ background: rgb();
}
.login_vertical_align {
@@ -5050,7 +5050,9 @@ div.tabsElem a.tab {
left: 0 !important;
text-align: center;
vertical-align: middle;
- background: #FFF;
+
+ background: rgb();
+
height: 50px;
z-index: 202;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index f823c5158a9..509acd837f5 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -144,6 +144,14 @@ $diroutput = $conf->medias->multidir_output[$conf->entity];
$relativepath=$section_dir;
$upload_dir = $diroutput.'/'.$relativepath;
+$htmlheadercontentdefault =''."\n";
+$htmlheadercontentdefault.=''."\n";
+$htmlheadercontentdefault.=''."\n";
+$htmlheadercontentdefault.=''."\n";
+$htmlheadercontentdefault.=''."\n";
+$htmlheadercontentdefault.=''."\n";
+
+
/*
* Actions
@@ -608,15 +616,7 @@ if ($action == 'addcontainer')
if (! dol_is_file($filehtmlheader))
{
$htmlheadercontent ="\n";
- $htmlheadercontent.=''."\n";
- $htmlheadercontent.=''."\n";
-
- $htmlheadercontent.=''."\n";
- $htmlheadercontent.=''."\n";
-
- $htmlheadercontent.=''."\n";
-
- $htmlheadercontent.=''."\n";
+ $htmlheadercontent.=$htmlheadercontentdefault;
$htmlheadercontent.="";
$result=dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
}
@@ -1673,9 +1673,7 @@ if ($action == 'editcss')
if (! trim($htmlheadercontent))
{
$htmlheadercontent ="\n";
- $htmlheadercontent.=''."\n";
- $htmlheadercontent.=''."\n";
- $htmlheadercontent.=''."\n";
+ $htmlheadercontent.=$htmlheadercontentdefault;
$htmlheadercontent.="";
}
else
@@ -1755,17 +1753,7 @@ if ($action == 'editcss')
// Common HTML header
print ' | ';
$htmlhelp=$langs->trans("Example").' :
';
- $htmlhelp.='
';
- $htmlhelp.='<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" ></script>
';
- $htmlhelp.='<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js" integrity="sha256-T0Vest3yCU7pafRw9r+settMBX6JkKN06dqBnpQ8d30=" crossorigin="anonymous" ></script>
';
- $htmlhelp.='
';
- $htmlhelp.='<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
';
- $htmlhelp.='
';
- $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" ></script>
';
- $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" ></script>
';
- $htmlhelp.='
';
- $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/js/bootstrap.min.js" ></script>
';
-
+ $htmlhelp.=dol_htmlentitiesbr($htmlheadercontentdefault);
print $form->textwithpicto($langs->trans('WEBSITE_HTML_HEADER'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
print ' | ';
@@ -1993,16 +1981,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
$htmlhelp=$langs->trans("EditTheWebSiteForACommonHeader").'
';
$htmlhelp=$langs->trans("Example").' :
';
- $htmlhelp.='
';
- $htmlhelp.='<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" ></script>
';
- $htmlhelp.='<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js" integrity="sha256-T0Vest3yCU7pafRw9r+settMBX6JkKN06dqBnpQ8d30=" crossorigin="anonymous" ></script>
';
- $htmlhelp.='
';
- $htmlhelp.='<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
';
- $htmlhelp.='
';
- $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" ></script>
';
- $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" ></script>
';
- $htmlhelp.='
';
- $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/js/bootstrap.min.js" ></script>
';
+ $htmlhelp.=dol_htmlentitiesbr($htmlheadercontentdefault);
print $form->textwithpicto($langs->trans('HtmlHeaderPage'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
print ' | ';
|