Fix minor css

This commit is contained in:
Laurent Destailleur 2016-09-09 09:21:27 +02:00
parent 87165cd859
commit efde12b489
4 changed files with 36 additions and 10 deletions

View File

@ -48,7 +48,7 @@ $langs->load("cashdesk");
onfocus="javascript: this.select(); verifResultat('resultats_dhtml', this.value, <?php echo (isset($conf->global->BARCODE_USE_SEARCH_TO_SELECT) ? (int) $conf->global->BARCODE_USE_SEARCH_TO_SELECT : 1) ?>);" onfocus="javascript: this.select(); verifResultat('resultats_dhtml', this.value, <?php echo (isset($conf->global->BARCODE_USE_SEARCH_TO_SELECT) ? (int) $conf->global->BARCODE_USE_SEARCH_TO_SELECT : 1) ?>);"
onBlur="javascript: document.getElementById('resultats_dhtml').innerHTML = '';"/> onBlur="javascript: document.getElementById('resultats_dhtml').innerHTML = '';"/>
</td> </td>
<td class="select_design"> <td class="select_design maxwidthonsmartphone">
<?php /* <?php /*
$selected=''; $selected='';
$htmlname='idprod'; $htmlname='idprod';
@ -60,7 +60,7 @@ $langs->load("cashdesk");
*/ */
?> ?>
<select id="selProduit" name="selProduit" onchange="javascript: setSource('LISTE');"> <select id="selProduit" class="maxwidthonsmartphone" name="selProduit" onchange="javascript: setSource('LISTE');">
<?php <?php
print '<option value="0">'.$top_liste_produits.'</option>'."\n"; print '<option value="0">'.$top_liste_produits.'</option>'."\n";
@ -80,7 +80,7 @@ $langs->load("cashdesk");
$label = $tab_designations[$i]['label']; $label = $tab_designations[$i]['label'];
print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],7).' - '.dol_trunc($label,35,'middle'); print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],16).' - '.dol_trunc($label,35,'middle');
if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')'; if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
print '</option>'."\n"; print '</option>'."\n";

View File

@ -296,7 +296,7 @@ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],'','','','',$
print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="right"',$sortfield,$sortorder);
print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
print "</tr>\n"; print "</tr>\n";
@ -315,14 +315,14 @@ print '</td>';
// UTILISATEUR // UTILISATEUR
if ($user->rights->holiday->write_all) if ($user->rights->holiday->write_all)
{ {
print '<td class="liste_titre" align="left">'; print '<td class="liste_titre maxwidthonsmartphone" align="left">';
print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,32,0,'',0,'','maxwidth200'); print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,32,0,'',0,'','maxwidth200');
print '</td>'; print '</td>';
} }
else else
{ {
//print '<td class="liste_titre">&nbsp;</td>'; //print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="left">'; print '<td class="liste_titre maxwidthonsmartphone" align="left">';
print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,32,0,'',0,'','maxwidth200'); print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,32,0,'',0,'','maxwidth200');
print '</td>'; print '</td>';
} }
@ -330,7 +330,7 @@ else
// APPROVER // APPROVER
if($user->rights->holiday->write_all) if($user->rights->holiday->write_all)
{ {
print '<td class="liste_titre" align="left">'; print '<td class="liste_titre maxwidthonsmartphone" align="left">';
$validator = new UserGroup($db); $validator = new UserGroup($db);
$excludefilter=$user->admin?'':'u.rowid <> '.$user->id; $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
@ -365,7 +365,7 @@ $formother->select_year($year_end,'year_end',1, $min_year, $max_year);
print '</td>'; print '</td>';
// STATUT // STATUT
print '<td class="liste_titre" width="70px;" align="center">'; print '<td class="liste_titre maxwidthonsmartphone maxwidth200" align="right">';
$holiday->selectStatutCP($search_statut); $holiday->selectStatutCP($search_statut);
print '</td>'; print '</td>';

View File

@ -4334,15 +4334,17 @@ border-top-right-radius: 6px;
.menu li.menu_choix1 { .menu li.menu_choix1 {
padding-top: 6px; padding-top: 6px;
padding-right: 10px; padding-right: 10px;
padding-bottom: 2px;
} }
.menu li.menu_choix2 { .menu li.menu_choix2 {
padding-top: 6px; padding-top: 6px;
padding-right: 10px; padding-right: 10px;
padding-bottom: 2px;
} }
@media only screen and (max-width: 767px) @media only screen and (max-width: 767px)
{ {
.menu_choix1 a, .menu_choix2 a { .menu_choix1 a, .menu_choix2 a {
background-size: 30px 30px; background-size: 36px 36px;
height: 30px; height: 30px;
padding-left: 40px; padding-left: 40px;
} }

View File

@ -4219,7 +4219,31 @@ border-top-right-radius: 6px;
.menu_choix1 a:hover,.menu_choix2 a:hover { .menu_choix1 a:hover,.menu_choix2 a:hover {
color: #6d3f6d; color: #6d3f6d;
} }
.menu li.menu_choix1 {
padding-top: 6px;
padding-right: 10px;
padding-bottom: 2px;
}
.menu li.menu_choix2 {
padding-top: 6px;
padding-right: 10px;
padding-bottom: 2px;
}
@media only screen and (max-width: 767px)
{
.menu_choix1 a, .menu_choix2 a {
background-size: 36px 36px;
background-position-y: 6px;
padding-left: 40px;
}
.menu li.menu_choix1, .menu li.menu_choix2 {
padding-left: 4px;
padding-right: 0;
}
.liste_articles {
margin-right: 0 !important;
}
}