New: Some pages can link to wiki help pages

.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,4 @@
-#Wed Feb 11 17:58:49 CET 2009
+#Mon Mar 09 12:23:31 CET 2009
 eclipse.preferences.version=1
 encoding//dev/initdemo/initdemo.sql=UTF-8
 encoding//dev/skeletons/modMyModule.class.php=ISO-8859-1
@@ -7,7 +7,7 @@ encoding//htdocs/adherents/adherent.class.php=ISO-8859-1
 encoding//htdocs/admin/adherent.php=ISO-8859-1
 encoding//htdocs/admin/company.php=ISO-8859-1
 encoding//htdocs/admin/fckeditor.php=ISO-8859-1
-encoding//htdocs/admin/index.php=ISO-8859-1
+encoding//htdocs/admin/index.php=UTF-8
 encoding//htdocs/admin/menus/index.php=ISO-8859-1
 encoding//htdocs/admin/security.php=ISO-8859-1
 encoding//htdocs/admin/system/database-tables-contraintes.php=ISO-8859-1

ChangeLog

@@ -39,6 +39,7 @@ For users:
 - New: Upload of joined files need create/modify permissions to work.
 - New: For admin users, show the SQL request in export build.
 - New: Can modify proposal date if status is draft.
+- New: The help link on some pages now links directly to the wiki web page.
 - Fix: Partial payment on social contributions not shown on main page.
 - Fix: Handle correctly the comment in status changing of supplier orders.
 - Fix: Author, title and topic are correctly encoded in PDF.

dev/skeletons/pre.inc.php

@@ -17,19 +17,24 @@
  */
 
 /**
-   \file       htdocs/dev/skeletons/pre.inc.php
+ *  \file       htdocs/dev/skeletons/pre.inc.php
-   \brief      File to manage left menu by default
+ *  \brief      File to manage left menu by default
-   \version    $Id$
+ *  \version    $Id$
-*/
+ */
 
 // Include environment and check authentification
 require ("../../main.inc.php");		// This include must use a relative link to the main.inc.php file
 
 
 /**
-		\brief		Function called by page to show menus (top and left)
+ *	\brief		Function called by page to show menus (top and left)
-*/
+ *  \param		head				Text to show as head line
-function llxHeader($head = "")
+ * 	\param		title				Not used
+ * 	\param      helppagename    	Name of a help page ('' by default).
+ * 				Syntax is: 			For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
+ * 									For other external page: http://server/url
+ */
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $user, $conf, $langs;
 
@@ -48,6 +53,6 @@ function llxHeader($head = "")
 	}
 	*/
 
-	left_menu($menu->liste);  
+	left_menu($menu->liste, $help_url);
 }
 ?>

dev/skeletons/skeleton_page.php

@@ -75,7 +75,7 @@ if ($_REQUEST["action"] == 'add')
 * Put here all code to build page
 ****************************************************/
 
-llxHeader('MyPageName');
+llxHeader('MyPageName','','');
 
 $form=new Form($db);
 

htdocs/adherents/cartes/pre.inc.php

@@ -26,7 +26,8 @@
 
 require("../../main.inc.php");
 
