lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cosmetic changes

Browse Source 
Fix permissions and CRLF
This commit is contained in:
Laurent Destailleur 2015-05-15 02:34:57 +02:00
parent 60863d5d9d
commit bf883e1576
20 changed files with 165 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/contact/card.php
View File

@ -798,19 +798,19 @@ else
print '</td></tr>'; print '</td></tr>';
// Note Public // Note Public
print '<tr><td valign="top"><label for="note_public">'.$langs->trans("NotePublic").'</label></td><td colspan="3">'; print '<tr><td class="tdtop"><label for="note_public">'.$langs->trans("NotePublic").'</label></td><td colspan="3">';
$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// Note Private // Note Private
print '<tr><td valign="top"><label for="note_private">'.$langs->trans("NotePrivate").'</label></td><td colspan="3">'; print '<tr><td class="tdtop"><label for="note_private">'.$langs->trans("NotePrivate").'</label></td><td colspan="3">';
$doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// Statut // Statut
print '<tr><td valign="top">'.$langs->trans("Status").'</td>'; print '<tr><td>'.$langs->trans("Status").'</td>';
print '<td>'; print '<td>';
print $object->getLibStatut(5); print $object->getLibStatut(5);
print '</td></tr>'; print '</td></tr>';
@ -1025,16 +1025,16 @@ else
print '</td></tr>'; print '</td></tr>';
// Note Public // Note Public
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td><td colspan="3">'; print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td><td colspan="3">';
print nl2br($object->note_public); print nl2br($object->note_public);
print '</td></tr>'; print '</td></tr>';
// Note Private // Note Private
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td><td colspan="3">'; print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="3">';
print nl2br($object->note_private); print nl2br($object->note_private);
// Statut // Statut
print '<tr><td valign="top">'.$langs->trans("Status").'</td>'; print '<tr><td>'.$langs->trans("Status").'</td>';
print '<td>'; print '<td>';
print $object->getLibStatut(5); print $object->getLibStatut(5);
print '</td>'; print '</td>';

0
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php Executable file → Normal file
View File

0
htdocs/core/modules/expensereport/modules_expensereport.php Executable file → Normal file
View File

0
htdocs/core/modules/modExpenseReport.class.php Executable file → Normal file
View File

0
htdocs/expensereport/ajax/ajaxprojet.php Executable file → Normal file
View File

0
htdocs/expensereport/card.php Executable file → Normal file
View File

0
htdocs/expensereport/class/expensereport.class.php Executable file → Normal file
View File

0
htdocs/expensereport/export_csv.php Executable file → Normal file
View File

0
htdocs/expensereport/list.php Executable file → Normal file
View File

0
htdocs/expensereport/stats/index.php Executable file → Normal file
View File

0
htdocs/expensereport/synchro_compta.php Executable file → Normal file
View File

0
htdocs/fourn/class/fournisseur.product.class.php Executable file → Normal file
View File

0
htdocs/includes/restler/iCache.php Executable file → Normal file
View File

0
htdocs/product/class/product.class.php Executable file → Normal file
View File

BIN
htdocs/theme/eldy/img/logout.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 168 B

BIN
htdocs/theme/eldy/img/printer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 167 B

BIN
htdocs/theme/eldy/img/search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 432 B

After

Width:  |  Height:  |  Size: 215 B

BIN
htdocs/theme/eldy/img/searchclear.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 436 B

After

Width:  |  Height:  |  Size: 356 B

125
htdocs/theme/eldy/style.css.php
View File

