diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 7542782f6e7c419ab519921509988da068258a80..bd94dd83f5c77c5bd4e9904c7ca35f32e41a1be0 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -125,11 +125,11 @@ if ($result)
print '<tr class="liste_titre">';
print '<td class="liste_titre">';
- print '<input type="text" class="flat" name="sref" value="'.dol_escape_htmltag($sref).'" size="6">';
+ print '<input type="text" class="flat maxwidth50" name="sref" value="'.dol_escape_htmltag($sref).'">';
print '</td>';
// Title
print '<td class="liste_titre">';
- print '<input type="text" class="flat" name="sall" value="'.dol_escape_htmltag($sall).'" size="40">';
+ print '<input type="text" class="flat maxwidth100 maxwidth50onsmartphone" name="sall" value="'.dol_escape_htmltag($sall).'">';
print '</td>';
print '<td class="liste_titre"> </td>';
if (! $filteremail) print '<td class="liste_titre"> </td>';
@@ -145,7 +145,7 @@ if ($result)
$email=new Mailing($db);
- while ($i < min($num,$conf->liste_limit))
+ while ($i < min($num,$limit))
{
$obj = $db->fetch_object($result);
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 21f3e581ba40fc2e746189fd74b7f2d52b30d0f6..56735d15fceec5b5dc7bde92f8d84c084a7d7d58 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -130,6 +130,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
* View
*/
+$form=new Form($db);
+
$title=$langs->trans('BankAccounts');
// Load array of financial accounts (opened by default)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 48126c9afede442217a8f447f5305f98b417142a..b3e1c162102fac9c6db82b3f6c588a6c71ab4066 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5555,8 +5555,8 @@ class Form
//$previous_ref = $object->ref_previous?'<a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):' ').'</a>':'';
//$next_ref = $object->ref_next?'<a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):' ').'</a>':'';
- $previous_ref = $object->ref_previous?'<a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.(empty($conf->dol_use_jmobile)?'<':' ').'</a>':'<span class="inactive">'.(empty($conf->dol_use_jmobile)?'<':' ').'</span>';
- $next_ref = $object->ref_next?'<a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.(empty($conf->dol_use_jmobile)?'>':' ').'</a>':'<span class="inactive">'.(empty($conf->dol_use_jmobile)?'>':' ').'</span>';
+ $previous_ref = $object->ref_previous?'<a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.(($conf->dol_use_jmobile != 4)?'<':' ').'</a>':'<span class="inactive">'.(($conf->dol_use_jmobile != 4)?'<':' ').'</span>';
+ $next_ref = $object->ref_next?'<a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.(($conf->dol_use_jmobile != 4)?'>':' ').'</a>':'<span class="inactive">'.(($conf->dol_use_jmobile != 4)?'>':' ').'</span>';
//print "xx".$previous_ref."x".$next_ref;
$ret.='<div style="vertical-align: middle">';
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index ef9141dbc94b7f9ac5c6d0fe0bd77cda1c51953c..ac800d480fc6cb0aceedc6cf7ebf010aa8fe90cf 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -358,9 +358,10 @@ class FormCompany
*
* @param string $selected Title preselected
* @param string $htmlname Name of HTML select combo field
+ * @param string $morecss Add more css on SELECT element
* @return string String with HTML select
*/
- function select_civility($selected='',$htmlname='civility_id')
+ function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
{
global $conf,$langs,$user;
$langs->load("dict");
@@ -374,7 +375,7 @@ class FormCompany
$resql=$this->db->query($sql);
if ($resql)
{
- $out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+ $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
$out.= '<option value=""> </option>';
$num = $this->db->num_rows($resql);
$i = 0;
@@ -724,9 +725,10 @@ class FormCompany
* @param int $fieldsize Field size
* @param int $disableautocomplete 1 To disable ajax autocomplete features (browser autocomplete may still occurs)
* @param string $moreattrib Add more attribute on HTML input field
+ * @param string $morecss More css
* @return string
*/
- function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='')
+ function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
{
global $conf;
@@ -740,7 +742,7 @@ class FormCompany
$out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
$moreattrib.=' autocomplete="off"';
}
- $out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
+ $out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
return $out;
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e00a8a825b80643bba5dff93f0945fb3fef20c0a..50f4ff30cc615d2e81422d84e86eb0aed51db414 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1080,9 +1080,9 @@ function fieldLabel($langkey, $fieldkey, $fieldrequired=0)
global $conf, $langs;
$ret='';
if ($fieldrequired) $ret.='<span class="fieldrequired">';
- if (empty($conf->dol_use_jmobile)) $ret.='<label for="'.$fieldkey.'">';
+ if (($conf->dol_use_jmobile != 4)) $ret.='<label for="'.$fieldkey.'">';
$ret.=$langs->trans($langkey);
- if (empty($conf->dol_use_jmobile)) $ret.='</label>';
+ if (($conf->dol_use_jmobile != 4)) $ret.='</label>';
if ($fieldrequired) $ret.='</span>';
return $ret;
}
@@ -3208,20 +3208,20 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
if ($cpt>=1)
{
- $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><a '.(empty($conf->dol_use_jmobile)?'':'data-role="button" ').'href="'.$file.'?page=0'.$options.'">1</a></li>';
- if ($cpt > 2) $pagelist.='<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="inactive"':'data-role="button"').'>...</span></li>';
- else if ($cpt == 2) $pagelist.='<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><a '.(empty($conf->dol_use_jmobile)?'':'data-role="button" ').'href="'.$file.'?page=1'.$options.'">2</a></li>';
+ $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page=0'.$options.'">1</a></li>';
+ if ($cpt > 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'data-role="button"').'>...</span></li>';
+ else if ($cpt == 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page=1'.$options.'">2</a></li>';
}
do
{
if ($cpt==$page)
{
- $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="active"':'data-role="button"').'>'.($page+1).'</span></li>';
+ $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'data-role="button"').'>'.($page+1).'</span></li>';
}
else
{
- $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><a '.(empty($conf->dol_use_jmobile)?'':'data-role="button" ').'href="'.$file.'?page='.$cpt.$options.'">'.($cpt+1).'</a></li>';
+ $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page='.$cpt.$options.'">'.($cpt+1).'</a></li>';
}
$cpt++;
}
@@ -3229,14 +3229,14 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
if ($cpt<$nbpages)
{
- if ($cpt<$nbpages-2) $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="inactive"':'data-role="button"').'>...</span></li>';
- else if ($cpt == $nbpages-2) $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><a '.(empty($conf->dol_use_jmobile)?'':'data-role="button" ').'href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
- $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><a '.(empty($conf->dol_use_jmobile)?'':'data-role="button" ').'href="'.$file.'?page='.($nbpages-1).$options.'">'.$nbpages.'</a></li>';
+ if ($cpt<$nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'data-role="button"').'>...</span></li>';
+ else if ($cpt == $nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
+ $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page='.($nbpages-1).$options.'">'.$nbpages.'</a></li>';
}
}
else
{
- $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
+ $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
}
}
print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist
@@ -3315,7 +3315,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
}
if ($page > 0)
{
- if (empty($conf->dol_use_jmobile)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
+ if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
else print '<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
}
if ($betweenarrows)
@@ -3324,7 +3324,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
}
if ($nextpage > 0)
{
- if (empty($conf->dol_use_jmobile)) print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
+ if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
else print '<li><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$file.'?page='.($page+1).$options.'">'.$langs->trans("Next").'</a></li>';
}
if ($afterarrows)
@@ -5479,7 +5479,7 @@ function printCommonFooter($zone='private')
// Google Analytics (need Google module)
if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
{
- if (empty($conf->dol_use_jmobile))
+ if (($conf->dol_use_jmobile != 4))
{
print "\n";
print '<script type="text/javascript">'."\n";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d20cbdb15669a1feddc76aba1c2d36acc8443d34..df74013fba119d8347769229c0f7233dda6fb2c2 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1040,7 +1040,16 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
$ext='version='.urlencode(DOL_VERSION);
if (GETPOST('version')) $ext='version='.GETPOST('version','int'); // usefull to force no cache on css/js
if (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext='testmenuhider='.GETPOST('testmenuhider','int');
-
+
+ $themeparam='?lang='.$langs->defaultlang.'&theme='.$conf->theme.(GETPOST('optioncss')?'&optioncss='.GETPOST('optioncss','alpha',1):'').'&userid='.$user->id.'&entity='.$conf->entity;
+ $themeparam.=($ext?'&'.$ext:'');
+ if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&dol_resetcache='.$_SESSION['dol_resetcache'];
+ if (GETPOST('dol_hide_topmenu')) { $themeparam.='&dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
+ if (GETPOST('dol_hide_leftmenu')) { $themeparam.='&dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
+ if (GETPOST('dol_optimize_smallscreen')) { $themeparam.='&dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
+ if (GETPOST('dol_no_mouse_hover')) { $themeparam.='&dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
+ if (GETPOST('dol_use_jmobile')) { $themeparam.='&dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+
if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
{
print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
@@ -1070,7 +1079,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
// jQuery jMobile
if (! $disablejmobile && (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || ! empty($conf->dol_use_jmobile)))
{
- print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css'.($ext?'?'.$ext:'').'">'."\n";
+ $tmp=basename($_SERVER["PHP_SELF"]);
+ if ($tmp == 'get_menudiv.php' || $conf->dol_use_jmobile == 4)
+ {
+ print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css'.($ext?'?'.$ext:'').'">'."\n";
+ }
}
}
@@ -1091,14 +1104,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
}
}
}
- $themeparam='?lang='.$langs->defaultlang.'&theme='.$conf->theme.(GETPOST('optioncss')?'&optioncss='.GETPOST('optioncss','alpha',1):'').'&userid='.$user->id.'&entity='.$conf->entity;
- $themeparam.=($ext?'&'.$ext:'');
- if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&dol_resetcache='.$_SESSION['dol_resetcache'];
- if (GETPOST('dol_hide_topmenu')) { $themeparam.='&dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
- if (GETPOST('dol_hide_leftmenu')) { $themeparam.='&dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
- if (GETPOST('dol_optimize_smallscreen')) { $themeparam.='&dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
- if (GETPOST('dol_no_mouse_hover')) { $themeparam.='&dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
- if (GETPOST('dol_use_jmobile')) { $themeparam.='&dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
@@ -1244,32 +1249,36 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
// We must force not using ajax because cache of jquery does not load js of other pages.
// This also increase seriously speed onto mobile device where complex js code is very slow and memory very low.
// Note: dol_use_jmobile=1 use jmobile without ajax, dol_use_jmobile=2 use jmobile with ajax
- if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3))
- {
- print '<script type="text/javascript">
- $(document).bind("mobileinit", function() {
- ';
- if ($conf->theme == 'md')
- {
- print '
- /* Disabled decoration for some css */
- $.mobile.keepNative = \'input[type="submit"]\'; /* jQuery Mobile 1.4 and higher */
- $.mobile.page.prototype.options.keepNative = \'input[type="submit"]\'; /* jQuery Mobile 1.4 and lower */
- ';
- }
- print '
- $.extend( $.mobile , {
- autoInitializePage : true, /* We need this to run jmobile */
- /* loadingMessage : \'xxxxx\', */
- touchOverflowEnabled : true,
- defaultPageTransition : \'none\',
- defaultDialogTransition : \'none\',
- ajaxEnabled : false /* old param was ajaxFormsEnabled and ajaxLinksEnabled */
- });
- });
- </script>';
- }
- if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 3) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+ // 3=???
+ // 4=all pages, not only menu
+ $tmp=basename($_SERVER["PHP_SELF"]);
+ if ($tmp == 'get_menudiv.php' || $conf->dol_use_jmobile == 4)
+ {
+ if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3))
+ {
+ print '<script type="text/javascript">
+ $(document).bind("mobileinit", function() {
+ ';
+ if ($conf->theme == 'md')
+ {
+ // Disabled decoration for some css
+ print '
+ $.mobile.keepNative = \'input[type="submit"]\';
+ ';
+ }
+ print '
+ $.extend( $.mobile , {
+ autoInitializePage : true,
+ touchOverflowEnabled : true,
+ defaultPageTransition : \'none\',
+ defaultDialogTransition : \'none\',
+ ajaxEnabled : false
+ });
+ });
+ </script>';
+ }
+ if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 3) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+ }
}
}
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index accff491427a1f6467634533d6354927f7707749..0220f775d7b63fbe092d7b53d6bba6236e3a9fd3 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -994,10 +994,11 @@ else
if ($conf->use_javascript_ajax)
{
print '<tr class="individualline"><td>'.fieldLabel('FirstName','firstname').'</td>';
- print '<td colspan="3"><input type="text" size="60" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
+ print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
print '</tr>';
- print '<tr class="individualline"><td>'.fieldLabel('UserTitle','civility_id').'</td><td colspan="3">';
- print $formcompany->select_civility($object->civility_id).'</td>';
+ // Title
+ print '<tr class="individualline"><td>'.fieldLabel('UserTitle','civility_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
+ print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').'</td>';
print '</tr>';
}
@@ -1070,9 +1071,9 @@ else
// Zip / Town
print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
- print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
+ print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
print '</td><td>'.fieldLabel('Town','town').'</td><td>';
- print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
+ print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
print '</td></tr>';
// Country
@@ -1092,15 +1093,15 @@ else
// Email web
print '<tr><td>'.fieldLabel('EMail','email').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td>';
- print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
+ print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
print '<tr><td>'.fieldLabel('Web','url').'</td>';
- print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
-
+ print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
+
// Skype
if (! empty($conf->skype->enabled))
{
print '<tr><td>'.fieldLabel('Skype','skype').'</td>';
- print '<td colspan="3"><input type="text" name="skype" id="skype" size="32" value="'.$object->skype.'"></td></tr>';
+ print '<td colspan="3"><input type="text" name="skype" id="skype" value="'.$object->skype.'"></td></tr>';
}
// Phone / Fax
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ae45643c9cb36ab635ea67bd5f9d3490dcd8a486..19f1a68f0fa7232ebb139aa6a9230ddb77e1a5c3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -257,6 +257,10 @@ a.tab { font-weight: bold !important; }
a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none; }
a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
+input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
+ background-color: #FFF;
+}
+
<?php if (empty($dol_use_jmobile)) { ?>
input:focus, textarea:focus, button:focus, select:focus {
@@ -270,8 +274,6 @@ textarea.cke_source:focus
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
- background: #FFF;
- /* color: #111; */
border: 1px solid #C0C0C0;
margin: 0px 0px 0px 0px;
}
@@ -618,6 +620,7 @@ div.myavailability {
.minwidth400imp { min-width: 400px !important; }
.minwidth500imp { min-width: 500px !important; }
}
+.maxwidth50 { max-width: 50px; }
.maxwidth100 { max-width: 100px; }
.maxwidth150 { max-width: 150px; }
.maxwidth200 { max-width: 200px; }
@@ -630,7 +633,7 @@ div.myavailability {
.titlefield { width: 25%; }
.titlefieldmiddle { width: 50%; }
-/* Force values for small screen */
+/* Force values for small screen 1400 */
@media only screen and (max-width: 1400px)
{
.titlefield { width: 30% !important; }
@@ -643,6 +646,7 @@ div.myavailability {
.minwidth500imp { min-width: 300px !important; }
}
+/* Force values for small screen 1000 */
@media only screen and (max-width: 1000px)
{
.maxwidthonsmartphone { max-width: 100px; }
@@ -654,14 +658,26 @@ div.myavailability {
.minwidth500imp { min-width: 100px !important; }
}
-/* Force values for small screen */
+/* Force values for small screen 570 */
@media only screen and (max-width: 570px)
{
- input[type=text] { min-width: 20px; }
-
+ div.titre {
+ line-height: 2em;
+ }
+
+ input[type=text], select, textarea {
+ min-width: 20px;
+ min-height: 1.4em;
+ line-height: 1.4em;
+ margin: .5em 0;
+ padding: .4em .1em;
+ border: 1px solid #BBB;
+ }
+
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
+ .maxwidth50onsmartphone { max-width: 50px; }
.maxwidth100onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 150px; }
.maxwidth200onsmartphone { max-width: 200px; }
@@ -2449,7 +2465,7 @@ table.listwithfilterbefore {
/* Pagination */
div.refidpadding {
- padding-top: <?php print empty($conf->dol_use_jmobile)?'3':'7'; ?>px;
+ padding-top: <?php print ($conf->dol_use_jmobile != 4)?'3':'7'; ?>px;
}
div.refid {
font-weight: bold;
@@ -2485,7 +2501,7 @@ div.pagination li {
display: inline-block;
padding-left: 0px;
padding-right: 0px;
-<?php if (empty($conf->dol_use_jmobile)) { ?>
+<?php if ($conf->dol_use_jmobile != 4) { ?>
padding-top: 6px;
padding-bottom: 5px;
<?php } ?>
@@ -2497,7 +2513,7 @@ div.pagination li {
}
div.pagination li.pagination a,
div.pagination li.pagination span {
-<?php if (empty($conf->dol_use_jmobile)) { ?>
+<?php if ($conf->dol_use_jmobile != 4) { ?>
padding: 6px 12px;
margin-left: -1px;
line-height: 1.42857143;
@@ -2544,13 +2560,13 @@ div.pagination li.litext a:hover {
background-color: transparent;
background-image: none;
}
-<?php if (! empty($conf->dol_use_jmobile)) { ?>
+<?php if ($conf->dol_use_jmobile == 4) { ?>
div.pagination li.litext {
padding-top: 13px;
vertical-align: top;
}
<?php } ?>
-<?php if (empty($conf->dol_use_jmobile)) { ?>
+<?php if ($conf->dol_use_jmobile != 4) { ?>
div.pagination li.noborder a:hover {
border: none;
background-color: transparent;
@@ -4629,9 +4645,9 @@ img.demothumb {
width: <?php print dol_size(300,'width'); ?>px;
}
select {
- width: 100%;
- max-width: 100px;
- min-width: 50px;
+ width: 98%;
+ <?php if (empty($conf->dol_use_jmobile)) { ?>max-width: 100px;<?php } ?>
+ min-width: 40px;
}
div.divphotoref {
padding-right: 5px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3922fbf4bef7a8c00dc29e4c99ac94bc282dd20e..9935c3b22319813b94d9f9b89bbd0167060b2b08 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -163,14 +163,20 @@ $tmppart=explode(',',$colorbackhmenu1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 360) $colortextbackhmenu='FFFFFF';
else $colortextbackhmenu='000000';
+
$tmppart=explode(',',$colorbackvmenu1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 360) { $colortextbackvmenu='FFFFFF'; }
else { $colortextbackvmenu='000000'; }
+
$tmppart=explode(',',$colorbacktitle1);
-$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
-if ($tmpval <= 260) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
-else { $colortexttitle='101010'; $colorshadowtitle='FFFFFF'; }
+if ($colortexttitle == '')
+{
+ $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
+ if ($tmpval <= 260) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
+ else { $colortexttitle='101010'; $colorshadowtitle='FFFFFF'; }
+}
+
$tmppart=explode(',',$colorbacktabcard1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 340) { $colortextbacktab='FFFFFF'; }
@@ -251,6 +257,10 @@ a.tab { font-weight: bold !important; }
a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none; }
a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
+input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
+ background-color: #FDFDFD;
+}
+
<?php if (empty($dol_use_jmobile)) { ?>
input:focus, textarea:focus, button:focus, select:focus {
@@ -264,7 +274,6 @@ textarea.cke_source:focus
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
- background: #FDFDFD;
border: 1px solid #C0C0C0;
margin: 0px 0px 0px 0px;
}
@@ -286,7 +295,7 @@ input.removedassigned {
vertical-align: text-bottom;
margin-bottom: -3px;
}
-input.smallpadd {
+input.smallpadd { /* Used for timesheet input */
padding-left: 1px !important;
padding-right: 1px !important;
}
@@ -304,9 +313,6 @@ span.timesheetalreadyrecorded input {
select.flat, form.flat select {
font-weight: normal;
}
-input:disabled {
- background:#f4f4f4;
-}
.optiongrey, .opacitymedium {
opacity: 0.5;
}
@@ -316,6 +322,10 @@ input:disabled {
.opacitytransp {
opacity: 0;
}
+select:invalid { color: gray; }
+input:disabled {
+ background:#f4f4f4;
+}
input.liste_titre {
box-shadow: none !important;
@@ -331,6 +341,7 @@ input.removedfile {
textarea:disabled {
background:#f4f4f4;
}
+input[type=file ] { background-color: transparent; border-top: none; border-left: none; border-right: none; box-shadow: none; }
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=radio] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
@@ -600,17 +611,22 @@ div.myavailability {
.clearboth { clear:both; }
.hideobject { display: none; }
.minwidth50 { min-width: 50px; }
-.minwidth100 { min-width: 100px; }
-.minwidth200 { min-width: 200px; }
-.minwidth300 { min-width: 300px; }
-.minwidth400 { min-width: 400px; }
-.minwidth500 { min-width: 500px; }
-.minwidth50imp { min-width: 50px !important; }
-.minwidth100imp { min-width: 100px !important; }
-.minwidth200imp { min-width: 200px !important; }
-.minwidth300imp { min-width: 300px !important; }
-.minwidth400imp { min-width: 400px !important; }
-.minwidth500imp { min-width: 500px !important; }
+/* rule to reduce top menu - 3rd reduction */
+@media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
+{
+ .minwidth100 { min-width: 100px; }
+ .minwidth200 { min-width: 200px; }
+ .minwidth300 { min-width: 300px; }
+ .minwidth400 { min-width: 400px; }
+ .minwidth500 { min-width: 500px; }
+ .minwidth50imp { min-width: 50px !important; }
+ .minwidth100imp { min-width: 100px !important; }
+ .minwidth200imp { min-width: 200px !important; }
+ .minwidth300imp { min-width: 300px !important; }
+ .minwidth400imp { min-width: 400px !important; }
+ .minwidth500imp { min-width: 500px !important; }
+}
+.maxwidth50 { max-width: 50px; }
.maxwidth100 { max-width: 100px; }
.maxwidth150 { max-width: 150px; }
.maxwidth200 { max-width: 200px; }
@@ -623,7 +639,7 @@ div.myavailability {
.titlefield { width: 25%; }
.titlefieldmiddle { width: 50%; }
-/* Force values for small screen */
+/* Force values for small screen 1400 */
@media only screen and (max-width: 1400px)
{
.titlefield { width: 30% !important; }
@@ -636,6 +652,7 @@ div.myavailability {
.minwidth500imp { min-width: 300px !important; }
}
+/* Force values for small screen 1000 */
@media only screen and (max-width: 1000px)
{
.maxwidthonsmartphone { max-width: 100px; }
@@ -647,12 +664,26 @@ div.myavailability {
.minwidth500imp { min-width: 100px !important; }
}
-/* Force values for small screen */
+/* Force values for small screen 570 */
@media only screen and (max-width: 570px)
{
+ div.titre {
+ line-height: 2em;
+ }
+
+ input[type=text], select, textarea {
+ min-width: 20px;
+ min-height: 1.4em;
+ line-height: 1.4em;
+ margin: .5em 0;
+ padding: .4em .1em;
+ border: 1px solid #BBB;
+ }
+
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
+ .maxwidth50onsmartphone { max-width: 50px; }
.maxwidth100onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 150px; }
.maxwidth200onsmartphone { max-width: 200px; }
@@ -2083,7 +2114,7 @@ span.butAction, span.butActionDelete {
color: #ffffff !important;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #006dcc;
- <?php // if (empty($conf->dol_use_jmobile)) { ?>
+ <?php // if (($conf->dol_use_jmobile != 4)) { ?>
background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
@@ -2351,7 +2382,7 @@ table.listwithfilterbefore {
/* Pagination */
div.refidpadding {
- padding-top: <?php print empty($conf->dol_use_jmobile)?'3':'14'; ?>px;
+ padding-top: <?php print ($conf->dol_use_jmobile != 4)?'3':'14'; ?>px;
}
div.refid {
font-weight: bold;
@@ -2387,7 +2418,7 @@ div.pagination li {
display: inline-block;
padding-left: 0px;
padding-right: 0px;
-<?php if (empty($conf->dol_use_jmobile)) { ?>
+<?php if (($conf->dol_use_jmobile != 4)) { ?>
padding-top: 6px;
padding-bottom: 5px;
<?php } ?>
@@ -2400,7 +2431,7 @@ div.pagination li {
div.pagination li.pagination a,
div.pagination li.pagination span {
-<?php if (empty($conf->dol_use_jmobile)) { ?>
+<?php if ($conf->dol_use_jmobile != 4) { ?>
padding: 6px 12px;
margin-left: -1px;
line-height: 1.42857143;
@@ -2427,13 +2458,13 @@ border: none;
padding-left: 4px;
font-weight: bold;
}
-<?php if (! empty($conf->dol_use_jmobile)) { ?>
+<?php if ($conf->dol_use_jmobile == 4) { ?>
div.pagination li.litext {
padding-top: 13px;
vertical-align: top;
}
<?php } ?>
-<?php if (empty($conf->dol_use_jmobile)) { ?>
+<?php if ($conf->dol_use_jmobile != 4) { ?>
div.pagination li.noborder a:hover {
border: none;
background-color: transparent;
@@ -4362,6 +4393,8 @@ border-top-right-radius: 6px;
img.demothumb {
box-shadow: 2px 2px 8px #888;
margin-bottom: 4px;
+ margin-right: 20px;
+ margin-left: 10px;
}
@@ -4509,8 +4542,8 @@ img.demothumb {
width: <?php print dol_size(300,'width'); ?>px;
}
select {
- width: 100%;
- max-width: 100px;
+ width: 98%;
+ <?php if (empty($conf->dol_use_jmobile)) { ?>max-width: 100px;<?php } ?>
min-width: 0 !important;
}
div.divphotoref {