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

Move help into tooltip help section

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-16 15:46:54 +01:00
parent 93b9061a71
commit e7dda7bb4f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/modCategorie.class.php
View File

@ -121,7 +121,7 @@ class modCategorie extends DolibarrModules
// All Categories List // All Categories List
$r++; $r++;
$this->export_code[$r] = $this->rights_class.'_list'; $this->export_code[$r] = $this->rights_class.'_list';
$this->export_label[$r] = 'CatList'; $this->export_label[$r] = 'CatListAll';
$this->export_icon[$r] = $this->picto; $this->export_icon[$r] = $this->picto;
$this->export_enabled[$r] = 'true'; $this->export_enabled[$r] = 'true';
$this->export_permission[$r] = array(array("categorie", "lire")); $this->export_permission[$r] = array(array("categorie", "lire"));
@ -140,9 +140,10 @@ class modCategorie extends DolibarrModules
if (!empty($conf->agenda->enabled)) { $typeexample .= ($typeexample ? " / " : "")."10=Agenda event"; } if (!empty($conf->agenda->enabled)) { $typeexample .= ($typeexample ? " / " : "")."10=Agenda event"; }
if (!empty($conf->website->enabled)) { $typeexample .= ($typeexample ? " / " : "")."11=Website page"; } if (!empty($conf->website->enabled)) { $typeexample .= ($typeexample ? " / " : "")."11=Website page"; }
$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type ".$typeexample, 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel" ); $this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel" );
$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text' ); $this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text' );
$this->export_entities_array[$r] = array(); // We define here only fields that use another picto $this->export_entities_array[$r] = array(); // We define here only fields that use another picto
$this->export_help_array[$r] = array('cat.type'=>$typeexample);
$this->export_sql_start[$r] = 'SELECT DISTINCT '; $this->export_sql_start[$r] = 'SELECT DISTINCT ';
$this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'categorie as cat'; $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';

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

@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
UsersCategoriesArea=Users tags/categories area UsersCategoriesArea=Users tags/categories area
SubCats=Sub-categories SubCats=Sub-categories
CatList=List of tags/categories CatList=List of tags/categories
CatListAll=List of tags/categories (all types)
NewCategory=New tag/category NewCategory=New tag/category
ModifCat=Modify tag/category ModifCat=Modify tag/category
CatCreated=Tag/category created CatCreated=Tag/category created