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

Better responsive design

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-07 13:06:22 +02:00
parent 059466030a
commit 7f129d14d7
8 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3272,18 +3272,18 @@ abstract class CommonObject
if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>'; if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
// Qty // Qty
print '<td class="linecolqty" align="right" width="50">'.$langs->trans('Qty').'</td>'; print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
if($conf->global->PRODUCT_USE_UNITS) if($conf->global->PRODUCT_USE_UNITS)
{ {
print '<td class="linecoluseunit" align="left" width="50">'.$langs->trans('Unit').'</td>'; print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
} }
// Reduction short // Reduction short
print '<td class="linecoldiscount" align="right" width="50">'.$langs->trans('ReductionShort').'</td>'; print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
if ($this->situation_cycle_ref) { if ($this->situation_cycle_ref) {
print '<td class="linecolcycleref" align="right" width="50">' . $langs->trans('Progress') . '</td>'; print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
} }
if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id)) if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
@ -3300,10 +3300,10 @@ abstract class CommonObject
} }
// Total HT // Total HT
print '<td class="linecolht" align="right" width="50">'.$langs->trans('TotalHTShort').'</td>'; print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
// Multicurrency // Multicurrency
if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right" width="50">'.$langs->trans('TotalHTShortCurrency').'</td>'; if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency').'</td>';
print '<td class="linecoledit"></td>'; // No width to allow autodim print '<td class="linecoledit"></td>'; // No width to allow autodim

2
htdocs/core/class/doleditor.class.php
View File

