diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 47723a05cbc9cd2540bd0e360c1e6e802ad819a0..59a418d73a216a3a356e7d774245f2bd08469bd5 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -75,6 +75,7 @@ class FormFile global $conf,$langs, $hookmanager; $hookmanager->initHooks(array('formfile')); + if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0; if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2)) @@ -86,13 +87,13 @@ class FormFile return $this->_formAjaxFileUpload($object); } else - { + { $maxlength=$size; $out = "\n\n<!-- Start form attach new file -->\n"; if (empty($title)) $title=$langs->trans("AttachANewFile"); - if ($title != 'none') print_titre($title); + if ($title != 'none') $out.=load_fiche_titre($title, null, null); $out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">'; $out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="">'; @@ -178,7 +179,7 @@ class FormFile $out .= '<table width="100%" class="nobordernopadding">'; $out .= '<tr>'; $out .= '<td valign="middle" class="nowrap">'; - $out .= $langs->trans("Link") . ': '; + $out .= $langs->trans("URLToLink") . ': '; $out .= '<input type="text" name="link" size="'.$maxlength.'" id="link">'; $out .= ' ' . $langs->trans("Label") . ': '; $out .= '<input type="text" name="label" id="label">'; @@ -200,7 +201,9 @@ class FormFile if (empty($res)) { + print '<div class="attacharea">'; print $out; + print '</div>'; } print $hookmanager->resPrint; diff --git a/htdocs/langs/en_US/link.lang b/htdocs/langs/en_US/link.lang index 8b1efb75ef372daf24c660017c22d0cda43189b8..6880d4d86a075ba6e1c741d67ee6a971f75f72bc 100644 --- a/htdocs/langs/en_US/link.lang +++ b/htdocs/langs/en_US/link.lang @@ -6,3 +6,4 @@ ErrorFileNotLinked=The file could not be linked LinkRemoved=The link %s has been removed ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>' ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>' +URLToLink=URL to link \ No newline at end of file diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index ce4764373db27abaa88b7a53de7b8f8f0517d7b2..b88fcb187de200ec6841423dcf4f1d1fd1a08aeb 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -603,7 +603,10 @@ div.ficheaddleft { padding-top: 1px; padding-bottom: 1px; } - +div.attacharea { + padding-top: 10px; + padding-bottom: 10px; +} /* ============================================================================== */ /* Menu top et 1ere ligne tableau */