diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index cfaa0c72004..4aca54817e8 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -278,17 +278,16 @@ $var=true; if ($mode != 'marketplace') { print "\n"; - //print "\n"; + + /* print ''."\n"; - //print " \n"; print " \n"; print " \n"; print " \n"; - //print " \n"; - print " \n"; - print " \n"; + print ' '."\n"; + print ' '."\n"; print "\n"; - + */ // Show list of modules @@ -338,139 +337,143 @@ if ($mode != 'marketplace') // Print a separator if we change family //print ""; //if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) { - if ($family!=$oldfamily) { - print ''."\n '."\n"; + print '\n\n"; + print "\n"; + print ''."\n"; + print "\n"; $atleastoneforfamily=0; //print ""; } - $atleastoneforfamily++; + $atleastoneforfamily++; - if ($family!=$oldfamily) - { - $familytext=empty($familylib[$family])?$family:$familylib[$family]; - //print $familytext; - $oldfamily=$family; - } + if ($family!=$oldfamily) + { + $familytext=empty($familylib[$family])?$family:$familylib[$family]; + //print $familytext; + $oldfamily=$family; + } - $var=!$var; + $var=!$var; - //print "\n\n"; - print '\n"; + //print "\n\n"; + print '\n"; - // Picto - print ' '; + // Picto + print ' '; - // Name - print '\n"; + // Name + print '\n"; - // Desc - print "\n"; + // Desc + print '\n"; - // Version - print "\n"; + // Version + print '\n"; - // Activate/Disable and Setup (2 columns) - if (! empty($conf->global->$const_name)) - { - $disableSetup = 0; + // Activate/Disable and Setup (2 columns) + if (! empty($conf->global->$const_name)) + { + $disableSetup = 0; - print "'."\n"; - } - else - { - print ''; - print img_picto($langs->trans("Activated"),'switch_on'); - print ''."\n"; - } + // Module actif + if (! empty($objMod->always_enabled) || ((! empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity!=1))) + { + print $langs->trans("Required"); + if (! empty($conf->multicompany->enabled) && $user->entity) $disableSetup++; + print ''."\n"; + } + else + { + print ''; + print img_picto($langs->trans("Activated"),'switch_on'); + print ''."\n"; + } - if (! empty($objMod->config_page_url) && !$disableSetup) - { - if (is_array($objMod->config_page_url)) - { - print ' \n"; - } - else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs)) - { - print ''; - } - else - { - print ''; - } - } - else - { - print ""; - } + if (! empty($objMod->config_page_url) && !$disableSetup) + { + if (is_array($objMod->config_page_url)) + { + print ' \n"; + } + else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs)) + { + print ''; + } + else + { + print ''; + } + } + else + { + print ""; + } - } - else - { - print "\n \n"; - } + // Module non actif + print ''; + print img_picto($langs->trans("Disabled"),'switch_off'); + print "\n \n"; + } - print "\n"; + print "\n"; } print "
".$langs->trans("Family")."".$langs->trans("Module")."".$langs->trans("Description")."".$langs->trans("Version")."".$langs->trans("DbVersion")."".$langs->trans("Status")."".$langs->trans("SetupShort")."'.$langs->trans("Status").''.$langs->trans("SetupShort").'
xx".$oldfamily."-".$family."-".$atleastoneforfamily."
"; + if ($family!=$oldfamily) + { + print '
'; $familytext=empty($familylib[$family])?$family:$familylib[$family]; print $familytext; - print "
'.$langs->trans("SetupShort").'
yy".$oldfamily."-".$family."-".$atleastoneforfamily."
'; - $alttext=''; - //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version); - //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin); - if (! empty($objMod->picto)) - { - if (preg_match('/^\//i',$objMod->picto)) print img_picto($alttext,$objMod->picto,' width="14px"',1); - else print img_object($alttext,$objMod->picto,' width="14px"'); - } - else - { - print img_object($alttext,'generic'); - } - print ''; + $alttext=''; + //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version); + //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin); + if (! empty($objMod->picto)) + { + if (preg_match('/^\//i',$objMod->picto)) print img_picto($alttext,$objMod->picto,' width="14px"',1); + else print img_object($alttext,$objMod->picto,' width="14px"'); + } + else + { + print img_object($alttext,'generic'); + } + print ''.$objMod->getName(); - print "'.$objMod->getName(); + print ""; - print nl2br($objMod->getDesc()); - print "'; + print nl2br($objMod->getDesc()); + print ""; - print $objMod->getVersion(); - print "'; + print $objMod->getVersion(); + print ""; + print ''; - // Module actif - if (! empty($objMod->always_enabled) || ((! empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity!=1))) - { - print $langs->trans("Required"); - if (! empty($conf->multicompany->enabled) && $user->entity) $disableSetup++; - print ''; - $i=0; - foreach ($objMod->config_page_url as $page) - { - $urlpage=$page; - if ($i++) - { - print ''.img_picto(ucfirst($page),"setup").' '; - // print ''.ucfirst($page).' '; - } - else - { - if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs)) - { - print ''.img_picto($langs->trans("Setup"),"setup").' '; - } - else - { - print ''.img_picto($langs->trans("Setup"),"setup").' '; - } - } - } - print "'.img_picto($langs->trans("Setup"),"setup").''.img_picto($langs->trans("Setup"),"setup").' '; + $i=0; + foreach ($objMod->config_page_url as $page) + { + $urlpage=$page; + if ($i++) + { + print ''.img_picto(ucfirst($page),"setup").' '; + // print ''.ucfirst($page).' '; + } + else + { + if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs)) + { + print ''.img_picto($langs->trans("Setup"),"setup").' '; + } + else + { + print ''.img_picto($langs->trans("Setup"),"setup").' '; + } + } + } + print "'.img_picto($langs->trans("Setup"),"setup").''.img_picto($langs->trans("Setup"),"setup").' "; + } + else + { + print ''; - if (! empty($objMod->always_enabled)) - { - // Ne devrait pas arriver. - } + if (! empty($objMod->always_enabled)) + { + // Ne devrait pas arriver. + } - // Module non actif - print ''; - print img_picto($langs->trans("Disabled"),'switch_off'); - print "  
\n"; @@ -502,7 +505,7 @@ dol_fiche_end(); // Show warning about external users -if ($mode != 'marketplace') print showModulesExludedForExternal($modules).'
'."\n"; +if ($mode != 'marketplace') print '
'.showModulesExludedForExternal($modules).'

'."\n"; llxFooter(); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index db7500f12ce..586936c0e73 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -614,7 +614,7 @@ li.tmenu, li.tmenusel { li.tmenusel, li.tmenu:hover { background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; background-image: -moz-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; - background-image: -webkit-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; + background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0) 100%) !important; background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; background: rgb();