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

Fix: Pb with firstname/lastname and font size

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-19 18:08:05 +02:00
parent 5cb2ba3909
commit 09317e2034
8 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/class/contact.class.php
View File

@ -107,7 +107,7 @@ class Contact extends CommonObject
$this->db->begin(); $this->db->begin();
// Clean parameters // Clean parameters
$this->lastname=$this->lastname?trim($this->lastname):$this->lastname; $this->lastname=$this->lastname?trim($this->lastname):trim($this->name);
$this->firstname=trim($this->firstname); $this->firstname=trim($this->firstname);
if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname); if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname); if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);

1
htdocs/core/class/commonobject.class.php
View File

@ -64,6 +64,7 @@ abstract class CommonObject
{ {
global $conf; global $conf;
//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
$lastname=$this->lastname; $lastname=$this->lastname;
$firstname=$this->firstname; $firstname=$this->firstname;
if (empty($lastname)) $lastname=($this->lastname?$this->lastname:($this->name?$this->name:$this->nom)); if (empty($lastname)) $lastname=($this->lastname?$this->lastname:($this->name?$this->name:$this->nom));

12
htdocs/societe/soc.php
View File

@ -115,15 +115,15 @@ if (empty($reshook))
{ {
$object->particulier = GETPOST("private"); $object->particulier = GETPOST("private");
$object->name = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?GETPOST('firstname').' '.GETPOST('nom'):GETPOST('nom').' '.GETPOST('firstname'); $object->name = dolGetFirstLastname(GETPOST('firstname'),GETPOST('nom')?GETPOST('nom'):GETPOST('name'));
$object->civilite_id = GETPOST('civilite_id'); $object->civilite_id = GETPOST('civilite_id');
// Add non official properties // Add non official properties
$object->name_bis = GETPOST('nom'); $object->name_bis = GETPOST('name')?GETPOST('name'):GETPOST('nom');
$object->firstname = GETPOST('firstname'); $object->firstname = GETPOST('firstname');
} }
else else
{ {
$object->name = GETPOST('nom'); $object->name = GETPOST('name')?GETPOST('name'):GETPOST('nom');
} }
$object->address = GETPOST('address'); $object->address = GETPOST('address');
$object->zip = GETPOST('zipcode'); $object->zip = GETPOST('zipcode');
@ -138,6 +138,8 @@ if (empty($reshook))
$object->idprof2 = GETPOST('idprof2'); $object->idprof2 = GETPOST('idprof2');
$object->idprof3 = GETPOST('idprof3'); $object->idprof3 = GETPOST('idprof3');
$object->idprof4 = GETPOST('idprof4'); $object->idprof4 = GETPOST('idprof4');
$object->idprof5 = GETPOST('idprof5');
$object->idprof6 = GETPOST('idprof6');
$object->prefix_comm = GETPOST('prefix_comm'); $object->prefix_comm = GETPOST('prefix_comm');
$object->code_client = GETPOST('code_client'); $object->code_client = GETPOST('code_client');
$object->code_fournisseur = GETPOST('code_fournisseur'); $object->code_fournisseur = GETPOST('code_fournisseur');
@ -602,6 +604,8 @@ else
$object->idprof2 = GETPOST('idprof2'); $object->idprof2 = GETPOST('idprof2');
$object->idprof3 = GETPOST('idprof3'); $object->idprof3 = GETPOST('idprof3');
$object->idprof4 = GETPOST('idprof4'); $object->idprof4 = GETPOST('idprof4');
$object->idprof5 = GETPOST('idprof5');
$object->idprof6 = GETPOST('idprof6');
$object->typent_id = GETPOST('typent_id'); $object->typent_id = GETPOST('typent_id');
$object->effectif_id = GETPOST('effectif_id'); $object->effectif_id = GETPOST('effectif_id');
$object->civility_id = GETPOST('civilite_id'); $object->civility_id = GETPOST('civilite_id');
@ -1081,6 +1085,8 @@ else
$object->idprof2 = GETPOST('idprof2'); $object->idprof2 = GETPOST('idprof2');
$object->idprof3 = GETPOST('idprof3'); $object->idprof3 = GETPOST('idprof3');
$object->idprof4 = GETPOST('idprof4'); $object->idprof4 = GETPOST('idprof4');
$object->idprof5 = GETPOST('idprof5');
$object->idprof6 = GETPOST('idprof6');
$object->typent_id = GETPOST('typent_id'); $object->typent_id = GETPOST('typent_id');
$object->effectif_id = GETPOST('effectif_id'); $object->effectif_id = GETPOST('effectif_id');
$object->barcode = GETPOST('barcode'); $object->barcode = GETPOST('barcode');

6
htdocs/theme/amarok/style.css.php
View File

@ -196,7 +196,7 @@ body {
background-color: <?php print $colorbackbody; ?>; background-color: <?php print $colorbackbody; ?>;
<?php } ?> <?php } ?>
color:#232323; color:#232323;
<?php if (empty($dol_use_jmobile)) { ?> <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size:<?php print $fontsize ?>px; font-size:<?php print $fontsize ?>px;
<?php } ?> <?php } ?>
font-family:<?php print $fontlist ?>; font-family:<?php print $fontlist ?>;
@ -2066,9 +2066,13 @@ li.ui-li-divider .ui-link {
color: #FFF !important; color: #FFF !important;
} }
.ui-btn-inner { .ui-btn-inner {
min-width: .4em;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
white-space: normal; white-space: normal;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
<?php } ?>
} }
.ui-select .ui-btn-icon-right .ui-btn-inner { .ui-select .ui-btn-icon-right .ui-btn-inner {
padding-right: 36px; padding-right: 36px;

6
htdocs/theme/auguria/style.css.php
View File

@ -102,7 +102,7 @@ body {
background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat; background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile)) { ?> <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?> <?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -2259,8 +2259,12 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
} }
.ui-btn-inner { .ui-btn-inner {
min-width: .4em;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
<?php } ?>
/* white-space: normal; */ /* Warning, enable this break the truncate feature */ /* white-space: normal; */ /* Warning, enable this break the truncate feature */
} }
.ui-select .ui-btn-icon-right .ui-btn-inner { .ui-select .ui-btn-icon-right .ui-btn-inner {

2
htdocs/theme/bureau2crea/style.css.php
View File

@ -79,7 +79,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
body { body {
/* background-color: #FFFFFF; */ /* background-color: #FFFFFF; */
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile)) { ?> <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?> <?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;

6
htdocs/theme/cameleo/style.css.php
View File

@ -83,7 +83,7 @@ body {
/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/ /*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile)) { ?> <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?> <?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -2304,8 +2304,12 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
} }
.ui-btn-inner { .ui-btn-inner {
min-width: .4em;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
<?php } ?>
/* white-space: normal; */ /* Warning, enable this break the truncate feature */ /* white-space: normal; */ /* Warning, enable this break the truncate feature */
} }
.ui-select .ui-btn-icon-right .ui-btn-inner { .ui-select .ui-btn-icon-right .ui-btn-inner {

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

@ -216,7 +216,7 @@ body {
background: <?php print $colorbackbody; ?>; background: <?php print $colorbackbody; ?>;
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile)) { ?> <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?> <?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -2622,17 +2622,27 @@ div.dolEventError h1, div.dolEventError h2 {
li.ui-li-divider .ui-link { li.ui-li-divider .ui-link {
color: #FFF !important; color: #FFF !important;
} }
.ui-btn {
margin: 0.2em 4px
}
a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover {
text-decoration: none !important; text-decoration: none !important;
} }
.ui-btn-inner { .ui-btn-inner {
min-width: .4em;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
<?php } ?>
/* white-space: normal; */ /* Warning, enable this break the truncate feature */ /* white-space: normal; */ /* Warning, enable this break the truncate feature */
} }
.ui-btn-icon-right .ui-btn-inner {
padding-right: 34px;
}
.ui-select .ui-btn-icon-right .ui-btn-inner { .ui-select .ui-btn-icon-right .ui-btn-inner {
padding-right: 36px; padding-right: 38px;
} }
.fiche .ui-controlgroup { .fiche .ui-controlgroup {
margin: 0px; margin: 0px;