diff --git a/src/fr/devinsy/statoolinfos/htmlize/SoftwarePage.java b/src/fr/devinsy/statoolinfos/htmlize/SoftwarePage.java
index ee5db22..4fb7320 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/SoftwarePage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/SoftwarePage.java
@@ -21,7 +21,6 @@ package fr.devinsy.statoolinfos.htmlize;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import fr.devinsy.statoolinfos.core.Service;
import fr.devinsy.statoolinfos.core.Services;
import fr.devinsy.statoolinfos.core.Software;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
@@ -61,24 +60,7 @@ public class SoftwarePage
data.setContent("softwareDesciprtion", software.getDescription());
data.setContent("serviceCount", services.size());
- int index = 0;
- for (Service service : services)
- {
- data.setAttribute("serviceListLine", index, "serviceListLineLogo", "src", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png");
- data.setEscapedContent("serviceListLine", index, "serviceListLineNameValue", service.getName());
- data.setAttribute("serviceListLine", index, "serviceListLineNameLink", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
-
- data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLink", "href", service.getOrganization().getTechnicalName() + ".xhtml");
- data.setAttribute("serviceListLine", index, "serviceListLineOrganizationLogo", "src", service.getOrganization().getTechnicalName() + "-logo.png");
- data.setEscapedContent("serviceListLine", index, "serviceListLineOrganizationValue", service.getOrganization().getName());
-
- data.setEscapedContent("serviceListLine", index, "serviceListLineUrlLink", service.getWebsite());
- data.setEscapedContent("serviceListLine", index, "serviceListLineWebsiteLink", service.getWebsite());
- data.setAttribute("serviceListLine", index, "serviceListLineWebsiteLink", "href", service.getWebsite());
- data.setEscapedContent("serviceListLine", index, "serviceListLineSoftware", service.getSoftwareName());
-
- index += 1;
- }
+ data.setContent("serviceListView", ServiceListView.build(services));
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/software.xhtml", data).toString();
diff --git a/src/fr/devinsy/statoolinfos/htmlize/software.xhtml b/src/fr/devinsy/statoolinfos/htmlize/software.xhtml
index dd41788..17c2b20 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/software.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/software.xhtml
@@ -11,43 +11,13 @@
-
-
-
Logiciel n/a
-
-
Bla bla description
-
Nombre de services : n/a
-
-
-
-
- | Nom du service |
- Organisation |
- URL |
- Logiciel |
- Utilisateurs mensuels |
-
-
-
-
-
-
- ![]()
- n/a
-
- |
-
-
- ![]()
- n/a
-
- |
- n/a |
- n/a |
- n/a |
-
-
-
+
+
Logiciel n/a
+
+
Nombre de services : n/a
+
+
+