Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.3' into develop

Browse Source 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
This commit is contained in:
Laurent Destailleur 2013-02-18 15:01:00 +01:00
commit da7b5e352f
7 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -13,9 +13,10 @@ For users:
For developers:
- System of menu managers has been rewritten to reduce code to do same things.
- An external module can force its theme.
- Add function dol_set_focus('#xxx').
For translators:
- Update language files.
***** ChangeLog for 3.3 compared to 3.2.3 *****

12
htdocs/core/lib/functions.lib.php
View File

@ -4224,6 +4224,18 @@ function colorArrayToHex($arraycolor,$colorifnotfound='888888')
return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
}
/**
* Set focus onto field with selector
*
* @param string $selector Selector ('#id')
* @return string HTML code to set focus
*/
function dol_set_focus($selector)
{
print '<!-- Set focus onto a specific field -->'."\n";
print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.$selector.'").focus(); });</script>'."\n";
}
if (! function_exists('getmypid'))
{

2
htdocs/langs/en_US/admin.lang
View File

@ -976,7 +976,7 @@ NotificationsDesc=EMails notifications feature allows you to silently send autom
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
CompanyIdProfChecker=Professional Id unique
CompanyIdProfChecker=Rules ono Professional Ids
MustBeUnique=Must be unique ?
MustBeMandatory=Must be mandatory ?
Miscellanous=Miscellaneous

2
htdocs/langs/fr_FR/admin.lang
View File

@ -973,7 +973,7 @@ NotificationsDesc= La fonction des notifications par emails permet d'envoyer aut
ModelModules=Modèle de documents
DocumentModelOdt=Genération depuis des modèles OpenDocument (Fichier .ODT OpenOffice, KOffice, TextEdit...)
WatermarkOnDraft=Filigrane sur les documents brouillons
CompanyIdProfChecker=Id professionnel unique
CompanyIdProfChecker=Règles sur les Ids professionnels
MustBeUnique=Doit être unique ?
MustBeMandatory=Doit être obligatoire?
Miscellanous=Divers

4
htdocs/langs/fr_FR/holiday.lang
View File

@ -91,7 +91,7 @@ LastDayOfHoliday=Dernier jour de congès
ConfCP=Configuration du module Congés
DescOptionCP=Description de l'option
ValueOptionCP=Valeur
GroupToValidateCP=Groupe ayant la possibilité de valider les congés
GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés
ConfirmConfigCP=Valider la configuration
LastUpdateCP=Dernière mise à jour automatique des congés
UpdateConfCPOK=Mise à jour effectuée avec succès.
@ -127,4 +127,4 @@ NoCPforMonth=Aucun congé ce mois-ci.
Jours=jours
nbJours=Nombre jours
TitleAdminCP=Configuration des Congés
Permission20001=Lire / Créer / modifier ses congès
Permission20001=Lire / Créer / modifier ses congès

6
htdocs/user/fiche.php
View File

@ -682,6 +682,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<br>';
}
print dol_set_focus('#nom');
print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
@ -697,12 +699,12 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<td>';
if (! empty($ldap_nom))
{
print '<input type="hidden" name="nom" value="'.$ldap_nom.'">';
print '<input type="hidden" id="nom" name="nom" value="'.$ldap_nom.'">';
print $ldap_nom;
}
else
{
print '<input size="30" type="text" name="nom" value="'.GETPOST('nom').'">';
print '<input size="30" type="text" id="nom" name="nom" value="'.GETPOST('nom').'">';
}
print '</td></tr>';

4
htdocs/user/group/fiche.php
View File

@ -215,6 +215,8 @@ if ($action == 'create')
if ($message) { print $message."<br>"; }
print dol_set_focus('#nom');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
@ -222,7 +224,7 @@ if ($action == 'create')
print '<table class="border" width="100%">';
print "<tr>".'<td valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>';
print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
print '<td class="valeur"><input size="30" type="text" id="nom" name="nom" value=""></td></tr>';
// Multicompany
if (! empty($conf->multicompany->enabled))