New: Add more space for module description

New: Add dolistore in module setup area.

htdocs/admin/modules.php

@@ -295,12 +295,13 @@ if ($mode==0) { $tagmode = 'common';     print $langs->trans("ModulesDesc")."<br
 if ($mode==2) { $tagmode = 'other';       print $langs->trans("ModulesSpecialDesc")."<br>\n"; }
 if ($mode==1) { $tagmode = 'interfaces';  print $langs->trans("ModulesInterfaceDesc")."<br>\n"; }
 if ($mode==3) { $tagmode = 'functional';  print $langs->trans("ModulesJobDesc")."<br>\n"; }
+if ($mode==4) { $tagmode = 'marketplace'; print $langs->trans("ModulesMarketPlaceDesc")."<br>\n"; }
 print "<br>\n";
 
 
 $h = 0;
 
-$categidx=0;
+$categidx=0;    // Main
 if (! empty($categ[$categidx]))
 {
 	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
@@ -309,7 +310,7 @@ if (! empty($categ[$categidx]))
 	$h++;
 }
 
-$categidx=2;
+$categidx=2;    // Other
 if (! empty($categ[$categidx]))
 {
 	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
@@ -318,7 +319,7 @@ if (! empty($categ[$categidx]))
 	$h++;
 }
 
-$categidx=1;
+$categidx=1;    // Interfaces
 if (! empty($categ[$categidx]))
 {
 	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
@@ -327,7 +328,7 @@ if (! empty($categ[$categidx]))
 	$h++;
 }
 
-$categidx=3;
+$categidx=3;    // Not used
 if (! empty($categ[$categidx]))
 {
 	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
@@ -336,47 +337,63 @@ if (! empty($categ[$categidx]))
 	$h++;
 }
 
+$categidx=4;
+//if (! empty($categ[$categidx]))
+//{
+    $head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
+    $head[$h][1] = $langs->trans("ModulesMarketPlaces");
+    $head[$h][2] = 'marketplace';
+    $h++;
+//}
+
+
 dol_fiche_head($head, $tagmode, $langs->trans("Modules"));
 
 
 if ($mesg) print '<div class="error">'.$mesg.'</div>';
 
-print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\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>".$langs->trans("Description")."</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>".$langs->trans("SetupShort")."</td>\n";
-print "</tr>\n";
 
-
+if ($mode != 4)
-// Affichage liste modules
-
-$var=true;
-$oldfamily='';
-
-$familylib=array(
-'base'=>$langs->trans("ModuleFamilyBase"),
-'crm'=>$langs->trans("ModuleFamilyCrm"),
-'products'=>$langs->trans("ModuleFamilyProducts"),
-'hr'=>$langs->trans("ModuleFamilyHr"),
-'projects'=>$langs->trans("ModuleFamilyProjects"),
-'financial'=>$langs->trans("ModuleFamilyFinancial"),
-'ecm'=>$langs->trans("ModuleFamilyECM"),
-'technic'=>$langs->trans("ModuleFamilyTechnic"),
-'other'=>$langs->trans("ModuleFamilyOther")
-);
-foreach ($orders as $key => $value)
 {
+    print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
+    //print "<tr class=\"liste_titre\">\n";
+    print '<tr class="liste_total">'."\n";
+    //print "  <td>".$langs->trans("Family")."</td>\n";
+    print "  <td colspan=\"2\">".$langs->trans("Module")."</td>\n";
+    print "  <td>".$langs->trans("Description")."</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=\"right\">".$langs->trans("SetupShort")."</td>\n";
+    print "</tr>\n";
+
+
+    // Affichage liste modules
+
+    $var=true;
+    $oldfamily='';
+
+    $familylib=array(
+    'base'=>$langs->trans("ModuleFamilyBase"),
+    'crm'=>$langs->trans("ModuleFamilyCrm"),
+    'products'=>$langs->trans("ModuleFamilyProducts"),
+    'hr'=>$langs->trans("ModuleFamilyHr"),
+    'projects'=>$langs->trans("ModuleFamilyProjects"),
+    'financial'=>$langs->trans("ModuleFamilyFinancial"),
+    'ecm'=>$langs->trans("ModuleFamilyECM"),
+    'technic'=>$langs->trans("ModuleFamilyTechnic"),
+    'other'=>$langs->trans("ModuleFamilyOther")
+    );
+    foreach ($orders as $key => $value)
+    {
         $tab=explode('_',$value);
         $family=$tab[0]; $numero=$tab[1];
 
         $modName = $filename[$key];
     	$objMod  = $modules[$key];
 
+        if ($objMod->special != $mode) continue;    // Discard if not for tab
+
         $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
 
         // Load all lang files of module
@@ -390,8 +407,12 @@ foreach ($orders as $key => $value)
 
         // Print a separator if we change family
         //print "<tr><td>xx".$oldfamily."-".$family."-".$atleastoneforfamily."<br></td><tr>";
-    if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) {
+        //if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) {
-        print "<tr class=\"liste_titre\">\n  <td colspan=\"9\"></td>\n</tr>\n";
+        if ($family!=$oldfamily) {
+            print "<tr class=\"liste_titre\">\n  <td colspan=\"6\">";
+            $familytext=empty($familylib[$family])?$family:$familylib[$family];
+            print $familytext;
+            print "</td>\n</tr>\n";
             $atleastoneforfamily=0;
             //print "<tr><td>yy".$oldfamily."-".$family."-".$atleastoneforfamily."<br></td><tr>";
         }
@@ -401,20 +422,20 @@ foreach ($orders as $key => $value)
             $atleastoneforfamily++;
             $var=!$var;
 
-        print "<tr $bc[$var]>\n";
+            print "<tr ".$bc[$var].">\n";
 
-        print "  <td valign=\"top\">";
+            //print '  <td valign="top" nowrap="nowrap">';
             if ($family!=$oldfamily)
             {
                 $familytext=empty($familylib[$family])?$family:$familylib[$family];
-            print $familytext;
+                //print $familytext;
                 $oldfamily=$family;
             }
             else
             {
-            print '&nbsp;';
+                //print '&nbsp;';
             }
-        print "</td>\n";
+            //print "</td>\n";
 
             // Picto
             print '  <td valign="top" width="14" align="center">';
@@ -443,17 +464,19 @@ foreach ($orders as $key => $value)
             print $objMod->getVersion();
             print "</td>\n";
 
-        // Activate/Disable and Setup
+            // Activate/Disable and Setup (2 columns)
-        print "<td align=\"center\" valign=\"top\">";
             if (! empty($conf->global->$const_name))
             {
                 $disableSetup = 0;
 
+                print "<td align=\"center\" valign=\"top\">";
+
             	// Module actif
                 if (! empty($objMod->always_enabled) || (($conf->global->MAIN_MODULE_MULTICOMPANY && $objMod->core_enabled) && ($user->entity || $conf->entity!=1)))
                 {
                 	print $langs->trans("Required");
                 	if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity) $disableSetup++;
+                	print '</td>'."\n";
                 }
                 else
                 {
@@ -466,7 +489,7 @@ foreach ($orders as $key => $value)
                 {
                     if (is_array($objMod->config_page_url))
                     {
-                    print '  <td align="center" valign="top">';
+                        print '  <td align="right" valign="top">';
                         $i=0;
                         foreach ($objMod->config_page_url as $page)
                         {
@@ -492,11 +515,11 @@ foreach ($orders as $key => $value)
                     }
                     else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
                     {
-                   	print '<td align="center" valign="top"><a href="'.DOL_URL_ROOT.'/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>';
+                       	print '<td align="right" valign="top"><a href="'.DOL_URL_ROOT.'/'.$regs[2].'/admin/'.$regs[1].'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a></td>';
                     }
                     else
                     {
-                    print '<td align="center" 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
@@ -507,6 +530,8 @@ foreach ($orders as $key => $value)
             }
             else
             {
+                print "<td align=\"center\" valign=\"top\">";
+
                 if (! empty($objMod->always_enabled))
                 {
                     // Ne devrait pas arriver.
@@ -521,9 +546,33 @@ foreach ($orders as $key => $value)
             print "</tr>\n";
         }
 
+    }
+    print "</table>\n";
 }
-print "</table></div>\n";
+else
+{
+    // Marketplace
+    print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
+    print "<tr class=\"liste_titre\">\n";
+    //print '<td>'.$langs->trans("Logo").'</td>';
+    print '<td colspan="2">'.$langs->trans("WebSiteDesc").'</td>';
+    print '<td>'.$langs->trans("URL").'</td>';
+    print '</tr>';
 
+    $var=!$var;
+    print "<tr ".$bc[$var].">\n";
+    $url='http://www.dolistore.com';
+    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" src="'.DOL_URL_ROOT.'/theme/common/dolistore.jpg"></a></td>';
+    print '<td>'.$langs->trans("DoliStoreDesc").'</td>';
+    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
+    print '</tr>';
+
+
+    print "</table>\n";
+}
+
+
+dol_fiche_end();
 
 // Pour eviter bug mise en page IE
 print '<div class="tabsAction">';

htdocs/admin/system/about.php

@@ -80,6 +80,9 @@ print '</li>';
 print '<li>';
 print '<a target="blank" href="http://demo.dolibarr.org/public/demo">'.$langs->trans("OfficialDemo").'</a>';
 print '</li>';
+print '<li>';
+print '<a target="blank" href="http://www.dolistore.com">'.$langs->trans("OfficialMarketPlace").'</a>';
+print '</li>';
 
 if (preg_match('/^fr_/i',$langs->getDefaultLang()))
 {

htdocs/langs/en_US/admin.lang

@@ -171,6 +171,11 @@ ModulesDesc=Dolibarr modules define which functionality is enabled in software.
 ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services.
 ModulesSpecialDesc=Special modules are very specific or seldom used modules.
 ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business.
+ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
+ModulesMarketPlaces=More modules...
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+WebSiteDesc=Web site providers you can search to find more modules...
+URL=Link
 BoxesAvailable=Boxes available
 BoxesActivated=Boxes activated
 ActivateOn=Activate on
@@ -232,7 +237,7 @@ ModuleFamilyOther=Other
 ModuleFamilyTechnic=Mutli-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=ECM
+ModuleFamilyECM=Electronic Content Management (ECM)
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 ThisIsProcessToFollow=This is setup to process:

htdocs/langs/fr_FR/admin.lang

@@ -171,6 +171,11 @@ ModulesDesc= Les modules Dolibarr définissent les fonctionnalités disponibles
 ModulesInterfaceDesc= Les modules d'interfaces sont des modules qui permettent de lier Dolibarr à des systèmes, applications ou services externes.
 ModulesSpecialDesc= Les modules complémentaires sont des modules à usage très spécifique ou moins courant que les modules standards.
 ModulesJobDesc= Les modules métiers très spécifiques permettent une préconfiguration simplifiée de Dolibarr pour un métier spécifique.
+ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
+ModulesMarketPlaces=Plus de modules...
+DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
+WebSiteDesc=Sites fournisseurs à consulter pour trouver plus de modules...
+URL=Lien
 BoxesAvailable= Boîtes disponibles
 BoxesActivated= Boîtes activées
 ActivateOn= Activer sur
@@ -231,7 +236,7 @@ ModuleFamilyOther= Autre
 ModuleFamilyTechnic= Outils multi-modules
 ModuleFamilyExperimental= Modules expérimentaux (ne pas utiliser en production)
 ModuleFamilyFinancial= Modules financiers (Compta/trésorerie)
-ModuleFamilyECM= GED
+ModuleFamilyECM= Gestion Electronique de Documents (GED)
 MenuHandlers= Gestionnaires menu
 MenuAdmin= Edition menu
 ThisIsProcessToFollow= Voici la procédure à suivre: