diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index b4f263ca191..df25c92c861 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -54,16 +54,27 @@ if ($mesg) print $mesg.'
'; print $langs->trans("SetupDescription1").' '; print $langs->trans("AreaForAdminOnly").'
'; + print "
"; print $langs->trans("SetupDescription2")."
"; + print "
"; print img_picto('','puce').' '.$langs->trans("SetupDescription3")."
"; -print "
"; +//print '
'; +print '
'; print img_picto('','puce').' '.$langs->trans("SetupDescription4")."
"; -print "
"; +//print '
'; +print '
'; print img_picto('','puce').' '.$langs->trans("SetupDescription5")."
"; print "
"; +/* +print ''; +print '"; +print '"; +print '"; +print '
'.img_picto('','puce').' '.$langs->trans("SetupDescription3")."
'.img_picto('','puce').' '.$langs->trans("SetupDescription4")."
'.img_picto('','puce').' '.$langs->trans("SetupDescription5")."
'; +*/ print '
'; print info_admin($langs->trans("OnceSetupFinishedCreateUsers")).'
'; diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 9ab3d12454f..368c690b312 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -44,7 +44,8 @@ ErrorNoVATRateDefinedForSellerCountry = Error, cap tipus d'IVA definit per al pa ErrorFailedToSaveFile = Error, el registre del fitxer ha fallat. ErrorOnlyPngJpgSupported = Error, només estan suportats els formats d'imatge jpg i png. ErrorImageFormatNotSupported = El seu PHP no suporta les funcions de conversió d'aquest format d'imatge. -GoToHelpPage = Consultar l'ajuda (pot requerir accés a Internet) +GoToWikiHelpPage = Consultar l'ajuda (pot requerir accés a Internet) +GoToHelpPage = Consultar l'ajuda RecordSaved = Registre guardat LevelOfFeature = Nivell de funcions NotDefined = No definida diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 4275fab4854..a629e84dfe5 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -44,6 +44,8 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '% ErrorFailedToSaveFile=Error, failed to save file. ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. +GoToWikiHelpPage=Read online help (nead Internet access) +GoToHelpPage=Read help RecordSaved=Record saved LevelOfFeature=Level of features NotDefined=Not defined diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index dda70b717f6..ffed66b8abd 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -44,7 +44,8 @@ ErrorNoVATRateDefinedForSellerCountry = Error, ningún tipo de IVA definido para ErrorFailedToSaveFile = Error, el registro del archivo falló. ErrorOnlyPngJpgSupported = Error, solamente se soportan los formatos de imagen jpg y png. ErrorImageFormatNotSupported = Su PHP no soporta las funciones de conversión de este formato de imagen. -GoToHelpPage = Consultar la ayuda (puede requerir acceso a Internet) +GoToWikiHelpPage = Consultar la ayuda (puede requerir acceso a Internet) +GoToHelpPage = Consultar la ayuda RecordSaved = Registro guardado LevelOfFeature = Nivel de funciones NotDefined = No definida diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 80d13db9839..796d9622063 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -44,7 +44,8 @@ ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux tva défini pour le pay ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué. ErrorOnlyPngJpgSupported=Erreur, seuls les formats images .jpg et .png sont supportés. ErrorImageFormatNotSupported=Votre PHP ne supporte pas les fonctions de conversion de ce format d'image. -GoToHelpPage=Consulter l'aide (peut nécessiter un accès internet) +GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet) +GoToHelpPage=Consulter l'aide RecordSaved=Enregistrement sauvegardé LevelOfFeature=Niveau de fonctionnalités NotDefined=Non défini diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0159788e605..076afb66400 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1039,14 +1039,14 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') if ($helpbaseurl && $helppage) { print '
'; - print 'trans("PageWiki").' '.$helppage; + print ''; print img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1).' '; print $langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help'); - if ($mode == 'wiki') print ' ('.dol_trunc($helppage,8).')'; + if ($mode == 'wiki') print ' ('.dol_trunc(strtr($helppage,'_',' '),8).')'; print ''; print '
'; } @@ -1084,14 +1084,13 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') /** - * \brief Affiche une zone de recherche + * \brief Show a search area * \param urlaction Url du post * \param urlobject Url du lien sur titre de la zone de recherche * \param title Titre de la zone de recherche * \param htmlmodesearch 'search' * \param htmlinputname Nom du champ input du formulaire */ - function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname) { global $langs; diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index 939d8743d59..b9c36f943fa 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -40,6 +40,7 @@ else header('Cache-Control: no-cache'); body { background-color: #F4F4F4; + background: #f9f9f9 url() 0 0 no-repeat; color: #101010; font-size: 12px; font-family: arial,tahoma,verdana,helvetica; diff --git a/htdocs/theme/eldy/img/headbg.jpg b/htdocs/theme/eldy/img/headbg.jpg new file mode 100644 index 00000000000..7d1374e1fc9 Binary files /dev/null and b/htdocs/theme/eldy/img/headbg.jpg differ