From 04063a62a83fbfb5f6f00ebe85e0c93658fe1e9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 Nov 2016 15:18:38 +0100
Subject: [PATCH] Better responsive
---
htdocs/core/class/html.form.class.php | 2 +-
htdocs/core/class/html.formprojet.class.php | 5 +++--
htdocs/expensereport/card.php | 13 ++++++++-----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2b18dab3acd..81eaea387ff 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4493,7 +4493,7 @@ class Form
if ($usecalendar == "eldy")
{
// Zone de saisie manuelle de la date
- $retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class"minwidth100" maxlength="11" value="'.$formated_date.'"';
+ $retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
$retstring.=($disabled?' disabled':'');
$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
$retstring.='>';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 742bc1a0231..1112d34d13f 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -59,9 +59,10 @@ class FormProjets
* @param string $filterkey Key to filter
* @param int $nooutput No print output. Return it only.
* @param int $forceaddid Force to add project id in list, event if not qualified
+ * @param string $morecss More css
* @return string Return html content
*/
- function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0)
+ function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='')
{
global $langs,$conf,$form;
@@ -85,7 +86,7 @@ class FormProjets
// )
));
- $out.='<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
+ $out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
}
else
{
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1994eded0da..84985a8312d 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1824,7 +1824,7 @@ else
print '<tr class="liste_titre">';
print '<td style="text-align:center;">'.$langs->trans('Piece').'</td>';
print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
- if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>';
+ if (! empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
print '<td style="text-align:center;">'.$langs->trans('Type').'</td>';
print '<td style="text-align:left;">'.$langs->trans('Description').'</td>';
print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>';
@@ -1972,10 +1972,11 @@ else
if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline' && $user->rights->expensereport->creer)
{
print '<tr class="liste_titre">';
+ print '<td></td>';
print '<td align="center">'.$langs->trans('Date').'</td>';
- if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>';
+ if (! empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
print '<td align="center">'.$langs->trans('Type').'</td>';
- print '<td colspan="2">'.$langs->trans('Description').'</td>';
+ print '<td>'.$langs->trans('Description').'</td>';
print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>';
@@ -1985,6 +1986,8 @@ else
print '<tr '.$bc[true].'>';
+ print '<td></td>';
+
// Select date
print '<td align="center">';
$form->select_date($date?$date:-1,'date');
@@ -2004,7 +2007,7 @@ else
print '</td>';
// Add comments
- print '<td colspan="2">';
+ print '<td>';
print '<textarea class="flat_ndf centpercent" name="comments">'.$comments.'</textarea>';
print '</td>';
@@ -2219,7 +2222,7 @@ print '</div>';
//$conf->global->DOL_URL_ROOT_DOCUMENT_PHP=dol_buildpath('/expensereport/documentwrapper.php',1);
-print '<div style="width:50%">';
+print '<div class="fichehalfleft">';
/*
* Generate documents
--
GitLab