Responsive design

This commit is contained in:
Laurent Destailleur 2016-11-11 12:55:03 +01:00
parent 2cfcca82b4
commit b20c4bdfe4
8 changed files with 27 additions and 22 deletions

View File

@ -4521,7 +4521,7 @@ class Form
{ {
//$retstring.='<div class="inline-block">'; //$retstring.='<div class="inline-block">';
// Day // Day
$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50" id="'.$prefix.'day" name="'.$prefix.'day">'; $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
if ($emptydate || $set_time == -1) if ($emptydate || $set_time == -1)
{ {
@ -4553,7 +4553,7 @@ class Form
// Year // Year
if ($emptydate || $set_time == -1) if ($emptydate || $set_time == -1)
{ {
$retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">'; $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
} }
else else
{ {

View File

@ -83,8 +83,8 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
} }
//if ($totalinprocess != $total) //if ($totalinprocess != $total)
//print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td align="right">'.$totalinprocess.'</td></tr>'; //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td align="right">'.$totalinprocess.'</td></tr>';
print '<tr class="liste_total"><td>'.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").')</td><td align="right">'.price($totalamount, 0, '', 1, -1, -1, $conf->currency).'</td></tr>'; print '<tr class="liste_total"><td class="maxwidth150onsmartphone tdoverflow">'.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").')</td><td align="right">'.price($totalamount, 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
print '<tr class="liste_total"><td>'; print '<tr class="liste_total"><td class="minwidth150onsmartphone tdoverflow">';
//print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')'; //print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')';
print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1); print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1);
print '</td><td align="right">'.price(price2num($ponderated_opp_amount,'MT'), 0, '', 1, -1, -1, $conf->currency).'</td></tr>'; print '</td><td align="right">'.price(price2num($ponderated_opp_amount,'MT'), 0, '', 1, -1, -1, $conf->currency).'</td></tr>';

View File

@ -140,7 +140,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("OpenedProjectsByThirdparties"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("OpenedProjectsByThirdparties"),$_SERVER["PHP_SELF"],"s.nom","","",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";

View File

@ -621,6 +621,7 @@ div.myavailability {
.maxwidth300 { max-width: 300px; } .maxwidth300 { max-width: 300px; }
.maxwidth400 { max-width: 400px; } .maxwidth400 { max-width: 400px; }
.maxwidth500 { max-width: 500px; } .maxwidth500 { max-width: 500px; }
.maxwidth50imp { max-width: 50px !important; }
.minheight20 { min-height: 20px; } .minheight20 { min-height: 20px; }
.minheight40 { min-height: 40px; } .minheight40 { min-height: 40px; }
.titlefieldcreate { width: 20%; } .titlefieldcreate { width: 20%; }
@ -698,10 +699,13 @@ div.myavailability {
position: absolute; position: absolute;
width: <?php print dol_size(300,'width'); ?>px; width: <?php print dol_size(300,'width'); ?>px;
} }
/* intput, input[type=text], */
select { select {
width: 98%; width: 98%;
min-width: 40px; min-width: 40px;
} }
div.divphotoref { div.divphotoref {
padding-right: 5px; padding-right: 5px;
} }

View File

@ -625,6 +625,7 @@ div.myavailability {
.maxwidth300 { max-width: 300px; } .maxwidth300 { max-width: 300px; }
.maxwidth400 { max-width: 400px; } .maxwidth400 { max-width: 400px; }
.maxwidth500 { max-width: 500px; } .maxwidth500 { max-width: 500px; }
.maxwidth50imp { max-width: 50px !important; }
.minheight20 { min-height: 20px; } .minheight20 { min-height: 20px; }
.minheight40 { min-height: 40px; } .minheight40 { min-height: 40px; }
.titlefieldcreate { width: 20%; } .titlefieldcreate { width: 20%; }

View File

@ -169,7 +169,7 @@ print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print "<td>".$langs->trans("Parameter")."</td>"; print "<td>".$langs->trans("Parameter")."</td>";
print "<td>".$langs->trans("Name")."</td>"; print "<td>".$langs->trans("Name")."</td>";
print "<td>".$langs->trans("ExtSiteUrlAgenda")." (".$langs->trans("Example").': http://yoursite/agenda/agenda.ics)</td>'; print "<td>".$langs->trans("ExtSiteUrlAgenda").'<div class="hideonsmartphone">'." (".$langs->trans("Example").': http://yoursite/agenda/agenda.ics)</div></td>';
print "<td>".$form->textwithpicto($langs->trans("FixTZ"), $langs->trans("FillFixTZOnlyIfRequired"), 1).'</td>'; print "<td>".$form->textwithpicto($langs->trans("FixTZ"), $langs->trans("FillFixTZOnlyIfRequired"), 1).'</td>';
print '<td align="right">'.$langs->trans("Color").'</td>'; print '<td align="right">'.$langs->trans("Color").'</td>';
print "</tr>"; print "</tr>";
@ -187,13 +187,13 @@ while ($i <= $MAXAGENDA)
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
// Nb // Nb
print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>"; print '<td class="maxwidth50onsmartphone">'.$langs->trans("AgendaExtNb",$key)."</td>";
// Name // Name
print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key):$object->conf->$name) . '" size="28"></td>'; print '<td class="maxwidth50onsmartphone"><input type="text" class="flat hideifnotset minwidth100" name="AGENDA_EXT_NAME_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key):$object->conf->$name) . '"></td>';
// URL // URL
print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key):$object->conf->$src) . '" size="60"></td>'; print '<td class="maxwidth50onsmartphone"><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key):$object->conf->$src) . '"></td>';
// Offset TZ // Offset TZ
print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key):$object->conf->$offsettz) . '" size="2"></td>'; print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key):$object->conf->$offsettz) . '" size="1"></td>';
// Color (Possible colors are limited by Google) // Color (Possible colors are limited by Google)
print '<td class="nowrap" align="right">'; print '<td class="nowrap" align="right">';
//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist); //print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);