-function llxHeader($head = "") {
+function llxHeader($head = '', $title='', $help_url='')
+{
   global $user, $conf, $langs;
 
   top_menu($head);

htdocs/adherents/index.php

@@ -33,7 +33,11 @@ $langs->load("companies");
 $langs->load("members");
 
 
-llxHeader();
+/*
+ * View
+ */
+
+llxHeader($langs->trans("Members"),'','EN:Fundations|FR:Adherents|ES:Miembros');
 
 $staticmember=new Adherent($db);
 $statictype=new AdherentType($db);

htdocs/adherents/pre.inc.php

@@ -25,7 +25,7 @@
 
 require("../main.inc.php");
 
-function llxHeader($head = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $user, $conf, $langs;
 
@@ -63,7 +63,7 @@ function llxHeader($head = "")
 	$menu->add_submenu(DOL_URL_ROOT."/adherents/type.php",$langs->trans("MembersTypes"));
 	$menu->add_submenu(DOL_URL_ROOT."/adherents/options.php",$langs->trans("MembersAttributes"));
 
-	left_menu($menu->liste);
+	left_menu($menu->liste, $help_url);
 
 }
 

htdocs/admin/index.php

@@ -18,10 +18,10 @@
  */
 
 /**
-    	\file       htdocs/admin/index.php
+ *   	\file       htdocs/admin/index.php
-		\brief      Page d'accueil de l'espace administration/configuration
+ *		\brief      Page d'accueil de l'espace administration/configuration
-		\version    $Id$
+ *		\version    $Id$
-*/
+ */
 
 require("./pre.inc.php");
 
@@ -38,7 +38,7 @@ $mesg='';
  * View
  */
 
-llxHeader();
+llxHeader($langs->trans("Setup"),'','EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones');
 
 $form = new Form($db);
 

htdocs/bookmarks/pre.inc.php

@@ -30,7 +30,7 @@
 require("../main.inc.php");
 
 
-function llxHeader($head = "", $title = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
     global $user, $conf, $langs;
     $langs->load("other");

htdocs/comm/action/index.php

@@ -104,12 +104,12 @@ if ($action=='delete_action')
  * View
  */
 
-llxHeader();
+llxHeader('','','EN:AgendaEn|FR:Agenda|ES:AgendaES');
 
 $form=new Form($db);
 
 //print $langs->trans("FeatureNotYetAvailable");
-$now=mktime(0,0,0);
+$now=gmmktime(0,0,0);
 
 $prev = dol_get_prev_month($month, $year);
 $prev_year  = $prev['year'];

htdocs/comm/action/pre.inc.php

@@ -27,7 +27,7 @@
 require("../../main.inc.php");
 
 
-function llxHeader($head = "", $urlp = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
     global $conf,$user,$langs;
 
@@ -65,7 +65,7 @@ function llxHeader($head = "", $urlp = "")
 		$menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read);
 	}
 
-    left_menu($menu->liste);
+    left_menu($menu->liste, $help_url);
 }
 
 ?>

htdocs/comm/pre.inc.php

@@ -26,7 +26,7 @@
 require("../main.inc.php");
 
 
-function llxHeader($head = "", $title = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
   global $user, $conf, $langs;
 
@@ -110,6 +110,6 @@ function llxHeader($head = "", $title = "")
       $menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects"));
     }
 
-  left_menu($menu->liste);
+  left_menu($menu->liste, $help_url);
 }
 ?>

htdocs/commande/pre.inc.php

@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 $langs->load("orders");
 
 
-function llxHeader($head = "", $title="", $help_url='')
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $user, $conf, $langs;
 

htdocs/compta/pre.inc.php

@@ -27,7 +27,7 @@
 require("../main.inc.php");
 
 
-function llxHeader($head = "", $title="", $help_url='')
+function llxHeader($head = '', $title='', $help_url='')
 {
     global $user, $conf, $langs;
 

htdocs/contact/pre.inc.php

@@ -26,7 +26,7 @@ require("../main.inc.php");
 
 
 
-function llxHeader($head = "", $urlp = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $langs, $user, $conf;
 
@@ -59,7 +59,7 @@ function llxHeader($head = "", $urlp = "")
 		$menu->add(DOL_URL_ROOT."/contact/index.php?userid=$user->id", $langs->trans("MyContacts"));
 	}
 
-	left_menu($menu->liste);
+	left_menu($menu->liste, $help_url);
 }
 
 ?>

htdocs/contrat/pre.inc.php

@@ -29,7 +29,7 @@
 
 require("../main.inc.php");
 
-function llxHeader($head = "", $urlp = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
   global $user, $conf, $langs;
   $langs->load("contracts");
@@ -47,6 +47,6 @@ function llxHeader($head = "", $urlp = "")
   $menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2 , true);
   $menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=5", $langs->trans("MenuClosedServices"), 2 , true);
 
-  left_menu($menu->liste);
+  left_menu($menu->liste, $help_url);
 }
 ?>

htdocs/ecm/pre.inc.php

@@ -27,7 +27,7 @@ require ("../main.inc.php");
 
 $user->getrights('ecm');
 