@ -138,7 +138,7 @@ class DolEditor
/** /**
* Output edit area inside the HTML stream. * Output edit area inside the HTML stream.
* Output depends on this->tool (fckeditor, ckeditor, texatrea, ...) * Output depends on this->tool (fckeditor, ckeditor, textarea, ...)
* *
* @param int $noprint 1=Return HTML string instead of printing it to output * @param int $noprint 1=Return HTML string instead of printing it to output
* @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });" * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });"

5
htdocs/core/class/html.formactions.class.php
View File

@ -153,9 +153,10 @@ class FormActions
* @param string $typeelement 'invoice','propal','order','invoice_supplier','order_supplier','fichinter' * @param string $typeelement 'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
* @param int $socid socid of user * @param int $socid socid of user
* @param int $forceshowtitle Show title even if there is no actions to show * @param int $forceshowtitle Show title even if there is no actions to show
* @param string $morecss More css on table
* @return int <0 if KO, >=0 if OK * @return int <0 if KO, >=0 if OK
*/ */
function showactions($object,$typeelement,$socid=0,$forceshowtitle=0) function showactions($object,$typeelement,$socid=0,$forceshowtitle=0,$morecss='listactions')
{ {
global $langs,$conf,$user; global $langs,$conf,$user;
global $bc; global $bc;
@ -182,7 +183,7 @@ class FormActions
print load_fiche_titre($title,'',''); print load_fiche_titre($title,'','');
$total = 0; $var=true; $total = 0; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<th class="liste_titre">'.$langs->trans('Ref').'</th>'; print '<th class="liste_titre">'.$langs->trans('Ref').'</th>';
print '<th class="liste_titre">'.$langs->trans('Action').'</th>'; print '<th class="liste_titre">'.$langs->trans('Action').'</th>';

16
htdocs/core/class/html.formfile.class.php
View File

@ -503,10 +503,12 @@ class FormFile
$out.= '<tr class="liste_titre">'; $out.= '<tr class="liste_titre">';
$addcolumforpicto=($delallowed || $printer || $morepicto);
$out.= '<th align="center" colspan="'.(3+($addcolumforpicto?'2':'1')).'" class="formdoc liste_titre maxwidthonsmartphone">';
// Model // Model
if (! empty($modellist)) if (! empty($modellist))
{ {
$out.= '<th align="center" class="formdoc liste_titre maxwidthonsmartphone">';
$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>'; $out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
if (is_array($modellist) && count($modellist) == 1) // If there is only one element if (is_array($modellist) && count($modellist) == 1) // If there is only one element
{ {
@ -514,17 +516,14 @@ class FormFile
$modelselected=$arraykeys[0]; $modelselected=$arraykeys[0];
} }
$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', ''); $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', '');
$out.= '</th>'; $out.= ajax_combobox('model');
} }
else else
{ {
$out.= '<th align="left" class="formdoc liste_titre">'; $out.= '<div class="float">'.$langs->trans("Files").'</div>';
$out.= $langs->trans("Files");
$out.= '</th>';
} }
// Language code (if multilang) // Language code (if multilang)
$out.= '<th align="center" class="formdoc liste_titre maxwidthonsmartphone">';
if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty)) if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
{ {
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@ -538,12 +537,9 @@ class FormFile
{ {
$out.= '&nbsp;'; $out.= '&nbsp;';
} }
$out.= '</th>';
// Button // Button
$addcolumforpicto=($delallowed || $printer || $morepicto); $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
$out.= '<th align="center" colspan="'.($addcolumforpicto?'2':'1').'" class="formdocbutton liste_titre maxwidthonsmartphone">';
$genbutton = '<input class="button" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
$genbutton.= ' type="submit" value="'.$buttonlabel.'"'; $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled'; if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
$genbutton.= '>'; $genbutton.= '>';

2
htdocs/fourn/commande/card.php
View File

@ -3046,7 +3046,7 @@ elseif (! empty($object->id))
// List of actions on element // List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db); $formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'order_supplier',$socid); $somethingshown=$formactions->showactions($object,'order_supplier',$socid,0,'listaction'.($genallowed?'largetitle':''));
// List of actions on element // List of actions on element

2
htdocs/fourn/facture/card.php
View File

@ -2390,7 +2390,7 @@ else
// List of actions on element // List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions=new FormActions($db); $formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'invoice_supplier',$socid); $somethingshown=$formactions->showactions($object,'invoice_supplier',$socid,0,'listaction'.($genallowed?'largetitle':''));
print '</div></div></div>'; print '</div></div></div>';
//print '</td></tr></table>'; //print '</td></tr></table>';

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

@ -290,6 +290,9 @@ input.smallpadd { /* Used for timesheet input */
padding-left: 0px !important; padding-left: 0px !important;
padding-right: 0px !important; padding-right: 0px !important;
} }
input.buttongen {
vertical-align: middle;
}
span.timesheetalreadyrecorded input { span.timesheetalreadyrecorded input {
/*font-size: smaller;*/ /*font-size: smaller;*/
border: none; border: none;
@ -677,7 +680,7 @@ div.ficheaddleft {
else print "margin-top: 10px;\n"; ?> else print "margin-top: 10px;\n"; ?>
} }
/* Force values for small screen */ /* Force values for small screen */
@media only screen and (max-width: 850px) @media only screen and (max-width: 900px)
{ {
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'6':'20'):'24')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'6':'20'):'24')); ?>px;
@ -2194,7 +2197,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
-webkit-border-radius: 0.2em; -webkit-border-radius: 0.2em;
border-radius: 0.2em;*/ border-radius: 0.2em;*/
} }
table.liste tr, table.noborder tr, div.noborder form { table.liste tr, table.noborder tr, div.noborder form {
border-top-color: #FEFEFE; border-top-color: #FEFEFE;
@ -2591,6 +2593,9 @@ input.liste_titre {
background: transparent; background: transparent;
border: 0px; border: 0px;
} }
.listactionlargetitle .liste_titre {
line-height: 24px;
}
.noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total { .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
/* background: #F0F0F0; */ /* background: #F0F0F0; */

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

@ -285,6 +285,15 @@ input.smallpadd {
padding-left: 1px !important; padding-left: 1px !important;
padding-right: 1px !important; padding-right: 1px !important;
} }
input.buttongen {
vertical-align: middle;
}
span.timesheetalreadyrecorded input {
/*font-size: smaller;*/
border: none;
/*background: transparent;*/
}
<?php } ?> <?php } ?>
select.flat, form.flat select { select.flat, form.flat select {
@ -306,6 +315,9 @@ input:disabled {
input.liste_titre { input.liste_titre {
box-shadow: none !important; box-shadow: none !important;
} }
.listactionlargetitle .liste_titre {
line-height: 24px;
}
input.removedfile { input.removedfile {
padding: 0px !important; padding: 0px !important;
border: 0px !important; border: 0px !important;
@ -722,7 +734,7 @@ div.ficheaddleft {
else print "margin-top: 10px;\n"; ?> else print "margin-top: 10px;\n"; ?>
} }
/* Force values for small screen */ /* Force values for small screen */
@media only screen and (max-width: 850px) @media only screen and (max-width: 900px)
{ {
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px;