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

Look: Uniformisation look sur catgories

Browse Source
This commit is contained in:
Laurent Destailleur 2006-05-09 21:36:17 +00:00
parent 000f38a762
commit 817cfd0901
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/categories/viewcat.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -40,13 +41,14 @@ $c = new Categorie ($db, $_REQUEST['id']);
llxHeader ("","",$langs->trans("Categories"));
print_fiche_titre($langs->trans("Categorie")." ".$c->label);
print_fiche_titre($langs->trans("Category"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
$ways = $c->print_all_ways ();
print "<div id='ways'>";
print $langs->trans("Ref").': ';
foreach ($ways as $way)
{
print $way."<br />\n";
@ -72,7 +74,7 @@ else
$i++;
$var=!$var;
print "\t<tr ".$bc[$var].">\n";
print "\t\t<td><a href='viewcat.php?id=".$cat->id."'>".$cat->label."</a></td>\n";
print "\t\t<td nowrap=\"nowrap\"><a href='viewcat.php?id=".$cat->id."'>".$cat->label."</a></td>\n";
print "\t\t<td>".$cat->description."</td>\n";
if ($cat->visible == 1)
@ -116,10 +118,10 @@ else
$i++;
$var=!$var;
print "\t<tr ".$bc[$var].">\n";
print "\t\t<td>";
print "\t\t<td nowrap=\"nowrap\">";
if ($prod->type == 1) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product");
print "<a href='".DOL_URL_ROOT."/product/fiche.php?id=".$prod->id."'>".$prod->ref."</a></td>\n";
else print img_object($langs->trans("ShowProduct"),"product");
print " <a href='".DOL_URL_ROOT."/product/fiche.php?id=".$prod->id."'>".$prod->ref."</a></td>\n";
print "\t\t<td>".$prod->libelle."</td>\n";
print "\t\t<td>".$prod->description."</td>\n";
print "\t</tr>\n";

2
htdocs/html.form.class.php
View File

@ -1118,7 +1118,7 @@ class Form
$cat->get_categories_arbo();
$cate_arbo = $cat->get_arbo_each_cate();
$output = '<select name="'.$select_name.'">'; //creation des categories meres
$output.= '<option value="-1" id="choix">'.$langs->trans("NoneCategory").'</option>\n';
$output.= '<option value="-1" id="choix">&nbsp;</option>\n';
if ($cate_arbo)
{

6
htdocs/langs/en_US/categories.lang
View File

@ -1,4 +1,5 @@
# Dolibarr language file - en_US - categories
Category=Category
Categorie=Category
categories=categories
TheCategorie=The catégorie
@ -12,7 +13,7 @@ CatStatistics=Statistics
CatList=List of catégories
AllCats=All categories
ViewCat=View category
NewCat=New category
NewCat=Add category
ModifCat=Modify category
CatCreated=Category added
CreateCat=Create category
@ -32,7 +33,8 @@ AddProductToCat=Add this product to a category?
ImpossibleAddCat=Impossible to add the category
ImpossibleAssociateCategory=Impossible to associate the category to
WasAddedSuccessfully=was added successfully.
ProductIsInCategories=Category contains products/services
ProductIsInCategories=Product/service owns to categories
ProductHasNoCategory=This product/service is not in any categories
ClassifyInCategory=Classify in category
ReturnInProduct=Back to product/service card
ContentsVisibleByAll=The contents will be visible by all

3
htdocs/langs/fr_FR/categories.lang
View File

@ -1,4 +1,5 @@
# Dolibarr language file - fr_FR - categories
Category=Categorie
Categorie=Catégorie
categories=catégorie(s)
TheCategorie=La catégorie
@ -33,6 +34,7 @@ ImpossibleAddCat=Impossible d'ajouter la cat
ImpossibleAssociateCategory=Impossible d'associer la catégorie
WasAddedSuccessfully=a été ajoutée avec succès.
ProductIsInCategories=Ce produit/service est dans les catégorie suivantes
ProductHasNoCategory=Ce produit/service n'est dans aucune catégorie en particulier
ClassifyInCategory=Classer dans la catégorie
NoneCategory=Aucune
CategoryExistsAtSameLevel=Cette catégorie existe déjà au même endroit
@ -41,3 +43,4 @@ ContentsVisibleByAll=Le contenu sera visible par tous
ContentsVisibleByAllShort=Contenu visible par tous
ContentsNotVisibleByAllShort=Contenu non visible par tous
Desc=Description

14
htdocs/product/categorie.php
View File

@ -210,11 +210,12 @@ if ($_GET["id"] || $_GET["ref"])
// Formulaire ajout dans une categorie
print '<br>';
print '<form method="post" action="'.DOL_URL_ROOT.'/product/categorie.php?id='.$product->id.'">';
print '<table class="noborder" width="100%">';
print '<tr><td>';
print '<input type="submit" class="button" value="'.$langs->trans("ClassifyInCategory").'"> '. $html->select_all_categories($categorie->id_mere);
print '</td>';
print '<tr class="liste_titre"><td>';
print $langs->trans("ClassifyInCategory").' ';
print $html->select_all_categories($categorie->id_mere).' <input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>';
print '</tr>';
print '</table>';
print '</form>';
@ -235,8 +236,7 @@ if ($_GET["id"] || $_GET["ref"])
if (sizeof($cats) > 0)
{
print $langs->trans("ProductIsInCategories");
print '<br/>';
print_fiche_titre($langs->trans("ProductIsInCategories"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Categories").'</td></tr>';
@ -248,7 +248,7 @@ if ($_GET["id"] || $_GET["ref"])
{
$i = !$i;
print "<tr ".$bc[$i]."><td>".$way."</td>";
print "<td>".img_delete($langs->trans("DeleteFromCat"))." <a href= '".DOL_URL_ROOT."/product/categorie.php?id=".$product->id."&amp;cat=".$cat->id."'>".$langs->trans("DeleteFromCat")."</a></td></tr>\n";
print '<td align="right">'.img_delete($langs->trans("DeleteFromCat"))." <a href= '".DOL_URL_ROOT."/product/categorie.php?id=".$product->id."&amp;cat=".$cat->id."'>".$langs->trans("DeleteFromCat")."</a></td></tr>\n";
}
@ -262,7 +262,7 @@ if ($_GET["id"] || $_GET["ref"])
else
{
print $langs->trans("NoCat")."<br/>";
print $langs->trans("ProductHasNoCategory")."<br/>";
}
}