-function llxHeader($head = "", $title="", $help_url='', $morehtml='')
+function llxHeader($head = '', $title='', $help_url='', $morehtml='')
 {
 	global $conf,$langs,$user;
 	$langs->load("ecm");

htdocs/exports/pre.inc.php

@@ -29,7 +29,7 @@
 require("../main.inc.php");
 
 
-function llxHeader($head = "", $title = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
     global $user, $conf, $langs;
 
@@ -40,7 +40,7 @@ function llxHeader($head = "", $title = "")
     $menu->add(DOL_URL_ROOT."/exports/index.php", $langs->trans("Exports"));
     $menu->add_submenu(DOL_URL_ROOT."/exports/export.php", $langs->trans("NewExport"));
 
-    left_menu($menu->liste);
+    left_menu($menu->liste, $help_url);
 }
 
 ?>

htdocs/fourn/pre.inc.php

@@ -20,10 +20,10 @@
  */
 
 /**
-        \file   	htdocs/fourn/pre.inc.php
+ \file   	htdocs/fourn/pre.inc.php
-        \ingroup    fournisseur,facture
+ \ingroup    fournisseur,facture
-        \brief  	Fichier gestionnaire du menu fournisseurs
+ \brief  	Fichier gestionnaire du menu fournisseurs
-*/
+ */
 
 require("../main.inc.php");
 require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.class.php";
@@ -31,76 +31,70 @@ require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php";
 
 
 
-function llxHeader($head = "", $title="", $addons='') {
+function llxHeader($head = '', $title='', $help_url='')
-  global $user, $conf, $langs;
+{
+	global $user, $conf, $langs;
 
-  $langs->load("suppliers");
+	$langs->load("suppliers");
-  $langs->load("propal");
+	$langs->load("propal");
 
-  top_menu($head, $title);
+	top_menu($head, $title);
 
-  $menu = new Menu();
+	$menu = new Menu();
 
-
+	if ($conf->fournisseur->enabled && $user->rights->societe->lire)
-  if (is_array($addons))
-    {
-      //$menu->add($url, $libelle);
-      $menu->add($addons[0][0], $addons[0][1]);
-    }
-
-  if ($conf->fournisseur->enabled && $user->rights->societe->lire) 
-    {
-      $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
-      
-      // Sécurité accés client
-      if ($user->societe_id == 0 && $user->rights->societe->creer) 
-        {
-          $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier"));
-        }
-
-      $menu->add_submenu(DOL_URL_ROOT."/fourn/liste.php",$langs->trans("List"));
-  
-      if ($conf->societe->enabled )
 	{
+		$menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
+
+		// Sécurité accés client
+		if ($user->societe_id == 0 && $user->rights->societe->creer)
+		{
+			$menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create&type=f",$langs->trans("NewSupplier"));
+		}
+
+		$menu->add_submenu(DOL_URL_ROOT."/fourn/liste.php",$langs->trans("List"));
+
+		if ($conf->societe->enabled )
+		{
 	  $menu->add_submenu(DOL_URL_ROOT."/fourn/contact.php",$langs->trans("Contacts"));
+		}
+
+		$menu->add_submenu(DOL_URL_ROOT."/fourn/stats.php",$langs->trans("Statistics"));
 	}
 
-      $menu->add_submenu(DOL_URL_ROOT."/fourn/stats.php",$langs->trans("Statistics"));
+	$langs->load("bills");
-    }
+	if ($user->societe_id == 0 && $user->rights->fournisseur->facture->lire)
+	{
+		$menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"));
+	}
+	if ($user->societe_id == 0 && $user->rights->fournisseur->facture->creer)
+	{
+		$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"));
+	}
+	if ($user->rights->fournisseur->facture->lire)
+	{
+		$menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"));
+	}
+	$langs->load("orders");
+	if ($user->rights->fournisseur->commande->lire)
+	{
+		$menu->add(DOL_URL_ROOT."/fourn/commande/",$langs->trans("Orders"));
+	}
+	if ($conf->produit->enabled || $conf->service->enabled)
+	{
+		if ($user->rights->produit->lire)
+		{
+			$menu->add(DOL_URL_ROOT."/product/", $langs->trans("Products"));
+		}
+	}
 
-  $langs->load("bills");
+	if ($conf->categorie->enabled)
-  if ($user->societe_id == 0 && $user->rights->fournisseur->facture->lire)
-    {
-      $menu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"));
-    }
-  if ($user->societe_id == 0 && $user->rights->fournisseur->facture->creer) 
-    {
-      $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"));
-    }
-  if ($user->rights->fournisseur->facture->lire)
-    {
-      $menu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"));
-    } 
-  $langs->load("orders");
-  if ($user->rights->fournisseur->commande->lire)
-    {
-      $menu->add(DOL_URL_ROOT."/fourn/commande/",$langs->trans("Orders"));
-    }
-  if ($conf->produit->enabled || $conf->service->enabled)
-  {
-  	if ($user->rights->produit->lire)
-  	{
-        $menu->add(DOL_URL_ROOT."/product/", $langs->trans("Products"));
-    }
-  }
-  
-  if ($conf->categorie->enabled)
 	{
 		$langs->load("categories");
 		// Catégories fournisseurs
 		$menu->add(DOL_URL_ROOT."/categories/index.php?leftmenu=cat&type=1", $langs->trans("SuppliersCategoriesShort"), 0);
 	}
 
-  left_menu($menu->liste);
+	left_menu($menu->liste, $help_url);
 }
 ?>

htdocs/livraison/pre.inc.php

@@ -36,7 +36,7 @@ $langs->load("orders");
 $langs->load("sendings");
 
 
-function llxHeader($head = "", $title="", $help_url='')
+function llxHeader($head = '', $title='', $help_url='')
 {
   global $langs;
 

htdocs/main.inc.php

@@ -834,8 +834,8 @@ function top_menu($head, $title='', $target='')
  *  \brief      Affiche barre de menu gauche
  *  \param      menu_array      	Tableau des entrees de menu
  *  \param      helppagename    	Name of wiki page for help ('' by default).
- * 				Syntax is: 			EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
+ * 				Syntax is: 			For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
- * 									or http://server/url
+ * 									For other external page: http://server/url
  *  \param      moresearchform     	Formulaire de recherche permanant supplementaire
  */
 function left_menu($menu_array, $helppagename='', $moresearchform='')
@@ -932,7 +932,7 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
 	}
 
 	// Link to Dolibarr wiki pages
-	if ($helppagename)
+	if ($helppagename && empty($conf->global->MAIN_DISABLE_HELP_LINKS))
 	{
 		$langs->load("help");
 
@@ -946,31 +946,32 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
 		else
 		{
 			// If relative URL
-			$helppage=$langs->trans($helppagename);	// By default
+			$helppage='';
-
 			if (eregi('^es',$langs->defaultlang))
 			{
 				$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-				if (eregi('ES:([^|]+)',$helppage,$reg)) $helppage=$reg[1];
+				if (eregi('ES:([^|]+)',$helppagename,$reg)) $helppage=$reg[1];
 			}
-			elseif (eregi('^fr',$langs->defaultlang))
+			if (eregi('^fr',$langs->defaultlang))
 			{
 				$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-				if (eregi('FR:([^|]+)',$helppage,$reg)) $helppage=$reg[1];
+				if (eregi('FR:([^|]+)',$helppagename,$reg)) $helppage=$reg[1];
 			}
-			else
+			if (empty($helppage))	// If help page not already found
 			{
 				$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-				if (eregi('EN:([^|]+)',$helppage,$reg)) $helppage=$reg[1];
+				if (eregi('EN:([^|]+)',$helppagename,$reg)) $helppage=$reg[1];
 			}
 		}
 
 		if ($helpbaseurl && $helppage)
 		{
 			print '<div class="help">';
-			print '<a class="help" target="_blank" href="';
+			print '<a class="help" target="_blank" title="'.$langs->trans("GoToWikiHelp").'" href="';
 			print sprintf($helpbaseurl,$helppage);
-			print '">'.$langs->trans("Help").'</a>';
+			print '">';
+			print img_help(0,'').' ';
+			print $langs->trans("Help").'</a>';
 			print '</div>';
 		}
 	}

htdocs/mantis/pre.inc.php

@@ -24,7 +24,7 @@
 */
 require ("../main.inc.php");
 
-function llxHeader($head = "", $title="", $help_url='')
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $langs;
 

htdocs/oscommerce_ws/pre.inc.php

@@ -28,7 +28,7 @@
 
 require("../main.inc.php");
 
-function llxHeader($head = "", $urlp = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $user, $conf, $langs;
 	$langs->load("shop");

htdocs/phenix/pre.inc.php

@@ -26,7 +26,7 @@
 require ("../main.inc.php");
 
 
-function llxHeader($head = "", $title="", $help_url='')
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $langs;
 

htdocs/pre.inc.php

@@ -28,7 +28,7 @@
 require ("./main.inc.php");
 
 
-function llxHeader($head = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $user, $conf, $langs;
 
@@ -175,6 +175,6 @@ function llxHeader($head = "")
 		$menu->add(DOL_URL_ROOT."/admin/index.php", $langs->trans("Setup"));
 	}
 
-	left_menu($menu->liste);
+	left_menu($menu->liste, $help_url);
 }
 ?>

htdocs/projet/index.php

@@ -41,7 +41,7 @@ if ($user->societe_id > 0)
  * View
  */
 
-llxHeader("",$langs->trans("Projects"),"Projet");
+llxHeader("",$langs->trans("Projects"),"EN:Projects|FR:Projet|ES:Proyectos");
 
 $text=$langs->trans("Projects");
 if ($_REQUEST["mode"]=='mine') $text=$langs->trans("MyProjects");

htdocs/projet/pre.inc.php

@@ -40,7 +40,7 @@ $langs->load("commercial");
  * @param unknown_type $title
  * @param unknown_type $help_url
  */
-function llxHeader($head = "", $title="", $help_url='')
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $langs, $user;
 

htdocs/rapport/pre.inc.php

@@ -22,25 +22,26 @@
 
 require ("../main.inc.php");
 
-function llxHeader($head = "") {
+function llxHeader($head = '', $title='', $help_url='')
-  global $user, $conf;
+{
+	global $user, $conf;
 
-  /*
+	/*
-   *
+	 *
-   *
+	 *
-   */
+	 */
-  top_menu($head);
+	top_menu($head);
 
-  $menu = new Menu();
+	$menu = new Menu();
 
 
-  $menu->add(DOL_URL_ROOT."/rapport/presentation", "Presentation");
+	$menu->add(DOL_URL_ROOT."/rapport/presentation", "Presentation");
 
-  /*
+	/*
-   *
+	 *
-   */
+	 */
 
-  left_menu($menu->liste);
+	left_menu($menu->liste, $help_url);
 
 }
 ?>

htdocs/societe.php

@@ -111,7 +111,7 @@ if ($mode == 'search')
  * View
  */
 
-llxHeader();
+llxHeader($langs->trans("ThirdParty"),'','EN:Third_Parties|FR:Tiers|ES:Empresas');
 
 $form=new Form($db);
 $companystatic=new Societe($db);

htdocs/societe/pre.inc.php

@@ -30,7 +30,7 @@
 require ("../main.inc.php");
 
 
-function llxHeader($head = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
 	global $langs, $user, $conf;
 
@@ -52,7 +52,7 @@ function llxHeader($head = "")
 		$menu->add_submenu("notify/index.php", $langs->trans("Notifications"));
 	}
 
-	left_menu($menu->liste);
+	left_menu($menu->liste, $help_url);
 }
 
 ?>

htdocs/user/pre.inc.php

@@ -24,7 +24,7 @@
 */
 require("../main.inc.php");
 
-function llxHeader($head = "", $title = "")
+function llxHeader($head = '', $title='', $help_url='')
 {
     global $user,$langs;
 
@@ -55,7 +55,7 @@ function llxHeader($head = "", $title = "")
     }
 
 
-    left_menu($menu->liste);
+    left_menu($menu->liste, $help_url);
 }
 
 ?>