@ -119,7 +119,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu) $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu)
$conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240'; $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
$conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays TO MATCH ELDY
//$conf->global->THEME_ELDY_BACKTITLE1='240,240,240'; // title of arrays TO MATCH BOOTSTRAP
$conf->global->THEME_ELDY_BACKTITLE2='230,230,230'; $conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';
$conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card $conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card
@ -557,23 +558,27 @@ margin : 0px auto;
<?php <?php
$minwidthtmenu=66; $minwidthtmenu=66;
$heightmenu=46; /* height of top menu, part with image */ $heightmenu=46; /* height of top menu, part with image */
$heightmenu2=46; /* height of top menu, ârt with login */ $heightmenu2=48; /* height of top menu, part with login */
?> ?>
div#id-top {
height: <?php print ($heightmenu2); ?>px;
background: rgb(<?php echo $colorbackhmenu1 ?>);
background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
}
div#tmenu_tooltip { div#tmenu_tooltip {
<?php if (GETPOST("optioncss") == 'print') { ?> <?php if (GETPOST("optioncss") == 'print') { ?>
display:none; display:none;
<?php } else { ?> <?php } else { ?>
height: <?php print ($heightmenu2+1); ?>px; height: <?php print ($heightmenu2+1); ?>px;
padding-<?php echo $right; ?>: 100px; padding-<?php echo $right; ?>: 100px;
background: <?php echo $colorbackvmenu; ?>;
box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) );
<?php } ?> <?php } ?>
} }
@ -630,7 +635,7 @@ ul.tmenu { /* t r b l */
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
list-style: none; list-style: none;
box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; /* box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; */
} }
ul.tmenu li { ul.tmenu li {
background: rgb(<?php echo $colorbackhmenu1 ?>); background: rgb(<?php echo $colorbackhmenu1 ?>);
@ -922,6 +927,9 @@ div.login_block {
display: none; display: none;
<?php } ?> <?php } ?>
} }
div.login_block a {
color: #fff;
}
div.login_block table { div.login_block table {
display: inline; display: inline;
} }
@ -1720,6 +1728,10 @@ table.noborder, table.formdoc, div.noborder {
border-collapse: separate !important; border-collapse: separate !important;
border-spacing: 0px; border-spacing: 0px;
border-top-width: 1px;
border-top-color: #CCC;
border-top-style: solid;
border-right-width: 1px; border-right-width: 1px;
border-right-color: #CCC; border-right-color: #CCC;
border-right-style: solid; border-right-style: solid;
@ -1788,6 +1800,10 @@ table.liste {
border-collapse: collapse; border-collapse: collapse;
border-top-color: #FEFEFE; border-top-color: #FEFEFE;
border-top-width: 1px;
border-top-color: #CCC;
border-top-style: solid;
border-right-width: 1px; border-right-width: 1px;
border-right-color: #CCC; border-right-color: #CCC;
border-right-style: solid; border-right-style: solid;
@ -1896,6 +1912,22 @@ div.liste_titre .tagtd {
} }
div.liste_titre { div.liste_titre {
min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */ min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */
padding-left: 3px;
padding-top: 2px;
padding-bottom: 2px;
border-right-width: 1px;
border-right-color: #CCC;
border-right-style: solid;
border-left-width: 1px;
border-left-color: #CCC;
border-left-style: solid;
border-top-width: 1px;
border-top-color: #CCC;
border-top-style: solid;
} }
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
{ {
@ -1903,15 +1935,19 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
} }
div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
{ {
background: rgb(<?php echo $colorbacktitle1; ?>); /* TO MATCH BOOTSTRAP */
background-repeat: repeat-x; /*background: #ddd;
color: #000 !important;*/
/* TO MATCH ELDY */
background: rgb(<?php echo $colorbacktitle1; ?>);
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
font-weight: bold;
font-weight: bold;
color: #<?php echo $colortexttitle; ?>; color: #<?php echo $colortexttitle; ?>;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -1926,7 +1962,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: bold; font-weight: bold;
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; /* text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; */
vertical-align: middle; vertical-align: middle;
} }
tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a { tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
@ -1936,16 +1972,13 @@ tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, fo
text-shadow: none !important; text-shadow: none !important;
color: #<?php echo $colortexttitle; ?>; color: #<?php echo $colortexttitle; ?>;
} }
div.liste_titre {
padding-left: 3px;
}
tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: normal; font-weight: normal;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
text-decoration: underline; text-decoration: underline;
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; /* text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; */
} }
input.liste_titre { input.liste_titre {
background: transparent; background: transparent;
@ -2023,18 +2056,21 @@ div.tabBar .noborder {
tr.box_titre { tr.box_titre {
height: 26px; height: 26px;
background: rgb(<?php echo $colorbacktitle1; ?>);
background-repeat: repeat-x;
background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); /* TO MATCH BOOTSTRAP */
background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); /*background: #ddd;
background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); color: #000 !important;*/
background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
color: #<?php echo $colortexttitle; ?>; /* TO MATCH ELDY */
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>; background: rgb(<?php echo $colorbacktitle1; ?>);
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
color: #<?php echo $colortexttitle; ?>;
// text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
font-family: <?php print $fontlist ?>, sans-serif; font-family: <?php print $fontlist ?>, sans-serif;
font-weight: bold; font-weight: bold;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
@ -2278,24 +2314,25 @@ table.valid {
/* ============================================================================== */ /* ============================================================================== */
#tooltip { #tooltip {
position: absolute; position: absolute;
width: <?php print dol_size(450,'width'); ?>px; width: <?php print dol_size(450,'width'); ?>px;
border-top: solid 1px #BBBBBB; border-top: solid 1px #BBBBBB;
border-<?php print $left; ?>: solid 1px #BBBBBB; border-<?php print $left; ?>: solid 1px #BBBBBB;
border-<?php print $right; ?>: solid 1px #444444; border-<?php print $right; ?>: solid 1px #444444;
border-bottom: solid 1px #444444; border-bottom: solid 1px #444444;
padding: 2px; padding: 2px;
z-index: 3000; z-index: 3000;
background-color: #EFCFAA; background-color: #FFF;
opacity: 1; opacity: 1;
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
} }
#tiptip_content { #tiptip_content {
background-color: rgb(252,248,246); background-color: rgb(255,255,255);
background-color: rgba(252,248,246,0.95); background-color: rgba(255,255,255,0.95);
line-height: 1.4em; line-height: 1.4em;
min-width: 200px;
} }
/* ============================================================================== */ /* ============================================================================== */

