diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index c3499bb000a..28968a849fc 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -375,7 +375,7 @@ if (! empty($moreforfilter)) $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields -print '
'; +print '
'; print ''."\n"; print ''; if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 9e09bf87b1d..9785e945a6a 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -329,7 +329,10 @@ print load_fiche_titre($langs->trans("BoxesAvailable")); print ''."\n"; print ''."\n"; print ''."\n"; -print '
'."\n"; + +print '
'; +print '
'."\n"; + print ''; print ''; print ''; @@ -375,6 +378,8 @@ foreach($boxtoadd as $box) } print '
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").'
'."\n"; +print '
'; + print '
'; print ''; print '
'."\n"; @@ -388,7 +393,9 @@ $boxactivated=InfoBox::listBoxes($db,'activated',-1,null); print "
\n\n"; print load_fiche_titre($langs->trans("BoxesActivated")); -print ''; +print '
'; +print '
'."\n"; + print ''; print ''; print ''; @@ -441,7 +448,9 @@ foreach($boxactivated as $key => $box) print ''."\n"; } -print '
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").'

'; +print ''; +print '
'; +print '
'; // Other parameters diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 5749fbbb4fb..7fa47724c3d 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -182,6 +182,7 @@ print 'entity) && $debug)?'? print ''; print ''; +print '
'; print ''; print ''; print ''; @@ -297,6 +298,7 @@ if ($result) print '
'.$langs->trans("Name").'
'; +print '
'; if ($conf->use_javascript_ajax) { @@ -311,6 +313,7 @@ if ($conf->use_javascript_ajax) print "\n"; + llxFooter(); $db->close(); diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index e023af90067..4302222630c 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -124,7 +124,7 @@ dol_fiche_head($head, 'default', $langs->trans("Security")); // Show warning about external users print info_admin(showModulesExludedForExternal($modules)).'
'."\n"; - +print '
'; print ''; // Affiche lignes des permissions @@ -215,8 +215,9 @@ if ($result) } print '
'; - print '
'; +dol_fiche_end(); + llxFooter(); $db->close(); diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php index a558a473957..32532f61f50 100644 --- a/htdocs/admin/system/about.php +++ b/htdocs/admin/system/about.php @@ -86,12 +86,12 @@ if ($sfurl) } print ')'; } - print ' / GNU-GPL v3+'; } else { - print $langs->trans("LastStableVersion").' : ' .$langs->trans("UpdateServerOffline").'
'; + print ' ('.$langs->trans("LastStableVersion").' : ' .$langs->trans("UpdateServerOffline").')
'; } +print ' / GNU-GPL v3+'; print ''; diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php index 30ecc448e4d..b2b5499d298 100644 --- a/htdocs/admin/system/browser.php +++ b/htdocs/admin/system/browser.php @@ -48,6 +48,7 @@ $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]); // Browser $var=true; +print '
'; print ''; print ''."\n"; $var=!$var; @@ -71,10 +72,10 @@ print ''."\n"; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Screen").'
'; +print '
'; print '
'; - llxFooter(); $db->close(); diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index 31d35d3f01d..6e528c73094 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -81,7 +81,8 @@ else { if ($base == 1) { - print ''; + print '
'; + print '
'; print ''; print ''; print ''; @@ -134,11 +135,13 @@ else } } print '
'.$langs->trans("TableName").''.$langs->trans("Type").'
'; + print ''; } if ($base == 2) { - print ''; + print '
'; + print '
'; print ''; print ''; print ''; @@ -173,12 +176,14 @@ else } } print '
'.$langs->trans("TableName").'Nb of tuples
'; + print ''; } if ($base == 4) { // Sqlite by PDO or by Sqlite3 - print ''; + print '
'; + print '
'; print ''; print ''; print ''; @@ -207,6 +212,8 @@ else } } + print '
'.$langs->trans("TableName").''.$langs->trans("NbOfRecord").'
'; + print ''; } } diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index ff7a16d1893..c50e6ca9e4c 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -42,6 +42,7 @@ llxHeader(); print load_fiche_titre($langs->trans("InfoDatabase"),'','title_setup'); // Database +print '
'; print ''; print ''."\n"; print ''."\n"; @@ -54,14 +55,16 @@ print ''."\n"; print ''."\n"; print '
'.$langs->trans("Database").'
'.$langs->trans("Version").''.$db::LABEL.' '.$db->getVersion().'
'.$langs->trans("Password").''.pr print '
'.$langs->trans("DBStoringCharset").''.$db->getDefaultCharacterSetDatabase().'
'.$langs->trans("DBSortingCharset").''.$db->getDefaultCollationDatabase().'
'; +print '
'; // Tables print '
'; +print '
'; print ''; print ''."\n"; print ''."\n"; print '
'.$langs->trans("Tables").'
'.$langs->trans("List").'
'; - +print '
'; $listofvars=$db->getServerParametersValues(); $listofstatus=$db->getServerStatusValues(); @@ -76,6 +79,7 @@ else foreach($arraylist as $listname) { print '
'; + print '
'; print ''; print ''; print ''; @@ -120,6 +124,7 @@ else print ''."\n"; } print '
'.$langs->trans("Parameters").'
'."\n"; + print '
'; } } diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 21b79bcd7a1..3117256e3d6 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -48,6 +48,7 @@ print load_fiche_titre($title,'','title_setup'); // Version $var=true; +print '
'; print ''; print ''."\n"; $var=!$var; @@ -69,10 +70,12 @@ else } print ''."\n"; print '
'.$langs->trans("Version").''.$langs->trans("Value").'
'; +print '
'; print '
'; // Session $var=true; +print '
'; print ''; print ''."\n"; $var=!$var; @@ -107,6 +110,7 @@ foreach($_SESSION as $key => $val) } print ''."\n"; print '
'.$langs->trans("Session").''.$langs->trans("Value").'
'; +print '
'; print '
'; @@ -116,6 +120,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S $shmoparray=dol_listshmop(); $var=true; + print '
'; print ''; print ''; print ''; @@ -133,12 +138,14 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S } print '
'.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").'
'; + print '
'; print '
'; } // Localisation $var=true; +print '
'; print ''; print ''."\n"; $var=!$var; @@ -234,6 +241,7 @@ if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_F print ''."\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php print '
'.$langs->trans("LocalisationDolibarrParameters").''.$langs->trans("Value").'
  => '.$langs->trans("File encoding").''.$tmp.'
