From 4e01c23974056b0a1ca2afe0338f205bf161970f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 12 Jan 2009 15:35:06 +0000 Subject: [PATCH] Minor fix --- htdocs/categories/index.php | 20 ++++++++++---------- htdocs/categories/viewcat.php | 1 + htdocs/conf/conf.class.php | 4 +++- htdocs/langs/en_US/main.lang | 1 + htdocs/langs/fr_FR/main.lang | 1 + htdocs/lib/functions.lib.php | 1 + htdocs/task.class.php | 3 +++ 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index ebbf240c18f..75a1f229d16 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2005 Éric Seigne - * Copyright (C) 2006-2008 Laurent Destailleur + * Copyright (C) 2006-2009 Laurent Destailleur * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2005-2008 Regis Houssin * @@ -29,20 +29,21 @@ require("./pre.inc.php"); -$type=$_GET['type']; +$type=isset($_GET['type'])?$_GET['type']:$_POST['type']; if (!$user->rights->categorie->lire) accessforbidden(); -/** - * Affichage page accueil + +/* + * View */ $c = new Categorie($db); $html = new Form($db); -if (! $type) $title=$langs->trans("ProductsCategoriesArea"); +if ($type == 0) $title=$langs->trans("ProductsCategoriesArea"); if ($type == 1) $title=$langs->trans("SuppliersCategoriesArea"); if ($type == 2) $title=$langs->trans("CustomersCategoriesArea"); @@ -59,8 +60,8 @@ print ''; /* * Zone recherche produit/service */ -print '
'; -print ''; +print ''; +print ''; print ''; print ''; print ''; @@ -118,7 +119,6 @@ $cate_arbo = $c->get_full_arbo($_GET['type']); * Catégories en javascript */ - if ($conf->use_javascript_ajax) { print '
'.$langs->trans("Search").'
'; @@ -127,12 +127,12 @@ if ($conf->use_javascript_ajax) if ($_GET["expand"] != 'all') { print ''.$langs->trans("ExpandAll").''; - print ''; print ''; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index ab185a2810d..eb8d8c117b7 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -109,6 +109,7 @@ print '
'; + print ''; } if ($_GET["expand"] && $_GET["expand"] != 'none') { print ''.$langs->trans("UndoExpandAll").''; - print ''; + print ''; } print '
'; print '
'; $ways = $c->print_all_ways (); print $langs->trans("Ref").''; +print ''.$langs->trans("Root").' >> '; foreach ($ways as $way) { print $way."
\n"; diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 4b24b868cf4..d1dba4dd38f 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -47,7 +47,9 @@ class Conf var $monnaie; // Used to store current currency var $css; // Used to store current css (from theme) - + var $top_menu; + var $left_menu; + var $css_modules=array(); var $tabs_modules=array(); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a17d95ce7b7..ee89543d724 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -464,6 +464,7 @@ ForCustomer=For customer Signature=Signature HidePassword=Show command with password hidden UnHidePassword=Show real command with clear password +Root=Root # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 564226b263f..83f8f554b90 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -465,6 +465,7 @@ ForCustomer=Pour le client Signature=Sign HidePassword=Afficher commande avec mot de passe masqué UnHidePassword=Afficher commande réelle avec mot de passe en clair +Root=Racine # Week day Monday=Lundi Tuesday=Mardi diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 228658a06bf..afb044126d4 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1572,6 +1572,7 @@ function dol_print_error($db='',$error='') print "".$langs->trans("Server").": ".$_SERVER["SERVER_SOFTWARE"]."
\n";; print "".$langs->trans("RequestedUrl").": ".$_SERVER["REQUEST_URI"]."
\n";; print "".$langs->trans("Referer").": ".$_SERVER["HTTP_REFERER"]."
\n";; + print "".$langs->trans("MenuManager").": ".$conf->left_menu.'/'.$conf->top_menu."
\n"; $syslog.="url=".$_SERVER["REQUEST_URI"]; $syslog.=", query_string=".$_SERVER["QUERY_STRING"]; } diff --git a/htdocs/task.class.php b/htdocs/task.class.php index bbef879017c..1efa2e63392 100644 --- a/htdocs/task.class.php +++ b/htdocs/task.class.php @@ -309,6 +309,9 @@ class Task // extends CommonObject global $conf, $langs; $error=0; + // TODO. Refused if there is some child. + + $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task"; $sql.= " WHERE rowid=".$this->id;