diff --git a/src/fr/devinsy/statoolinfos/core/Service.java b/src/fr/devinsy/statoolinfos/core/Service.java index 60114eb..8699311 100644 --- a/src/fr/devinsy/statoolinfos/core/Service.java +++ b/src/fr/devinsy/statoolinfos/core/Service.java @@ -197,6 +197,66 @@ public class Service extends PathPropertyList return result; } + /** + * Checks if is registration client. + * + * @return true, if is registration client + */ + public boolean isRegistrationClient() + { + boolean result; + + result = StringUtils.containsIgnoreCase(get("service.registration"), "Client"); + + // + return result; + } + + /** + * Checks if is registration free. + * + * @return true, if is registration free + */ + public boolean isRegistrationFree() + { + boolean result; + + result = StringUtils.containsIgnoreCase(get("service.registration"), "Free"); + + // + return result; + } + + /** + * Checks if is registration member. + * + * @return true, if is registration member + */ + public boolean isRegistrationMember() + { + boolean result; + + result = StringUtils.containsIgnoreCase(get("service.registration"), "Member"); + + // + return result; + } + + /** + * Checks if is registration none. + * + * @return true, if is registration none + */ + public boolean isRegistrationNone() + { + boolean result; + + result = StringUtils.containsIgnoreCase(get("service.registration"), "None"); + + // + return result; + } + public void setInputFile(final File inputFile) { this.inputFile = inputFile; diff --git a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java index b15c2a7..26dc5f4 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java +++ b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java @@ -107,18 +107,58 @@ public class Htmlizer // Copy commons files (index, images, favicon, css…). if (!new File(targetDirectory, "index.html").exists()) { + final String source = "/fr/devinsy/statoolinfos/htmlize/stuff/"; - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/index.html", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/Chart.bundle.min.js", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/sorttable.js", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/datatables.min.css", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/datatables.min.js", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos-logo.jpg", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos-logo.ico", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos-logo-name.jpg", targetDirectory); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos-logo.jpg", new File(targetDirectory, "logo.jpg")); - StatoolInfosUtils.copyRessource("/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos-logo.ico", new File(targetDirectory, "favicon.ico")); + StatoolInfosUtils.copyRessource(source + "index.html", targetDirectory); + StatoolInfosUtils.copyRessource(source + "statoolinfos.css", targetDirectory); + StatoolInfosUtils.copyRessource(source + "Chart.bundle.min.js", targetDirectory); + StatoolInfosUtils.copyRessource(source + "sorttable.js", targetDirectory); + StatoolInfosUtils.copyRessource(source + "datatables.min.css", targetDirectory); + StatoolInfosUtils.copyRessource(source + "datatables.min.js", targetDirectory); + StatoolInfosUtils.copyRessource(source + "statoolinfos-logo.jpg", targetDirectory); + StatoolInfosUtils.copyRessource(source + "statoolinfos-logo.ico", targetDirectory); + StatoolInfosUtils.copyRessource(source + "statoolinfos-logo-name.jpg", targetDirectory); + StatoolInfosUtils.copyRessource(source + "statoolinfos-logo.jpg", new File(targetDirectory, "logo.jpg")); + StatoolInfosUtils.copyRessource(source + "statoolinfos-logo.ico", new File(targetDirectory, "favicon.ico")); + + // + File color = new File(targetDirectory, "circle-icons/color"); + color.mkdirs(); + File mono = new File(targetDirectory, "circle-icons/mono"); + mono.mkdirs(); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/global.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/global.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/email.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/email.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/profile.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/profile.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/money.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/money.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/creditcard.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/creditcard.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/mail.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/mail.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/ribbon.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/ribbon.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/booklet.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/booklet.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/bookshelf.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/bookshelf.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/toolbox.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/toolbox.png", mono); + + StatoolInfosUtils.copyRessource(source + "circle-icons/color/tools.png", color); + StatoolInfosUtils.copyRessource(source + "circle-icons/mono/tools.png", mono); } } diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServicesPage.java b/src/fr/devinsy/statoolinfos/htmlize/ServicesPage.java index 20fe6af..5a6319f 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/ServicesPage.java +++ b/src/fr/devinsy/statoolinfos/htmlize/ServicesPage.java @@ -25,6 +25,7 @@ import fr.devinsy.statoolinfos.core.Service; import fr.devinsy.statoolinfos.core.Services; import fr.devinsy.statoolinfos.core.StatoolInfosException; import fr.devinsy.xidyn.XidynException; +import fr.devinsy.xidyn.data.DisplayMode; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; @@ -73,6 +74,27 @@ public class ServicesPage data.setEscapedContent("serviceListLine", index, "serviceListLineSoftware", service.getSoftwareName()); data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().toString()); + if (service.isRegistrationNone()) + { + data.setAttribute("serviceListLine", index, "serviceListLineRegistrationNoneImg", "class", "toto"); + data.getIdData("serviceListLine", index, "serviceListLineRegistrationNoneImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (service.isRegistrationFree()) + { + data.setAttribute("serviceListLine", index, "serviceListLineRegistrationFreeImg", "class", ""); + data.getIdData("serviceListLine", index, "serviceListLineRegistrationFreeImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (service.isRegistrationMember()) + { + data.setAttribute("serviceListLine", index, "serviceListLineRegistrationMemberImg", "class", ""); + data.getIdData("serviceListLine", index, "serviceListLineRegistrationMemberImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + if (service.isRegistrationClient()) + { + data.setAttribute("serviceListLine", index, "serviceListLineRegistrationClientImg", "class", ""); + data.getIdData("serviceListLine", index, "serviceListLineRegistrationClientImg").getAttribute("class").setMode(DisplayMode.REPLACE); + } + index += 1; } diff --git a/src/fr/devinsy/statoolinfos/htmlize/services.xhtml b/src/fr/devinsy/statoolinfos/htmlize/services.xhtml index ee60bc7..7f37f40 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/services.xhtml +++ b/src/fr/devinsy/statoolinfos/htmlize/services.xhtml @@ -11,7 +11,7 @@ -
+

Tous les services

@@ -21,10 +21,11 @@ Nom du service - Organisation + Organisation URL Logiciel Utilisateurs mensuels + Registration Date @@ -45,6 +46,18 @@ n/a n/a n/a + + + + + + + + + + + + n/a diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/booklet.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/booklet.png new file mode 100644 index 0000000..b7d5db9 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/booklet.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/bookshelf.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/bookshelf.png new file mode 100644 index 0000000..9fa1bbe Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/bookshelf.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/contacts.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/contacts.png new file mode 100644 index 0000000..fc5306c Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/contacts.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/creditcard.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/creditcard.png new file mode 100644 index 0000000..45dc32b Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/creditcard.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/email.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/email.png new file mode 100644 index 0000000..53a3601 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/email.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/global.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/global.png new file mode 100644 index 0000000..25fe37a Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/global.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/mail.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/mail.png new file mode 100644 index 0000000..3d715bc Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/mail.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/money.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/money.png new file mode 100644 index 0000000..ae873a8 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/money.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/profile.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/profile.png new file mode 100644 index 0000000..4d46ece Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/profile.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/rainbow.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/rainbow.png new file mode 100644 index 0000000..e4abd3a Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/rainbow.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/ribbon.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/ribbon.png new file mode 100644 index 0000000..391db0e Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/ribbon.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/toolbox.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/toolbox.png new file mode 100644 index 0000000..87c2c4a Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/toolbox.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/tools.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/tools.png new file mode 100644 index 0000000..e23b404 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/color/tools.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/booklet.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/booklet.png new file mode 100644 index 0000000..ad3c728 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/booklet.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/bookshelf.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/bookshelf.png new file mode 100644 index 0000000..b78ae6c Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/bookshelf.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/chat.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/chat.png new file mode 100644 index 0000000..952de63 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/chat.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/contacts.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/contacts.png new file mode 100644 index 0000000..b3bcbda Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/contacts.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/creditcard.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/creditcard.png new file mode 100644 index 0000000..c329cf3 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/creditcard.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/email.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/email.png new file mode 100644 index 0000000..76c32a0 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/email.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/global.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/global.png new file mode 100644 index 0000000..6a66c6f Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/global.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/mail.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/mail.png new file mode 100644 index 0000000..84397d0 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/mail.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/money.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/money.png new file mode 100644 index 0000000..6595a20 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/money.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/profile.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/profile.png new file mode 100644 index 0000000..61d47f1 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/profile.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/rainbow.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/rainbow.png new file mode 100644 index 0000000..85e2df6 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/rainbow.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/ribbon.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/ribbon.png new file mode 100644 index 0000000..1db7e08 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/ribbon.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/toolbox.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/toolbox.png new file mode 100644 index 0000000..a56df6e Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/toolbox.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/tools.png b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/tools.png new file mode 100644 index 0000000..b50e4f5 Binary files /dev/null and b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/mono/tools.png differ diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/notes b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/notes new file mode 100644 index 0000000..c5ac2e0 --- /dev/null +++ b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/notes @@ -0,0 +1,3 @@ +https://www.elegantthemes.com/blog/freebie-of-the-week/beautiful-flat-icons-for-free + +We’ve designed a 192 piece set of flat icons, and they are all yours, for free! The icons come in two versions: full color and single color, for a total of 384 variations. This download includes .ai, .eps, .pdf, and .png (64px and 128px). Below is the full set in both styles. These icons are completely free and Open Source under the GPL, so feel free to use them in your personal and commercial projects alike. We are on a mission to create the best collection of Open Source graphics on the web, so that the WordPress ecosystem can use and enjoy them alongside the freedoms they have become accustomed to. Stay tuned for more great stuff! diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css b/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css index f533ab0..57d0a0b 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css +++ b/src/fr/devinsy/statoolinfos/htmlize/stuff/statoolinfos.css @@ -49,6 +49,11 @@ ul, ol margin-left:30px; } +img.disabled +{ + opacity: 0.2; +} + /***** GENERIC Titles ******/ h1.big