Merge 5d3b489 into a35ca04

fusioninventory · Apr 11, 2017 · 2d754d2 · 2d754d2
2 parents a35ca04 + 5d3b489
commit 2d754d2
Show file tree

Hide file tree

Showing 49 changed files with 3 additions and 3 deletions.
diff --git a/inc/deployfile.class.php b/inc/deployfile.class.php
@@ -223,10 +223,10 @@ static function displayList(PluginFusioninventoryDeployPackage $package, $datas,
          }
          echo "<td class='filename'>";
          if (!empty($file_mimetype)
-                 && file_exists(GLPI_ROOT."/plugins/fusioninventory/pics/ext/extensions/$file_mimetype.png")) {
-            echo "<img src='".$pics_path."ext/extensions/$file_mimetype.png' />";
+                 && file_exists(GLPI_ROOT."/plugins/fusioninventory/pics/extensions/$file_mimetype.png")) {
+            echo "<img src='".$pics_path."extensions/$file_mimetype.png' />";
          } else {
-            echo "<img src='".$pics_path."ext/extensions/documents.png' />";
+            echo "<img src='".$pics_path."extensions/documents.png' />";
          }
 
          //filename

diff --git a/pics/ext/accept.png b/pics/ext/accept.png
diff --git a/pics/ext/add.png b/pics/ext/add.png
diff --git a/pics/ext/bullet-black.png b/pics/ext/bullet-black.png
diff --git a/pics/ext/bullet-blue.png b/pics/ext/bullet-blue.png
diff --git a/pics/ext/bullet-green.png b/pics/ext/bullet-green.png
diff --git a/pics/ext/bullet-grey.png b/pics/ext/bullet-grey.png
diff --git a/pics/ext/bullet-red.png b/pics/ext/bullet-red.png
diff --git a/pics/ext/bullet-yellow.png b/pics/ext/bullet-yellow.png
diff --git a/pics/ext/cancel.png b/pics/ext/cancel.png
diff --git a/pics/ext/computer.png b/pics/ext/computer.png
diff --git a/pics/ext/delete.png b/pics/ext/delete.png
diff --git a/pics/ext/disk.png b/pics/ext/disk.png
diff --git a/pics/ext/folder.png b/pics/ext/folder.png
diff --git a/pics/ext/group.png b/pics/ext/group.png
diff --git a/pics/ext/group_user.png b/pics/ext/group_user.png
diff --git a/pics/ext/information.png b/pics/ext/information.png
diff --git a/pics/ext/package.png b/pics/ext/package.png
diff --git a/pics/ext/spinner.gif b/pics/ext/spinner.gif
diff --git a/pics/ext/task.png b/pics/ext/task.png
diff --git a/pics/ext/taskjob.png b/pics/ext/taskjob.png
diff --git a/pics/ext/extensions/application__msword.png → pics/extensions/application__msword.png b/pics/ext/extensions/application__msword.png → pics/extensions/application__msword.png
diff --git a/pics/ext/extensions/application__pdf.png → pics/extensions/application__pdf.png b/pics/ext/extensions/application__pdf.png → pics/extensions/application__pdf.png
diff --git a/.../extensions/application__vnd.ms-excel.png → .../extensions/application__vnd.ms-excel.png b/.../extensions/application__vnd.ms-excel.png → .../extensions/application__vnd.ms-excel.png
diff --git a/...nsions/application__vnd.ms-powerpoint.png → ...nsions/application__vnd.ms-powerpoint.png b/...nsions/application__vnd.ms-powerpoint.png → ...nsions/application__vnd.ms-powerpoint.png
diff --git a/...n__vnd.oasis.opendocument.spreadsheet.png → ...n__vnd.oasis.opendocument.spreadsheet.png b/...n__vnd.oasis.opendocument.spreadsheet.png → ...n__vnd.oasis.opendocument.spreadsheet.png
diff --git a/...lication__vnd.oasis.opendocument.text.png → ...lication__vnd.oasis.opendocument.text.png b/...lication__vnd.oasis.opendocument.text.png → ...lication__vnd.oasis.opendocument.text.png
diff --git a/...ts-officedocument.spreadsheetml.sheet.png → ...ts-officedocument.spreadsheetml.sheet.png b/...ts-officedocument.spreadsheetml.sheet.png → ...ts-officedocument.spreadsheetml.sheet.png
diff --git a/...icedocument.wordprocessingml.document.png → ...icedocument.wordprocessingml.document.png b/...icedocument.wordprocessingml.document.png → ...icedocument.wordprocessingml.document.png
diff --git a/pics/ext/extensions/application__x-gzip.png → pics/extensions/application__x-gzip.png b/pics/ext/extensions/application__x-gzip.png → pics/extensions/application__x-gzip.png
diff --git a/...xt/extensions/application__x-msaccess.png → pics/extensions/application__x-msaccess.png b/...xt/extensions/application__x-msaccess.png → pics/extensions/application__x-msaccess.png
diff --git a/...ensions/application__x-rar-compressed.png → ...ensions/application__x-rar-compressed.png b/...ensions/application__x-rar-compressed.png → ...ensions/application__x-rar-compressed.png
diff --git a/...nsions/application__x-shockwave-flash.png → ...nsions/application__x-shockwave-flash.png b/...nsions/application__x-shockwave-flash.png → ...nsions/application__x-shockwave-flash.png
diff --git a/..._x-vnd.oasis.opendocument.spreadsheet.png → ..._x-vnd.oasis.opendocument.spreadsheet.png b/..._x-vnd.oasis.opendocument.spreadsheet.png → ..._x-vnd.oasis.opendocument.spreadsheet.png
diff --git a/...cation__x-vnd.oasis.opendocument.text.png → ...cation__x-vnd.oasis.opendocument.text.png b/...cation__x-vnd.oasis.opendocument.text.png → ...cation__x-vnd.oasis.opendocument.text.png
diff --git a/pics/ext/extensions/application__zip.png → pics/extensions/application__zip.png b/pics/ext/extensions/application__zip.png → pics/extensions/application__zip.png
diff --git a/pics/ext/extensions/audio__mpeg.png → pics/extensions/audio__mpeg.png b/pics/ext/extensions/audio__mpeg.png → pics/extensions/audio__mpeg.png
diff --git a/pics/ext/extensions/audio__x-wav.png → pics/extensions/audio__x-wav.png b/pics/ext/extensions/audio__x-wav.png → pics/extensions/audio__x-wav.png
diff --git a/pics/ext/extensions/documents.png → pics/extensions/documents.png b/pics/ext/extensions/documents.png → pics/extensions/documents.png
diff --git a/pics/ext/extensions/image__bmp.png → pics/extensions/image__bmp.png b/pics/ext/extensions/image__bmp.png → pics/extensions/image__bmp.png
diff --git a/pics/ext/extensions/image__jpeg.png → pics/extensions/image__jpeg.png b/pics/ext/extensions/image__jpeg.png → pics/extensions/image__jpeg.png
diff --git a/pics/ext/extensions/image__png.png → pics/extensions/image__png.png b/pics/ext/extensions/image__png.png → pics/extensions/image__png.png
diff --git a/pics/ext/extensions/text__csv.png → pics/extensions/text__csv.png b/pics/ext/extensions/text__csv.png → pics/extensions/text__csv.png
diff --git a/pics/ext/extensions/text__php.png → pics/extensions/text__php.png b/pics/ext/extensions/text__php.png → pics/extensions/text__php.png
diff --git a/pics/ext/extensions/text__plain.png → pics/extensions/text__plain.png b/pics/ext/extensions/text__plain.png → pics/extensions/text__plain.png
diff --git a/pics/ext/extensions/video__mpeg.png → pics/extensions/video__mpeg.png b/pics/ext/extensions/video__mpeg.png → pics/extensions/video__mpeg.png
diff --git a/pics/ext/extensions/video__x-flv.png → pics/extensions/video__x-flv.png b/pics/ext/extensions/video__x-flv.png → pics/extensions/video__x-flv.png
diff --git a/pics/ext/extensions/video__x-matroska.png → pics/extensions/video__x-matroska.png b/pics/ext/extensions/video__x-matroska.png → pics/extensions/video__x-matroska.png
diff --git a/pics/ext/extensions/video__x-msvideo.png → pics/extensions/video__x-msvideo.png b/pics/ext/extensions/video__x-msvideo.png → pics/extensions/video__x-msvideo.png