'; +print '
'; print '
'; @@ -292,6 +300,7 @@ $configfileparameters=array( ); $var=true; +print '
'; print ''; print ''; print '
'.$langs->trans("Parameters").' '; @@ -353,11 +362,13 @@ foreach($configfileparameters as $key => $value) } } print '
'; +print '
'; print '
'; // Parameters in database +print '
'; print ''; print ''; print ''; @@ -407,7 +418,7 @@ if ($resql) } print '
'.$langs->trans("Parameters").' '.$langs->trans("Database").'
'; - +print '
'; llxFooter(); diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index d812f6c29ed..706e0215059 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -102,6 +102,8 @@ foreach($modulesdir as $dir) closedir($handle); } } + +print '
'; print ''; print ''; print ''; @@ -148,6 +150,7 @@ foreach($sortorder as $numero=>$name) print "\n"; } print '
'.$langs->trans("Modules").'
'; +print '
'; print '
'; sort($rights_ids); $old=''; diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index ffba92fd4fa..3e9ccbc895f 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -68,8 +68,8 @@ print '
'; $phparray=phpinfo_array(); foreach($phparray as $key => $value) { - //print load_fiche_titre($key); - print ''; + print '
'; + print '
'; print ''; //print ''; print ''; @@ -114,7 +114,9 @@ foreach($phparray as $key => $value) print ''; } } - print '
'.$langs->trans("Parameter").''.$key.'

'; + print ''; + print ''; + print '
'; } diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index c44932655ed..4e0651597ee 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -213,6 +213,8 @@ if ($result) } print '
'; + + print '
'; print ''; print ''; print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"e.dateevent","","",'align="left"',$sortfield,$sortorder); @@ -312,7 +314,10 @@ if ($result) if ($usefilter) print ''; else print ''; } - print "
'.$langs->trans("NoEventFoundWithCriteria").'
'.$langs->trans("NoEventOrNoAuditSetup").'
"; + print ""; + print "
"; + + print ""; $db->free($result); } else diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index de59c9136b2..d0d3c117be6 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -52,6 +52,7 @@ $template_dir = DOL_DOCUMENT_ROOT.'/core/tpl/'; $interfaces = new Interfaces($db); $triggers = $interfaces->getTriggersList(); +print '
'; print ' @@ -78,6 +79,7 @@ foreach ($triggers as $trigger) } print '
'.$langs->trans("File").'
'; +print '
'; llxFooter(); diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php index 9afd0e7835b..3392785a571 100644 --- a/htdocs/core/lib/cron.lib.php +++ b/htdocs/core/lib/cron.lib.php @@ -92,14 +92,16 @@ function dol_print_cron_urls() //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current // Cron launch + print '
'; print ''.$langs->trans("URLToLaunchCronJobs").':
'; $url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login; print img_picto('','object_globe.png').' '.$url."
\n"; print ' '.$langs->trans("OrToLaunchASpecificJob").'
'; $url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid'; print img_picto('','object_globe.png').' '.$url."
\n"; - print '
'; - + print '
'; + print '
'; + $logintouse = 'firstadmin'; if ($user->admin) $logintouse = $user->login; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 5ca0fc61cf2..880235a9a17 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -294,6 +294,7 @@ if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->t print '
'; +print '
'; print ''; print ''; print_liste_field_titre($langs->trans("ID"),$_SERVER["PHP_SELF"],"t.rowid","",$param,'',$sortfield,$sortorder); @@ -472,6 +473,7 @@ else } print '
'; +print '
'; print ''; @@ -481,7 +483,6 @@ print '

