diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index fb43f098583..aadc9d47bde 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -41,10 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; -$langs->load("banks"); -$langs->load("categories"); -$langs->load("companies"); -$langs->load("bills"); +$langs->loadLangs(array("banks","categories","companies","bills","trips")); $action=GETPOST('action', 'alpha'); $id=GETPOST('account','int'); @@ -705,7 +702,7 @@ else $newline=0; } elseif ($links[$key]['type']=='user') { - print ''; + print ''; print img_object($langs->trans('ShowUser'),'user').' '; print $links[$key]['label']; print ''; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index dd7c6bc51e5..733ef9e9f16 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3791,7 +3791,7 @@ else if ($id > 0 || ! empty($ref)) // List of payments already done - + print '
'; print ''; print ''; @@ -4002,6 +4002,7 @@ else if ($id > 0 || ! empty($ref)) } print '
'; + print '
'; // Margin Infos if (! empty($conf->margin->enabled)) { diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 9f2245d38a5..01494955feb 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -591,7 +591,9 @@ if ($object->id > 0) /* * Withdrawals - */ + */ + + print '
'; print ''; print ''; @@ -664,7 +666,6 @@ if ($object->id > 0) { $obj = $db->fetch_object($result); - print ''; print '\n"; @@ -689,7 +690,8 @@ if ($object->id > 0) print "\n"; $i++; } - + if (! $num) + print ''; $db->free($result); } else @@ -698,6 +700,7 @@ if ($object->id > 0) } print "
'.dol_print_date($db->jdate($obj->date_demande),'day')."
'.$langs->trans("None").'
"; + print '
'; } diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php index a5f9aa597f0..ca22ad05fd4 100644 --- a/htdocs/core/js/lib_head.js.php +++ b/htdocs/core/js/lib_head.js.php @@ -1067,22 +1067,25 @@ if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUE ?> // Defined properties for JNotify $(document).ready(function() { - $.jnotify.setup({ - delay: 3000 // the default time to show each notification (in milliseconds) - , sticky: false // determines if the message should be considered "sticky" (user must manually close notification) - , closeLabel: "×" // the HTML to use for the "Close" link - , showClose: true // determines if the "Close" link should be shown if notification is also sticky - , fadeSpeed: 1000 // the speed to fade messages out (in milliseconds) - , slideSpeed: 250 // the speed used to slide messages out (in milliseconds) - , classContainer: "jnotify-container" - , classNotification: "jnotify-notification" - , classBackground: "jnotify-background" - , classClose: "jnotify-close" - , classMessage: "jnotify-message" - , init: null // callback that occurs when the main jnotify container is created - , create: null // callback that occurs when when the note is created (occurs just before appearing in DOM) - , beforeRemove: null // callback that occurs when before the notification starts to fade away - }); + if (typeof $.jnotify == 'function') + { + $.jnotify.setup({ + delay: 3000 // the default time to show each notification (in milliseconds) + , sticky: false // determines if the message should be considered "sticky" (user must manually close notification) + , closeLabel: "×" // the HTML to use for the "Close" link + , showClose: true // determines if the "Close" link should be shown if notification is also sticky + , fadeSpeed: 1000 // the speed to fade messages out (in milliseconds) + , slideSpeed: 250 // the speed used to slide messages out (in milliseconds) + , classContainer: "jnotify-container" + , classNotification: "jnotify-notification" + , classBackground: "jnotify-background" + , classClose: "jnotify-close" + , classMessage: "jnotify-message" + , init: null // callback that occurs when the main jnotify container is created + , create: null // callback that occurs when when the note is created (occurs just before appearing in DOM) + , beforeRemove: null // callback that occurs when before the notification starts to fade away + }); + } }); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f3b2f3892ca..435ae68fa94 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1119,7 +1119,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi if (count($keys)) $maxkey=max($keys); } - //$conf->global->MAIN_MAXTABS_IN_CARD=3; + if (! empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD=2; // Show tabs $bactive=false; @@ -1132,9 +1132,8 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi { if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2])) { - // si l'active est prĂ©sent dans la box - if ($i >= $limittoshow) - $limittoshow--; + // If active tab is already present + if ($i >= $limittoshow) $limittoshow--; } } @@ -1146,7 +1145,9 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi $bactive=true; } else + { $isactive=false; + } if ($i < $limittoshow || $isactive) { @@ -1155,11 +1156,11 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi { if (!empty($links[$i][0])) { - $out.=''.$links[$i][1].''."\n"; + $out.=''.$links[$i][1].''."\n"; } else { - $out.=''.$links[$i][1].''."\n"; + $out.=''.$links[$i][1].''."\n"; } } else if (! empty($links[$i][1])) @@ -1167,11 +1168,15 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi //print "x $i $active ".$links[$i][2]." z"; if ($isactive) { - $out.=''.$links[$i][1].''."\n"; + $out.=''; + $out.=$links[$i][1]; + $out.=''."\n"; } else { - $out.=''.$links[$i][1].''."\n"; + $out.=''; + $out.=$links[$i][1]; + $out.=''."\n"; } } $out.=''; @@ -1182,9 +1187,9 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi if (! $popuptab) { $popuptab=1; - $outmore.='
'; + $outmore.='
'; // The css used to hide/show popup } - $outmore.='
'; + $outmore.='
'; if (isset($links[$i][2]) && $links[$i][2] == 'image') { if (!empty($links[$i][0])) @@ -1194,8 +1199,11 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi } else if (! empty($links[$i][1])) - $outmore.=''.$links[$i][1].''."\n"; - + { + $outmore.=''; + $outmore.=preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts. + $outmore.=''."\n"; + } $outmore.='
'; $nbintab++; @@ -1206,15 +1214,21 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi if ($displaytab > $limittoshow) { + $left=($langs->trans("DIRECTION") == 'rtl'?'right':'left'); + $right=($langs->trans("DIRECTION") == 'rtl'?'left':'right'); + $tabsname=str_replace("@", "", $picto); $out.='
'; - $out.=''.$langs->trans("More").'... ('.$nbintab.')'; - $out.='
'.$outmore.'
'; + $out.=''.$langs->trans("More").'... ('.$nbintab.')'; + $out.='
'; + $out.=$outmore; + $out.='
'; + $out.='
'; $out.="
\n"; $out.=""; } diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index ffda7e2f4cd..d2241b9841a 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +$langs->load('companies'); $langs->load('bills'); $id = GETPOST("facid",'int')?GETPOST("facid",'int'):GETPOST("id",'int'); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a9a0e4a666..fc992bd5cf9 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -456,6 +456,9 @@ fieldset { border: 1px solid #AAAAAA !important; } .trextrafieldseparator td { border-bottom: 2px solid rgb(120,120,120) !important; } +input#onlinepaymenturl, input#directdownloadlink { + opacity: 0.7; +} hr { border: 0; border-top: 1px solid #ccc; } @@ -581,6 +584,9 @@ textarea.centpercent { .nowraponall { white-space: nowrap; } +.wordwrap { + word-wrap: break-word; +} .nobold { font-weight: normal !important; } @@ -911,6 +917,9 @@ select.selectarrowonleft option { body { font-size: px; } + div.refidno { + font-size: px !important; + } } /* Force values for small screen 570 */ @@ -919,6 +928,9 @@ select.selectarrowonleft option { body { font-size: px; } + div.refidno { + font-size: px !important; + } .divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; } @@ -932,7 +944,8 @@ select.selectarrowonleft option { margin-top: px !important; } div.titre { - line-height: 2em; + margin-top: 12px; + /* line-height: 2em; */ } .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col { height: 40px !important; @@ -4080,6 +4093,7 @@ div#ecm-layout-center { max-width: 1024px; padding-left: 10px !important; padding-right: 10px !important; + word-wrap: break-word; } .jnotify-container .jnotify-notification .jnotify-message { font-weight: normal; @@ -4887,6 +4901,10 @@ div.tabsElem a.tab { div.tmenuleft { display: none; } + + .dropdown dd ul { + max-width: 300px; + } } /* rule to reduce top menu - 2nd reduction */ @media only screen and (max-width: px) /* reduction 2 */ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index d2b7323983a..59f5ac9208c 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -589,6 +589,9 @@ textarea.centpercent { .nowraponall { white-space: nowrap; } +.wordwrap { + word-wrap: break-word; +} .nobold { font-weight: normal !important; } @@ -908,6 +911,9 @@ select.selectarrowonleft option { body { font-size: px; } + div.refidno { + font-size: px !important; + } } /* Force values for small screen 570 */ @@ -916,6 +922,9 @@ select.selectarrowonleft option { body { font-size: px; } + div.refidno { + font-size: px !important; + } .divmainbodylarge { margin-left: 20px; margin-right: 20px; } @@ -929,7 +938,8 @@ select.selectarrowonleft option { margin-top: px !important; } div.titre { - line-height: 2em; + margin-top: 12px; + /* line-height: 2em; */ } .border tbody tr, .border tbody tr td, div.tabBar table.border tr { height: 40px !important;