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 55f2e1bf937..00000000000
Binary files a/htdocs/resource/img/object_resource.png and /dev/null differ
diff --git a/htdocs/resource/img/resource.png b/htdocs/resource/img/resource.png
deleted file mode 100644
index 7d5bbfa5a3d..00000000000
Binary files a/htdocs/resource/img/resource.png and /dev/null differ
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 ''.$resource->id.'';
- print ' | ';
+ print '
';
print '| ';
- print $resource->ref;
+ print $resource->getNomUrl(5);
print ' | ';
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").' | ';
| |