Fix responsive design

This commit is contained in:
Laurent Destailleur 2017-02-23 01:29:35 +01:00
parent aefdc09cdc
commit a79903a2fc
6 changed files with 23 additions and 10 deletions

View File

@ -34,6 +34,7 @@ function propal_prepare_head($object)
global $db, $langs, $conf, $user; global $db, $langs, $conf, $user;
$langs->load("propal"); $langs->load("propal");
$langs->load("compta"); $langs->load("compta");
$langs->load("companies");
$h = 0; $h = 0;
$head = array(); $head = array();

View File

@ -1808,7 +1808,7 @@ else
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
$sql.= ' WHERE fde.fk_expensereport = '.$object->id; $sql.= ' WHERE fde.fk_expensereport = '.$object->id;
print '<div style="clear: both;">'; print '<div style="clear: both;"></div>';
$actiontouse='updateligne'; $actiontouse='updateligne';
if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline') $actiontouse='addline'; if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline') $actiontouse='addline';
@ -1818,7 +1818,10 @@ else
print '<input type="hidden" name="action" value="'.$actiontouse.'">'; print '<input type="hidden" name="action" value="'.$actiontouse.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />'; print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
print '<table class="noborder" width="100%">';
print '<div class="div-table-responsive">';
print '<table id="tablelines" class="noborder" width="100%">';
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
@ -2047,11 +2050,9 @@ else
} // Fin si c'est payé/validé } // Fin si c'est payé/validé
print '</table>'; print '</table>';
print '</form>';
print '</div>'; print '</div>';
print '</form>';
} }
else else
{ {

View File

@ -151,7 +151,7 @@ if (! $action)
print $langs->trans('ResourceFormLabel_'.$field); print $langs->trans('ResourceFormLabel_'.$field);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print '<input type="text" name="'.$field.'" value="'.$$field.'" />'; print '<input class="flat maxwidthonsmartphone" type="text" name="'.$field.'" value="'.$$field.'" />';
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';

View File

@ -172,7 +172,7 @@ class FormResource
if ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',',$filtertype); if ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',',$filtertype);
$resourcestat->load_cache_code_type_resource(); $resourcestat->load_cache_code_type_resource();
print '<select id="select'.$htmlname.'" class="flat select_'.$htmlname.'" name="'.$htmlname.'">'; print '<select id="select'.$htmlname.'" class="flat maxwidthonsmartphone select_'.$htmlname.'" name="'.$htmlname.'">';
if ($empty) print '<option value="">&nbsp;</option>'; if ($empty) print '<option value="">&nbsp;</option>';
if (is_array($resourcestat->cache_code_type_resource) && count($resourcestat->cache_code_type_resource)) if (is_array($resourcestat->cache_code_type_resource) && count($resourcestat->cache_code_type_resource))
{ {

View File

@ -708,7 +708,9 @@ div.fiche>form>div.div-table-responsive {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
div.fiche {
margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
}
div.titre { div.titre {
line-height: 2em; line-height: 2em;
} }
@ -773,6 +775,9 @@ div.fiche>form>div.div-table-responsive {
object-fit: contain; object-fit: contain;
} }
div.statusref {
padding-right: 10px;
}
} }
.linkobject { cursor: pointer; } .linkobject { cursor: pointer; }
<?php if (GETPOST("optioncss") == 'print') { ?> <?php if (GETPOST("optioncss") == 'print') { ?>

View File

@ -686,7 +686,9 @@ div.fiche>form>div.div-table-responsive {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
div.fiche {
margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
}
div.titre { div.titre {
line-height: 2em; line-height: 2em;
} }
@ -750,6 +752,10 @@ div.fiche>form>div.div-table-responsive {
width: 20px; width: 20px;
object-fit: contain; object-fit: contain;
} }
div.statusref {
padding-right: 10px;
}
} }
.linkobject { cursor: pointer; } .linkobject { cursor: pointer; }
<?php if (GETPOST("optioncss") == 'print') { ?> <?php if (GETPOST("optioncss") == 'print') { ?>