'; dol_print_cron_urls(); - llxFooter(); $db->close(); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b077c79a992..249a77a2258 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -619,13 +619,15 @@ div.myavailability { -ms-overflow-style: -ms-autohiding-scrollbar; }*/ /* Style used for most tables */ -.div-table-responsive { +.div-table-responsive, .div-table-responsive-no-min { overflow-x: auto; min-height: 0.01%; } /* Style used for full page tables with field selector and no content after table (priority before previous for such tables) */ -div.fiche>form>div.div-table-responsive { +div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive-no-min { overflow-x: auto; +} +div.fiche>form>div.div-table-responsive { min-height: 350px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7a0d16e4743..07d02674611 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -596,13 +596,15 @@ div.myavailability { -ms-overflow-style: -ms-autohiding-scrollbar; }*/ /* Style used for most tables */ -.div-table-responsive { +.div-table-responsive, .div-table-responsive-no-min { overflow-x: auto; min-height: 0.01%; } /* Style used for full page tables with field selector and no content after table (priority before previous for such tables) */ -div.fiche>form>div.div-table-responsive { +div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive-no-min { overflow-x: auto; +} +div.fiche>form>div.div-table-responsive { min-height: 350px; } diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index af46fd39d21..c2dd4936ea8 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -38,11 +38,13 @@ $sall=GETPOST('sall'); $search_group=GETPOST('search_group'); $optioncss = GETPOST('optioncss','alpha'); +// Load variable for pagination +$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit; $sortfield = GETPOST('sortfield','alpha'); $sortorder = GETPOST('sortorder','alpha'); $page = GETPOST('page','int'); if ($page == -1) { $page = 0; } -$offset = $conf->liste_limit * $page; +$offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; @@ -56,14 +58,40 @@ $fieldstosearchall = array( ); +/* + * Actions + */ + +if (GETPOST('cancel')) { $action='list'; $massaction=''; } +if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; } + +$parameters=array(); +$reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + +if (empty($reshook)) +{ + // Selection of new fields + include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; + + // Purge search criteria + if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All test are required to be compatible with all browsers + { + $search_label=""; + $search_date_creation=""; + $search_date_update=""; + $search_array_options=array(); + } +} + + + /* * View */ llxHeader(); -print load_fiche_titre($langs->trans("ListOfGroups")); - $sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid"; @@ -87,11 +115,33 @@ $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); + + $nbtotalofrecords = $num; + $i = 0; $param="&search_group=".urlencode($search_group)."&sall=".urlencode($sall); if ($optioncss != '') $param.='&optioncss='.$optioncss; + $text = $langs->trans("ListOfGroups"); + + print '
'."\n"; + if ($optioncss != '') print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit); + + if ($sall) + { + foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); + print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + } + if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); @@ -103,7 +153,9 @@ if ($resql) //$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; //$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields - print ''; + print '
'; + print '
'."\n"; + print ''; print_liste_field_titre($langs->trans("Group"),$_SERVER["PHP_SELF"],"g.nom",$param,"","",$sortfield,$sortorder); //multicompany @@ -114,6 +166,7 @@ if ($resql) print_liste_field_titre($langs->trans("NbOfUsers"),$_SERVER["PHP_SELF"],"nb",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"g.datec",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; + $var=True; while ($i < $num) { @@ -139,6 +192,10 @@ if ($resql) $i++; } print "
"; + + print ''; + print "
\n"; + $db->free(); } else