diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 9086d0992a9..2103c50dd99 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2913,7 +2913,8 @@ else $delallowed=$user->rights->facture->supprimer; print '
'; - $somethingshown=$formfile->show_documents('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang,$hookmanager); + print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang,$hookmanager); + $somethingshown=$formfile->numoffiles; /* * Linked object block diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 207de988a4f..062ad198f73 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -134,7 +134,7 @@ class FormActions $total = 0; $var=true; print ''; - print ''; + print ''; print "\n"; foreach($actioncomm->actions as $action) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index b76ed8c3724..52c68848b15 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -369,12 +369,12 @@ class FormFile $out.= '
'.$titletoshow.'
'; $out.= '
'.$langs->trans('Ref').''.$langs->trans('Date').''.$langs->trans('Action').''.$langs->trans('By').'
'.$langs->trans('Ref').''.$langs->trans('Date').''.$langs->trans('Action').''.$langs->trans('By').'
'; - $out.= ''; + $out.= ''; // Model if (! empty($modellist)) { - $out.= ''; } else { - $out.= ''; } // Language code (if multilang) - $out.= ''; // Button - $out.= ''; $out.= ''; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 1e288bd568f..4cb8fcb67ee 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -91,7 +91,6 @@ a:link, a:visited, a:hover, a:active { font-family: ; fo input:focus, textarea:focus, button:focus, select:focus { box-shadow: 0 0 4px #8091BF; } - input, input.flat, textarea, textarea.flat, form.flat select, select.flat { font-size: px; font-family: ; @@ -133,6 +132,9 @@ textarea:disabled { .button:hover { background: #dee7ec; } +.button:disabled { + background: #ddd; +} .buttonajax { font-family: ; border: 0px; @@ -155,6 +157,14 @@ div.float { float:; } +th .button { + -moz-box-shadow: none !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; + -moz-border-radius:0px !important; + -webkit-border-radius:0px !important; + border-radius:0px !important; +} /* ============================================================================== */ /* Styles to hide objects */ @@ -954,10 +964,6 @@ a.tabTitle { margin: 0px 6px; text-decoration: none; white-space: nowrap; - - border-: 1px solid #555555; - border-: 1px solid #D8D8D8; - border-top: 1px solid #D8D8D8; } a.tab:link { diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index e18cd0020a5..7727f351915 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -1318,8 +1318,8 @@ else print ''; print ''; print '
'; + $out.= ''; $out.= $langs->trans('Model').' '; if (is_array($modellist) && count($modellist) == 1) // If there is only one element { @@ -382,17 +382,17 @@ class FormFile $modelselected=$arraykeys[0]; } $out.= $form->selectarray('model',$modellist,$modelselected,$showempty,0,0); - $out.= ''; + $out.= ''; + $out.= ''; $out.= $langs->trans("Files"); - $out.= ''; + $out.= ''; + $out.= ''; if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang) { include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); @@ -404,10 +404,10 @@ class FormFile { $out.= ' '; } - $out.= ''; + $out.= ''; + $out.= ''; $out.= 'load("errors"); $out.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated")); } - $out.= ''; + $out.= '
'."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; print '
'.$langs->trans("GroupsToAdd").''; + print '
'.$langs->trans("GroupsToAdd").''; print $form->select_dolgroups('','group',1,$exclude,0,'','',$fuser->entity); print '   '; // Multicompany @@ -1341,7 +1341,7 @@ else print ''; } print ''; - print '
'."\n"; print '
'; @@ -1516,7 +1516,7 @@ else print "\n"; // Administrator - print "".''.$langs->trans("Administrator").''; + print ''.$langs->trans("Administrator").''; if ($fuser->societe_id > 0) { print '';