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

Uniformize css rules

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-16 20:33:51 +01:00
parent dba6d99686
commit 35b79818b7
3 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formother.class.php
View File

@ -72,7 +72,7 @@ class FormOther
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
print '<select class="flat" name="'.$htmlname.'">'; print '<select class="flat minwidth200" name="'.$htmlname.'">';
if ($useempty) if ($useempty)
{ {
print '<option value="-1">&nbsp;</option>'; print '<option value="-1">&nbsp;</option>';

2
htdocs/core/modules/modSociete.class.php
View File

@ -270,7 +270,7 @@ class modSociete extends DolibarrModules
include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
$this->export_fields_array[$r]+=array('u.login'=>'SaleRepresentativeLogin','u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname'); $this->export_fields_array[$r]+=array('u.login'=>'SaleRepresentativeLogin','u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname');
//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid'); //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text','payterm.libelle'=>'Text','paymode.libelle'=>'Text','s.entity'=>'Numeric'); $this->export_TypeFields_array[$r]=array('s.rowid'=>"Numeric", 's.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text','payterm.libelle'=>'Text','paymode.libelle'=>'Text','s.entity'=>'Numeric');
$this->export_entities_array[$r]=array('u.login'=>'user','u.firstname'=>'user','u.lastname'=>'user'); // We define here only fields that use another picto $this->export_entities_array[$r]=array('u.login'=>'user','u.firstname'=>'user','u.lastname'=>'user'); // We define here only fields that use another picto
$this->export_examplevalues_array[$r]=array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 (not a supplier) or 1 (supplier)'); $this->export_examplevalues_array[$r]=array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 (not a supplier) or 1 (supplier)');

49
htdocs/exports/export.php
View File

@ -510,19 +510,21 @@ if ($step == 2 && $datatoexport)
$hselected=$h; $hselected=$h;
$h++; $h++;
dol_fiche_head($head, $hselected, $langs->trans("NewExport")); dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table width="100%" class="border">'; print '<table width="100%" class="border">';
// Module // Module
print '<tr><td width="25%">'.$langs->trans("Module").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
print '<td>'; print '<td>';
//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
print $objexport->array_export_module[0]->getName(); print $objexport->array_export_module[0]->getName();
print '</td></tr>'; print '</td></tr>';
// Lot de donnees a exporter // Lot de donnees a exporter
print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>'; print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
print '<td>'; print '<td>';
$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]); $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
$label=$objexport->array_export_label[0]; $label=$objexport->array_export_label[0];
@ -532,6 +534,10 @@ if ($step == 2 && $datatoexport)
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print '</div>';
dol_fiche_end();
print '<br>'; print '<br>';
// Combo list of export models // Combo list of export models
@ -543,6 +549,7 @@ if ($step == 2 && $datatoexport)
print '<table><tr><td colspan="2">'; print '<table><tr><td colspan="2">';
print $langs->trans("SelectExportFields").' '; print $langs->trans("SelectExportFields").' ';
$htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1); $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
print ' ';
print '<input type="submit" class="button" value="'.$langs->trans("Select").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
print '</td></tr></table>'; print '</td></tr></table>';
print '</form>'; print '</form>';
@ -635,7 +642,6 @@ if ($step == 2 && $datatoexport)
print '</table>'; print '</table>';
print '</div>';
/* /*
* Barre d'action * Barre d'action
@ -693,19 +699,21 @@ if ($step == 3 && $datatoexport)
$hselected=$h; $hselected=$h;
$h++; $h++;
dol_fiche_head($head, $hselected, $langs->trans("NewExport")); dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table width="100%" class="border">'; print '<table width="100%" class="border">';
// Module // Module
print '<tr><td width="25%">'.$langs->trans("Module").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
print '<td>'; print '<td>';
//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
print $objexport->array_export_module[0]->getName(); print $objexport->array_export_module[0]->getName();
print '</td></tr>'; print '</td></tr>';
// Lot de donnees a exporter // Lot de donnees a exporter
print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>'; print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
print '<td>'; print '<td>';
$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]); $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
$label=$objexport->array_export_label[0]; $label=$objexport->array_export_label[0];
@ -715,7 +723,7 @@ if ($step == 3 && $datatoexport)
print '</td></tr>'; print '</td></tr>';
// Nbre champs exportes // Nbre champs exportes
print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>'; print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
$list=''; $list='';
foreach($array_selected as $code=>$value) foreach($array_selected as $code=>$value)
{ {
@ -725,6 +733,8 @@ if ($step == 3 && $datatoexport)
print '<td>'.$list.'</td></tr>'; print '<td>'.$list.'</td></tr>';
print '</table>'; print '</table>';
print '</div>';
print '<br>'; print '<br>';
// Combo list of export models // Combo list of export models
@ -866,8 +876,10 @@ if ($step == 4 && $datatoexport)
$hselected=$h; $hselected=$h;
$h++; $h++;
dol_fiche_head($head, $hselected, $langs->trans("NewExport")); dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table width="100%" class="border">'; print '<table width="100%" class="border">';
// Module // Module
@ -918,6 +930,8 @@ if ($step == 4 && $datatoexport)
} }
print '</table>'; print '</table>';
print '</div>';
print '<br>'; print '<br>';
// Select request if all fields are selected // Select request if all fields are selected
@ -1102,7 +1116,7 @@ if ($step == 5 && $datatoexport)
$hselected=$h; $hselected=$h;
$h++; $h++;
dol_fiche_head($head, $hselected, $langs->trans("NewExport")); dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
/* /*
* Confirmation suppression fichier * Confirmation suppression fichier
@ -1113,17 +1127,20 @@ if ($step == 5 && $datatoexport)
} }
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table width="100%" class="border">'; print '<table width="100%" class="border">';
// Module // Module
print '<tr><td width="25%">'.$langs->trans("Module").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
print '<td>'; print '<td>';
//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
print $objexport->array_export_module[0]->getName(); print $objexport->array_export_module[0]->getName();
print '</td></tr>'; print '</td></tr>';
// Lot de donnees a exporter // Lot de donnees a exporter
print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>'; print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
print '<td>'; print '<td>';
$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]); $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
print img_object($objexport->array_export_module[0]->getName(), $icon).' '; print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
@ -1131,7 +1148,7 @@ if ($step == 5 && $datatoexport)
print '</td></tr>'; print '</td></tr>';
// List of exported fields // List of exported fields
print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>'; print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
$list=''; $list='';
foreach($array_selected as $code=>$label) foreach($array_selected as $code=>$label)
{ {
@ -1143,7 +1160,7 @@ if ($step == 5 && $datatoexport)
// List of filtered fiels // List of filtered fiels
if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
{ {
print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>'; print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
$list=''; $list='';
if (! empty($array_filtervalue)) if (! empty($array_filtervalue))
{ {
@ -1162,6 +1179,8 @@ if ($step == 5 && $datatoexport)
} }
print '</table>'; print '</table>';
print '</div>';
print '<br>'; print '<br>';
print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>'; print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>';
@ -1222,8 +1241,6 @@ if ($step == 5 && $datatoexport)
print '</div></div></div>'; print '</div></div></div>';
} }
print '<br>';
llxFooter(); llxFooter();
$db->close(); $db->close();