View File

@ -733,7 +733,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
else else
{ {
print '<input size="30" type="text" id="lastname" name="lastname" value="'.GETPOST('lastname').'">'; print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="'.GETPOST('lastname').'">';
} }
print '</td></tr>'; print '</td></tr>';
@ -747,7 +747,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
else else
{ {
print '<input size="30" type="text" name="firstname" value="'.GETPOST('firstname').'">'; print '<input class="minwidth100" type="text" name="firstname" value="'.GETPOST('firstname').'">';
} }
print '</td></tr>'; print '</td></tr>';
@ -1802,7 +1802,7 @@ else
print '<td>'; print '<td>';
if ($caneditfield && !$object->ldap_sid) if ($caneditfield && !$object->ldap_sid)
{ {
print '<input size="30" type="text" class="flat" name="lastname" value="'.$object->lastname.'">'; print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
} }
else else
{ {
@ -1817,7 +1817,7 @@ else
print '<td>'; print '<td>';
if ($caneditfield && !$object->ldap_sid) if ($caneditfield && !$object->ldap_sid)
{ {
print '<input size="30" type="text" class="flat" name="firstname" value="'.$object->firstname.'">'; print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
} }
else else
{ {
@ -1902,7 +1902,7 @@ else
if(! empty($conf->api->enabled) && $user->admin) { if(! empty($conf->api->enabled) && $user->admin) {
print '<tr><td>'.$langs->trans("ApiKey").'</td>'; print '<tr><td>'.$langs->trans("ApiKey").'</td>';
print '<td>'; print '<td>';
print '<input size="30" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">'; print '<input class="minwidth100" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax))
print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"'); print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
print '</td></tr>'; print '</td></tr>';
@ -1992,7 +1992,7 @@ else
} }
// Type // Type
print '<tr><td width="25%">'.$langs->trans("Type").'</td>'; print '<tr><td>'.$langs->trans("Type").'</td>';
print '<td>'; print '<td>';
if ($user->id == $object->id || ! $user->admin) if ($user->id == $object->id || ! $user->admin)
{ {
@ -2104,7 +2104,7 @@ else
print '<td>'; print '<td>';
if ($caneditfield && empty($object->ldap_sid)) if ($caneditfield && empty($object->ldap_sid))
{ {
print '<input size="40" type="text" name="email" class="flat" value="'.$object->email.'">'; print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
} }
else else
{ {
@ -2135,7 +2135,7 @@ else
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield)
{ {
print '<input size="40" type="url" name="openid" class="flat" value="'.$object->openid.'">'; print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
} }
else else
{ {

View File

@ -329,8 +329,8 @@ if ($result)
{ {
// On affiche ligne pour modifier droits // On affiche ligne pour modifier droits
print '<tr '. $bc[$var].'>'; print '<tr '. $bc[$var].'>';
print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName(); print '<td class="maxwidthonsmartphone tdoverflow">'.img_object('',$picto).' '.$objMod->getName();
print '<a name="'.$objMod->getName().'">&nbsp;</a></td>'; print '<a name="'.$objMod->getName().'"></a></td>';
print '<td align="center" class="nowrap">'; print '<td align="center" class="nowrap">';
print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>"; print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
print '/'; print '/';
@ -344,7 +344,7 @@ if ($result)
print '<tr '. $bc[$var].'>'; print '<tr '. $bc[$var].'>';
// Picto and label of permission // Picto and label of permission
print '<td>'.img_object('',$picto).' '.$objMod->getName().'</td>'; print '<td class="maxwidthonsmartphone tdoverflow">'.img_object('',$picto).' '.$objMod->getName().'</td>';
// Permission and tick // Permission and tick
if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin
@ -403,7 +403,7 @@ if ($result)
} }
$permlabel=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$langs->trans($obj->libelle))); $permlabel=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$langs->trans($obj->libelle)));
print '<td>'.$permlabel. '</td>'; print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
print '</tr>'."\n"; print '</tr>'."\n";