156
htdocs/user/card.php
View File

@ -723,7 +723,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<tr>'; print '<tr>';
// Lastname // Lastname
print '<td valign="top" width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>'; print '<td width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
print '<td>'; print '<td>';
if (! empty($ldap_lastname)) if (! empty($ldap_lastname))
{ {
@ -737,7 +737,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td></tr>'; print '</td></tr>';
// Firstname // Firstname
print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>'; print '<tr><td>'.$langs->trans("Firstname").'</td>';
print '<td>'; print '<td>';
if (! empty($ldap_firstname)) if (! empty($ldap_firstname))
{ {
@ -751,13 +751,13 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td></tr>'; print '</td></tr>';
// Position/Job // Position/Job
print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>'; print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
print '<td>'; print '<td>';
print '<input size="30" type="text" name="job" value="'.GETPOST('job').'">'; print '<input size="30" type="text" name="job" value="'.GETPOST('job').'">';
print '</td></tr>'; print '</td></tr>';
// Login // Login
print '<tr><td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>'; print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
print '<td>'; print '<td>';
if (! empty($ldap_login)) if (! empty($ldap_login))
{ {
@ -784,7 +784,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
$password=$generated_password; $password=$generated_password;
// Password // Password
print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Password").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td>';
print '<td>'; print '<td>';
if (! empty($ldap_sid)) if (! empty($ldap_sid))
{ {
@ -808,7 +808,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Administrator // Administrator
if (! empty($user->admin)) if (! empty($user->admin))
{ {
print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>'; print '<tr><td>'.$langs->trans("Administrator").'</td>';
print '<td>'; print '<td>';
print $form->selectyesno('admin',GETPOST('admin'),1); print $form->selectyesno('admin',GETPOST('admin'),1);
@ -850,13 +850,13 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
// Type // Type
print '<tr><td valign="top">'.$langs->trans("Type").'</td>'; print '<tr><td>'.$langs->trans("Type").'</td>';
print '<td>'; print '<td>';
print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc")); print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
print '</td></tr>'; print '</td></tr>';
// Tel // Tel
print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>'; print '<tr><td>'.$langs->trans("PhonePro").'</td>';
print '<td>'; print '<td>';
if (! empty($ldap_phone)) if (! empty($ldap_phone))
{ {
@ -870,7 +870,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td></tr>'; print '</td></tr>';
// Tel portable // Tel portable
print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>'; print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
print '<td>'; print '<td>';
if (! empty($ldap_mobile)) if (! empty($ldap_mobile))
{ {
@ -884,7 +884,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td></tr>'; print '</td></tr>';
// Fax // Fax
print '<tr><td valign="top">'.$langs->trans("Fax").'</td>'; print '<tr><td>'.$langs->trans("Fax").'</td>';
print '<td>'; print '<td>';
if (! empty($ldap_fax)) if (! empty($ldap_fax))
{ {
@ -900,7 +900,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Skype // Skype
if (! empty($conf->skype->enabled)) if (! empty($conf->skype->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("Skype").'</td>'; print '<tr><td>'.$langs->trans("Skype").'</td>';
print '<td>'; print '<td>';
if (! empty($ldap_skype)) if (! empty($ldap_skype))
{ {
@ -915,7 +915,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
// EMail // EMail
print '<tr><td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>'; print '<tr><td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
print '<td>'; print '<td>';
if (! empty($ldap_mail)) if (! empty($ldap_mail))
{ {
@ -929,7 +929,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td></tr>'; print '</td></tr>';
// Signature // Signature
print '<tr><td valign="top">'.$langs->trans("Signature").'</td>'; print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,90); $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,90);
@ -941,7 +941,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
{ {
if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity && is_object($mc)) if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity && is_object($mc))
{ {
print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>'; print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
print "<td>".$mc->select_entities($conf->entity); print "<td>".$mc->select_entities($conf->entity);
print "</td></tr>\n"; print "</td></tr>\n";
} }
@ -952,7 +952,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
// Hierarchy // Hierarchy
print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>'; print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
print '<td>'; print '<td>';
print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$conf->entity); print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$conf->entity);
print '</td>'; print '</td>';
@ -963,21 +963,21 @@ if (($action == 'create') || ($action == 'adduserldap'))
$langs->load("salaries"); $langs->load("salaries");
// THM // THM
print '<tr><td valign="top">'.$langs->trans("THM").'</td>'; print '<tr><td>'.$langs->trans("THM").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="thm" value="'.GETPOST('thm').'">'; print '<input size="8" type="text" name="thm" value="'.GETPOST('thm').'">';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
// TJM // TJM
print '<tr><td valign="top">'.$langs->trans("TJM").'</td>'; print '<tr><td>'.$langs->trans("TJM").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="tjm" value="'.GETPOST('tjm').'">'; print '<input size="8" type="text" name="tjm" value="'.GETPOST('tjm').'">';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
// Salary // Salary
print '<tr><td valign="top">'.$langs->trans("Salary").'</td>'; print '<tr><td>'.$langs->trans("Salary").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="salary" value="'.GETPOST('salary').'">'; print '<input size="8" type="text" name="salary" value="'.GETPOST('salary').'">';
print '</td>'; print '</td>';
@ -985,7 +985,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
// Weeklyhours // Weeklyhours
print '<tr><td valign="top">'.$langs->trans("WeeklyHours").'</td>'; print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">'; print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
print '</td>'; print '</td>';
@ -994,7 +994,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Accountancy code // Accountancy code
if ($conf->salaries->enabled) if ($conf->salaries->enabled)
{ {
print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>'; print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
print '<td>'; print '<td>';
print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">'; print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
print '</td></tr>'; print '</td></tr>';
@ -1003,14 +1003,14 @@ if (($action == 'create') || ($action == 'adduserldap'))
// User color // User color
if (! empty($conf->agenda->enabled)) if (! empty($conf->agenda->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("ColorUser").'</td>'; print '<tr><td>'.$langs->trans("ColorUser").'</td>';
print '<td>'; print '<td>';
print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset'); print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset');
print '</td></tr>'; print '</td></tr>';
} }
// Note // Note
print '<tr><td valign="top">'; print '<tr><td class="tdtop">';
print $langs->trans("Note"); print $langs->trans("Note");
print '</td><td>'; print '</td><td>';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@ -1149,7 +1149,7 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref // Ref
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>'; print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin); print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
print '</td>'; print '</td>';
@ -1163,7 +1163,7 @@ else
if (! empty($conf->agenda->enabled)) $rowspan++; if (! empty($conf->agenda->enabled)) $rowspan++;
// Lastname // Lastname
print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>'; print '<tr><td>'.$langs->trans("Lastname").'</td>';
print '<td colspan="2">'.$object->lastname.'</td>'; print '<td colspan="2">'.$object->lastname.'</td>';
// Photo // Photo
@ -1174,17 +1174,17 @@ else
print '</tr>'."\n"; print '</tr>'."\n";
// Firstname // Firstname
print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>'; print '<tr><td>'.$langs->trans("Firstname").'</td>';
print '<td colspan="2">'.$object->firstname.'</td>'; print '<td colspan="2">'.$object->firstname.'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
// Position/Job // Position/Job
print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>'; print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
print '<td colspan="2">'.$object->job.'</td>'; print '<td colspan="2">'.$object->job.'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
// Login // Login
print '<tr><td valign="top">'.$langs->trans("Login").'</td>'; print '<tr><td>'.$langs->trans("Login").'</td>';
if (! empty($object->ldap_sid) && $object->statut==0) if (! empty($object->ldap_sid) && $object->statut==0)
{ {
print '<td colspan="2" class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>'; print '<td colspan="2" class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
@ -1196,7 +1196,7 @@ else
print '</tr>'."\n"; print '</tr>'."\n";
// Password // Password
print '<tr><td valign="top">'.$langs->trans("Password").'</td>'; print '<tr><td>'.$langs->trans("Password").'</td>';
if (! empty($object->ldap_sid)) if (! empty($object->ldap_sid))
{ {
if ($passDoNotExpire) if ($passDoNotExpire)
@ -1230,7 +1230,7 @@ else
print '</tr>'."\n"; print '</tr>'."\n";
// Administrator // Administrator
print '<tr><td valign="top">'.$langs->trans("Administrator").'</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Administrator").'</td><td colspan="2">';
if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity) if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity)
{ {
print $form->textwithpicto(yn($object->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin"); print $form->textwithpicto(yn($object->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
@ -1246,7 +1246,7 @@ else
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Type // Type
print '<tr><td valign="top">'.$langs->trans("Type").'</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Type").'</td><td colspan="2">';
$type=$langs->trans("Internal"); $type=$langs->trans("Internal");
if ($object->societe_id) $type=$langs->trans("External"); if ($object->societe_id) $type=$langs->trans("External");
print $form->textwithpicto($type,$langs->trans("InternalExternalDesc")); print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
@ -1256,46 +1256,46 @@ else
// Ldap sid // Ldap sid
if ($object->ldap_sid) if ($object->ldap_sid)
{ {
print '<tr><td valign="top">'.$langs->trans("Type").'</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Type").'</td><td colspan="2">';
print $langs->trans("DomainUser",$ldap->domainFQDN); print $langs->trans("DomainUser",$ldap->domainFQDN);
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }
// Tel pro // Tel pro
print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>'; print '<tr><td>'.$langs->trans("PhonePro").'</td>';
print '<td colspan="2">'.dol_print_phone($object->office_phone,'',0,0,1).'</td>'; print '<td colspan="2">'.dol_print_phone($object->office_phone,'',0,0,1).'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
// Tel mobile // Tel mobile
print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>'; print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
print '<td colspan="2">'.dol_print_phone($object->user_mobile,'',0,0,1).'</td>'; print '<td colspan="2">'.dol_print_phone($object->user_mobile,'',0,0,1).'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
// Fax // Fax
print '<tr><td valign="top">'.$langs->trans("Fax").'</td>'; print '<tr><td>'.$langs->trans("Fax").'</td>';
print '<td colspan="2">'.dol_print_phone($object->office_fax,'',0,0,1).'</td>'; print '<td colspan="2">'.dol_print_phone($object->office_fax,'',0,0,1).'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
// Skype // Skype
if (! empty($conf->skype->enabled)) if (! empty($conf->skype->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("Skype").'</td>'; print '<tr><td>'.$langs->trans("Skype").'</td>';
print '<td colspan="2">'.dol_print_skype($object->skype,0,0,1).'</td>'; print '<td colspan="2">'.dol_print_skype($object->skype,0,0,1).'</td>';
print "</tr>\n"; print "</tr>\n";
} }
// EMail // EMail
print '<tr><td valign="top">'.$langs->trans("EMail").'</td>'; print '<tr><td>'.$langs->trans("EMail").'</td>';
print '<td colspan="2">'.dol_print_email($object->email,0,0,1).'</td>'; print '<td colspan="2">'.dol_print_email($object->email,0,0,1).'</td>';
print "</tr>\n"; print "</tr>\n";
// Signature // Signature
print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td colspan="2">'; print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td colspan="2">';
print dol_htmlentitiesbr($object->signature); print dol_htmlentitiesbr($object->signature);
print "</td></tr>\n"; print "</td></tr>\n";
// Hierarchy // Hierarchy
print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>'; print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
if (empty($object->fk_user)) print $langs->trans("None"); if (empty($object->fk_user)) print $langs->trans("None");
else { else {
@ -1311,21 +1311,21 @@ else
$langs->load("salaries"); $langs->load("salaries");
// THM // THM
print '<tr><td valign="top">'.$langs->trans("THM").'</td>'; print '<tr><td>'.$langs->trans("THM").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print ($object->thm!=''?price($object->thm,'',$langs,1,-1,-1,$conf->currency):''); print ($object->thm!=''?price($object->thm,'',$langs,1,-1,-1,$conf->currency):'');
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
// TJM // TJM
print '<tr><td valign="top">'.$langs->trans("TJM").'</td>'; print '<tr><td>'.$langs->trans("TJM").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print ($object->tjm!=''?price($object->tjm,'',$langs,1,-1,-1,$conf->currency):''); print ($object->tjm!=''?price($object->tjm,'',$langs,1,-1,-1,$conf->currency):'');
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
// Salary // Salary
print '<tr><td valign="top">'.$langs->trans("Salary").'</td>'; print '<tr><td>'.$langs->trans("Salary").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print ($object->salary!=''?price($object->salary,'',$langs,1,-1,-1,$conf->currency):''); print ($object->salary!=''?price($object->salary,'',$langs,1,-1,-1,$conf->currency):'');
print '</td>'; print '</td>';
@ -1333,7 +1333,7 @@ else
} }
// Weeklyhours // Weeklyhours
print '<tr><td valign="top">'.$langs->trans("WeeklyHours").'</td>'; print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print price2num($object->weeklyhours); print price2num($object->weeklyhours);
print '</td>'; print '</td>';
@ -1342,14 +1342,14 @@ else
// Accountancy code // Accountancy code
if ($conf->salaries->enabled) if ($conf->salaries->enabled)
{ {
print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>'; print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
print '<td colspan="2">'.$object->accountancy_code.'</td>'; print '<td colspan="2">'.$object->accountancy_code.'</td>';
} }
// Color user // Color user
if (! empty($conf->agenda->enabled)) if (! empty($conf->agenda->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("ColorUser").'</td>'; print '<tr><td>'.$langs->trans("ColorUser").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
if ($object->color) print '<input type="text" disabled style="padding: 0; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">'; if ($object->color) print '<input type="text" disabled style="padding: 0; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">';
print '</td>'; print '</td>';
@ -1357,23 +1357,23 @@ else
} }
// Status // Status
print '<tr><td valign="top">'.$langs->trans("Status").'</td>'; print '<tr><td>'.$langs->trans("Status").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print $object->getLibStatut(4); print $object->getLibStatut(4);
print '</td>'; print '</td>';
print '</tr>'."\n"; print '</tr>'."\n";
print '<tr><td valign="top">'.$langs->trans("LastConnexion").'</td>'; print '<tr><td>'.$langs->trans("LastConnexion").'</td>';
print '<td colspan="2">'.dol_print_date($object->datelastlogin,"dayhour").'</td>'; print '<td colspan="2">'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
print "</tr>\n"; print "</tr>\n";
print '<tr><td valign="top">'.$langs->trans("PreviousConnexion").'</td>'; print '<tr><td>'.$langs->trans("PreviousConnexion").'</td>';
print '<td colspan="2">'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>'; print '<td colspan="2">'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
print "</tr>\n"; print "</tr>\n";
if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
{ {
print '<tr><td valign="top">'.$langs->trans("OpenIDURL").'</td>'; print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
print '<td colspan="2">'.$object->openid.'</td>'; print '<td colspan="2">'.$object->openid.'</td>';
print "</tr>\n"; print "</tr>\n";
} }
@ -1381,7 +1381,7 @@ else
// Company / Contact // Company / Contact
if (! empty($conf->societe->enabled)) if (! empty($conf->societe->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("LinkToCompanyContact").'</td>'; print '<tr><td>'.$langs->trans("LinkToCompanyContact").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
if (isset($object->societe_id) && $object->societe_id > 0) if (isset($object->societe_id) && $object->societe_id > 0)
{ {
@ -1409,7 +1409,7 @@ else
if (! empty($conf->adherent->enabled)) if (! empty($conf->adherent->enabled))
{ {
$langs->load("members"); $langs->load("members");
print '<tr><td valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>'; print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
if ($object->fk_member) if ($object->fk_member)
{ {
@ -1432,7 +1432,7 @@ else
{ {
if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity) if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{ {
print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">'; print '<tr><td>'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
if (empty($object->entity)) if (empty($object->entity))
{ {
print $langs->trans("AllEntities"); print $langs->trans("AllEntities");
@ -1578,7 +1578,7 @@ else
{ {
if ($conf->entity == 1 && $conf->multicompany->transverse_mode) if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
{ {
print '</td><td valign="top">'.$langs->trans("Entity").'</td>'; print '</td><td>'.$langs->trans("Entity").'</td>';
print "<td>".$mc->select_entities($conf->entity); print "<td>".$mc->select_entities($conf->entity);
} }
else else
@ -1691,7 +1691,7 @@ else
print '<table width="100%" class="border">'; print '<table width="100%" class="border">';
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>'; print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print $object->id; print $object->id;
print '</td>'; print '</td>';
@ -1699,7 +1699,7 @@ else
// Lastname // Lastname
print "<tr>"; print "<tr>";
print '<td valign="top" class="fieldrequired">'.$langs->trans("Lastname").'</td>'; print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && !$object->ldap_sid) if ($caneditfield && !$object->ldap_sid)
{ {
@ -1728,7 +1728,7 @@ else
print '</tr>'; print '</tr>';
// Firstname // Firstname
print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>'; print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && !$object->ldap_sid) if ($caneditfield && !$object->ldap_sid)
{ {
@ -1742,7 +1742,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Position/Job // Position/Job
print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>'; print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield)
{ {
@ -1756,7 +1756,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Login // Login
print "<tr>".'<td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>'; print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
print '<td>'; print '<td>';
if ($user->admin && !$object->ldap_sid) if ($user->admin && !$object->ldap_sid)
{ {
@ -1771,7 +1771,7 @@ else
print '</tr>'; print '</tr>';
// Pass // Pass
print '<tr><td valign="top">'.$langs->trans("Password").'</td>'; print '<tr><td>'.$langs->trans("Password").'</td>';
print '<td>'; print '<td>';
if ($object->ldap_sid) if ($object->ldap_sid)
{ {
@ -1793,7 +1793,7 @@ else
print "</td></tr>\n"; print "</td></tr>\n";
// Administrator // Administrator
print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>'; print '<tr><td>'.$langs->trans("Administrator").'</td>';
if ($object->societe_id > 0) if ($object->societe_id > 0)
{ {
$langs->load("admin"); $langs->load("admin");
@ -1870,7 +1870,7 @@ else
} }
// Type // Type
print '<tr><td width="25%" valign="top">'.$langs->trans("Type").'</td>'; print '<tr><td width="25%">'.$langs->trans("Type").'</td>';
print '<td>'; print '<td>';
if ($user->id == $object->id || ! $user->admin) if ($user->id == $object->id || ! $user->admin)
{ {
@ -1889,7 +1889,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Tel pro // Tel pro
print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>'; print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && empty($object->ldap_sid)) if ($caneditfield && empty($object->ldap_sid))
{ {
@ -1903,7 +1903,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Tel mobile // Tel mobile
print "<tr>".'<td valign="top">'.$langs->trans("PhoneMobile").'</td>'; print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && empty($object->ldap_sid)) if ($caneditfield && empty($object->ldap_sid))
{ {
@ -1917,7 +1917,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Fax // Fax
print "<tr>".'<td valign="top">'.$langs->trans("Fax").'</td>'; print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && empty($object->ldap_sid)) if ($caneditfield && empty($object->ldap_sid))
{ {
@ -1933,7 +1933,7 @@ else
// Skype // Skype
if (! empty($conf->skype->enabled)) if (! empty($conf->skype->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("Skype").'</td>'; print '<tr><td>'.$langs->trans("Skype").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && empty($object->ldap_sid)) if ($caneditfield && empty($object->ldap_sid))
{ {
@ -1948,7 +1948,7 @@ else
} }
// EMail // EMail
print "<tr>".'<td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>'; print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && empty($object->ldap_sid)) if ($caneditfield && empty($object->ldap_sid))
{ {
@ -1962,7 +1962,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Signature // Signature
print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>'; print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield)
{ {
@ -1979,7 +1979,7 @@ else
// OpenID url // OpenID url
if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
{ {
print "<tr>".'<td valign="top">'.$langs->trans("OpenIDURL").'</td>'; print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield)
{ {
@ -1994,7 +1994,7 @@ else
} }
// Hierarchy // Hierarchy
print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>'; print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield)
{ {
@ -2015,21 +2015,21 @@ else
$langs->load("salaries"); $langs->load("salaries");
// THM // THM
print '<tr><td valign="top">'.$langs->trans("THM").'</td>'; print '<tr><td>'.$langs->trans("THM").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">'; print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
// TJM // TJM
print '<tr><td valign="top">'.$langs->trans("TJM").'</td>'; print '<tr><td>'.$langs->trans("TJM").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">'; print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
// Salary // Salary
print '<tr><td valign="top">'.$langs->trans("Salary").'</td>'; print '<tr><td>'.$langs->trans("Salary").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">'; print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
print '</td>'; print '</td>';
@ -2037,7 +2037,7 @@ else
} }
// Weeklyhours // Weeklyhours
print '<tr><td valign="top">'.$langs->trans("WeeklyHours").'</td>'; print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
print '<td>'; print '<td>';
print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">'; print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
print '</td>'; print '</td>';
@ -2047,7 +2047,7 @@ else
if ($conf->salaries->enabled) if ($conf->salaries->enabled)
{ {
print "<tr>"; print "<tr>";
print '<td valign="top">'.$langs->trans("AccountancyCode").'</td>'; print '<td>'.$langs->trans("AccountancyCode").'</td>';
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield)
{ {
@ -2065,14 +2065,14 @@ else
// User color // User color
if (! empty($conf->agenda->enabled)) if (! empty($conf->agenda->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans("ColorUser").'</td>'; print '<tr><td>'.$langs->trans("ColorUser").'</td>';
print '<td>'; print '<td>';
print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset'); print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset');
print '</td></tr>'; print '</td></tr>';
} }
// Status // Status
print '<tr><td valign="top">'.$langs->trans("Status").'</td>'; print '<tr><td>'.$langs->trans("Status").'</td>';
print '<td>'; print '<td>';
print $object->getLibStatut(4); print $object->getLibStatut(4);
print '</td></tr>'; print '</td></tr>';
@ -2080,7 +2080,7 @@ else
// Company / Contact // Company / Contact
if (! empty($conf->societe->enabled)) if (! empty($conf->societe->enabled))
{ {
print '<tr><td width="25%" valign="top">'.$langs->trans("LinkToCompanyContact").'</td>'; print '<tr><td width="25%">'.$langs->trans("LinkToCompanyContact").'</td>';
print '<td>'; print '<td>';
if ($object->societe_id > 0) if ($object->societe_id > 0)
{ {
@ -2107,7 +2107,7 @@ else
if (! empty($conf->adherent->enabled)) if (! empty($conf->adherent->enabled))
{ {
$langs->load("members"); $langs->load("members");
print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>'; print '<tr><td width="25%">'.$langs->trans("LinkedToDolibarrMember").'</td>';
print '<td>'; print '<td>';
if ($object->fk_member) if ($object->fk_member)
{ {
@ -2129,7 +2129,7 @@ else
{ {
if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity) if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{ {
print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>'; print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1); // last parameter 1 means, show also a choice 0=>'all entities' print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1); // last parameter 1 means, show also a choice 0=>'all entities'
print "</td></tr>\n"; print "</td></tr>\n";
} }