lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Remove useless array title bar

Browse Source
This commit is contained in:
Laurent Destailleur 2013-10-25 18:01:45 +02:00
parent 19ae524ad9
commit bcd63d2466
2 changed files with 123 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
htdocs/admin/modules.php
View File

@ -278,17 +278,16 @@ $var=true;
if ($mode != 'marketplace') if ($mode != 'marketplace')
{ {
print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n"; print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
//print "<tr class=\"liste_titre\">\n";
/*
print '<tr class="liste_titre">'."\n"; print '<tr class="liste_titre">'."\n";
//print " <td>".$langs->trans("Family")."</td>\n";
print " <td colspan=\"2\">".$langs->trans("Module")."</td>\n"; print " <td colspan=\"2\">".$langs->trans("Module")."</td>\n";
print " <td>".$langs->trans("Description")."</td>\n"; print " <td>".$langs->trans("Description")."</td>\n";
print " <td align=\"center\">".$langs->trans("Version")."</td>\n"; print " <td align=\"center\">".$langs->trans("Version")."</td>\n";
//print " <td align=\"center\">".$langs->trans("DbVersion")."</td>\n"; print ' <td align="center">'.$langs->trans("Status").'</td>'."\n";
print " <td align=\"center\">".$langs->trans("Status")."</td>\n"; print ' <td align="right">'.$langs->trans("SetupShort").'</td>'."\n";
print " <td align=\"right\">".$langs->trans("SetupShort")."</td>\n";
print "</tr>\n"; print "</tr>\n";
*/
// Show list of modules // Show list of modules
@ -338,139 +337,143 @@ if ($mode != 'marketplace')
// Print a separator if we change family // Print a separator if we change family
//print "<tr><td>xx".$oldfamily."-".$family."-".$atleastoneforfamily."<br></td><tr>"; //print "<tr><td>xx".$oldfamily."-".$family."-".$atleastoneforfamily."<br></td><tr>";
//if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) { //if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) {
if ($family!=$oldfamily) { if ($family!=$oldfamily)
print '<tr class="liste_titre">'."\n <td colspan=\"6\">"; {
print '<tr class="liste_titre">'."\n";
print '<td colspan="5">';
$familytext=empty($familylib[$family])?$family:$familylib[$family]; $familytext=empty($familylib[$family])?$family:$familylib[$family];
print $familytext; print $familytext;
print "</td>\n</tr>\n"; print "</td>\n";
print '<td align="right">'.$langs->trans("SetupShort").'</td>'."\n";
print "</tr>\n";
$atleastoneforfamily=0; $atleastoneforfamily=0;
//print "<tr><td>yy".$oldfamily."-".$family."-".$atleastoneforfamily."<br></td><tr>"; //print "<tr><td>yy".$oldfamily."-".$family."-".$atleastoneforfamily."<br></td><tr>";
} }
$atleastoneforfamily++; $atleastoneforfamily++;
if ($family!=$oldfamily) if ($family!=$oldfamily)
{ {
$familytext=empty($familylib[$family])?$family:$familylib[$family]; $familytext=empty($familylib[$family])?$family:$familylib[$family];
//print $familytext; //print $familytext;
$oldfamily=$family; $oldfamily=$family;
} }
$var=!$var; $var=!$var;
//print "\n<!-- Module ".$objMod->numero." ".$objMod->getName()." found into ".$dirmod[$key]." -->\n"; //print "\n<!-- Module ".$objMod->numero." ".$objMod->getName()." found into ".$dirmod[$key]." -->\n";
print '<tr '.$bc[$var].">\n"; print '<tr '.$bc[$var].">\n";
// Picto // Picto
print ' <td valign="top" width="14" align="center">'; print ' <td valign="top" width="14" align="center">';
$alttext=''; $alttext='';
//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version); //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 (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
if (! empty($objMod->picto)) if (! empty($objMod->picto))
{ {
if (preg_match('/^\//i',$objMod->picto)) print img_picto($alttext,$objMod->picto,' width="14px"',1); 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,$objMod->picto,' width="14px"');
} }
else else
{ {
print img_object($alttext,'generic'); print img_object($alttext,'generic');
} }
print '</td>'; print '</td>';
// Name // Name
print '<td valign="top">'.$objMod->getName(); print '<td valign="top">'.$objMod->getName();
print "</td>\n"; print "</td>\n";
// Desc // Desc
print "<td valign=\"top\">"; print '<td valign="top">';
print nl2br($objMod->getDesc()); print nl2br($objMod->getDesc());
print "</td>\n"; print "</td>\n";
// Version // Version
print "<td align=\"center\" valign=\"top\" nowrap=\"nowrap\">"; print '<td align="center" valign="top" class="nowrap">';
print $objMod->getVersion(); print $objMod->getVersion();
print "</td>\n"; print "</td>\n";
// Activate/Disable and Setup (2 columns) // Activate/Disable and Setup (2 columns)
if (! empty($conf->global->$const_name)) if (! empty($conf->global->$const_name))
{ {
$disableSetup = 0; $disableSetup = 0;
print "<td align=\"center\" valign=\"middle\">"; print '<td align="center" valign="middle">';
// Module actif // Module actif
if (! empty($objMod->always_enabled) || ((! empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity!=1))) if (! empty($objMod->always_enabled) || ((! empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity!=1)))
{ {
print $langs->trans("Required"); print $langs->trans("Required");
if (! empty($conf->multicompany->enabled) && $user->entity) $disableSetup++; if (! empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
print '</td>'."\n"; print '</td>'."\n";
} }
else else
{ {
print '<a href="modules.php?id='.$objMod->numero.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode . '">'; print '<a href="modules.php?id='.$objMod->numero.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode . '">';
print img_picto($langs->trans("Activated"),'switch_on'); print img_picto($langs->trans("Activated"),'switch_on');
print '</a></td>'."\n"; print '</a></td>'."\n";
} }
if (! empty($objMod->config_page_url) && !$disableSetup) if (! empty($objMod->config_page_url) && !$disableSetup)
{ {
if (is_array($objMod->config_page_url)) if (is_array($objMod->config_page_url))
{ {
print ' <td align="right" valign="top">'; print ' <td align="right" valign="top">';
$i=0; $i=0;
foreach ($objMod->config_page_url as $page) foreach ($objMod->config_page_url as $page)
{ {
$urlpage=$page; $urlpage=$page;
if ($i++) if ($i++)
{ {
print '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page),"setup").'</a>&nbsp;'; print '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page),"setup").'</a>&nbsp;';
// print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;'; // print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
} }
else else
{ {
if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs)) if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs))
{ {
print '<a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;'; print '<a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;';
} }
else else
{ {
print '<a href="'.$urlpage.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;'; print '<a href="'.$urlpage.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;';
} }
} }
} }
print "</td>\n"; print "</td>\n";
} }
else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs)) else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
{ {
print '<td align="right" valign="top"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>'; print '<td align="right" valign="top"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>';
} }
else else
{ {
print '<td align="right" valign="top"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>'; print '<td align="right" valign="top"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>';
} }
} }
else else
{ {
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
} }
} }
else else
{ {
print "<td align=\"center\" valign=\"middle\">"; print '<td align="center" valign="middle">';
if (! empty($objMod->always_enabled)) if (! empty($objMod->always_enabled))
{ {
// Ne devrait pas arriver. // Ne devrait pas arriver.
} }
// Module non actif // Module non actif
print '<a href="modules.php?id='.$objMod->numero.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . '">'; print '<a href="modules.php?id='.$objMod->numero.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . '">';
print img_picto($langs->trans("Disabled"),'switch_off'); print img_picto($langs->trans("Disabled"),'switch_off');
print "</a></td>\n <td>&nbsp;</td>\n"; print "</a></td>\n <td>&nbsp;</td>\n";
} }
print "</tr>\n"; print "</tr>\n";
} }
print "</table>\n"; print "</table>\n";
@ -502,7 +505,7 @@ dol_fiche_end();
// Show warning about external users // Show warning about external users
if ($mode != 'marketplace') print showModulesExludedForExternal($modules).'<br>'."\n"; if ($mode != 'marketplace') print '<div class="info">'.showModulesExludedForExternal($modules).'</div><br>'."\n";
llxFooter(); llxFooter();

2
htdocs/theme/eldy/style.css.php
View File

@ -614,7 +614,7 @@ li.tmenu, li.tmenusel {
li.tmenusel, li.tmenu:hover { 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: -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: -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: -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-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
background: rgb(<?php echo $colorbackhmenu1 ?>); background: rgb(<?php echo $colorbackhmenu1 ?>);