From 52fefc2d025dd3a81dfa906c6db34474c6433a92 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Jun 2016 13:14:05 +0200 Subject: [PATCH] Debug module resource --- htdocs/core/modules/modResource.class.php | 2 +- htdocs/resource/card.php | 4 ++-- htdocs/resource/class/dolresource.class.php | 2 +- htdocs/resource/contact.php | 2 +- htdocs/resource/document.php | 2 +- htdocs/resource/img/index.html | 0 htdocs/resource/img/object_resource.png | Bin 1232 -> 0 bytes htdocs/resource/img/resource.png | Bin 2473 -> 0 bytes htdocs/resource/list.php | 12 ++++-------- htdocs/resource/note.php | 2 +- 10 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 htdocs/resource/img/index.html delete mode 100644 htdocs/resource/img/object_resource.png delete mode 100644 htdocs/resource/img/resource.png diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index 82d57514623..90ff3280fee 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -119,7 +119,7 @@ class modResource extends DolibarrModules // Minimum version of PHP required by module $this->phpmin = array(5, 3); - $this->langfiles = array("resource@resource"); // langfiles@resource + $this->langfiles = array("resource"); // langfiles@resource // Constants // List of particular constants to add when module is enabled // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive) diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index d803ec774fd..95f5cf0574b 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -168,7 +168,7 @@ if ( $object->fetch($id) > 0 ) print ''; print ''; - dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"),0,'resource@resource'); + dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"),0,'resource'); print ''; @@ -201,7 +201,7 @@ if ( $object->fetch($id) > 0 ) } else { - dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"),0,'resource@resource'); + dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"),0,'resource'); // Confirm deleting resource line if ($action == 'delete') diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 87794b92392..4f08e6f4209 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -875,7 +875,7 @@ class Dolresource extends CommonObject if ($option == '') { $link = ''; - $picto='resource@resource'; + $picto='resource'; $label=$langs->trans("ShowResource").': '.$this->ref; } diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php index cadde67eba3..97dbb0de1be 100644 --- a/htdocs/resource/contact.php +++ b/htdocs/resource/contact.php @@ -119,7 +119,7 @@ if ($id > 0 || ! empty($ref)) $head = resource_prepare_head($object); - dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), 0, 'resource@resource'); + dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), 0, 'resource'); /* diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index 8e39c64e2c9..099fb4f7d2b 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -89,7 +89,7 @@ if ($object->id) $head=resource_prepare_head($object); - dol_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), 0, 'resource@resource'); + dol_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), 0, 'resource'); // Construit liste des fichiers diff --git a/htdocs/resource/img/index.html b/htdocs/resource/img/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/resource/img/object_resource.png b/htdocs/resource/img/object_resource.png deleted file mode 100644 index 55f2e1bf9375acb1ca746b1fffa7ad56f7d5bf97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1232 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 diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index b33bbec259e..777bcb374d6 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -106,10 +106,9 @@ else print '
'."\n"; print ''; - print_liste_field_titre($langs->trans('Id'),$_SERVER['PHP_SELF'],'t.rowid','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'t.ref','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('ResourceType'),$_SERVER['PHP_SELF'],'ty.code','',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Action'),"","","","",'width="60" align="center"',"",""); + print_liste_field_titre('',"","","","",'width="60" align="center"',"",""); print "\n"; foreach ($object->lines as $resource) @@ -117,15 +116,12 @@ else $var=!$var; $style=''; - if($resource->id == GETPOST('lineid')) - $style='style="background: orange;"'; + if ($resource->id == GETPOST('lineid')) $style='style="background: orange;"'; - print ''; + print ''; print ''; print '
'; - print ''.$resource->id.''; - print '
'; - print $resource->ref; + print $resource->getNomUrl(5); print ''; diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php index 1f277688957..30e37eba77f 100644 --- a/htdocs/resource/note.php +++ b/htdocs/resource/note.php @@ -64,7 +64,7 @@ $form = new Form($db); if ($id > 0 || ! empty($ref)) { $head = resource_prepare_head($object); - dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), 0, 'resource@resource'); + dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), 0, 'resource'); print ''; print '
'.$langs->trans("ResourceFormLabel_ref").'';