X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=inline;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FHtml.java;fp=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FHtml.java;h=a4452643ccf055d6584d74781771370b7c1c8e58;hb=3367f6256b5143b7cba2a61de36e74f389a5f379;hp=385df8bf8da919416ccf672a623fa9288c0ab585;hpb=b389651b0012a7ba1ff30d164958e155688ac216;p=gofetch.git diff --git a/src/be/nikiroo/gofetch/output/Html.java b/src/be/nikiroo/gofetch/output/Html.java index 385df8b..a445264 100644 --- a/src/be/nikiroo/gofetch/output/Html.java +++ b/src/be/nikiroo/gofetch/output/Html.java @@ -2,6 +2,7 @@ package be.nikiroo.gofetch.output; import be.nikiroo.gofetch.data.Comment; import be.nikiroo.gofetch.data.Story; +import be.nikiroo.gofetch.support.BasicSupport; import be.nikiroo.gofetch.support.Type; import be.nikiroo.utils.StringUtils; @@ -11,7 +12,7 @@ public class Html extends Output { } @Override - public String getIndexHeader() { + public String getMainIndexHeader() { String sel = preselector; if (!sel.isEmpty()) { sel = "/1" + sel; @@ -22,7 +23,7 @@ public class Html extends Output { StringBuilder builder = new StringBuilder(); appendPre(builder); - builder.append("
").append(comment.getTitle()) - .append("
\n"); + builder.append(space).append("").append(comment.getTitle()) + .append("
\n"); builder.append(space) .append("" - + story.getTitle() + "
\n"); + builder.append("" + + story.getTitle() + "
\n"); } else { - builder.append("" + story.getTitle() + "
\n"); + builder.append("" + story.getTitle() + "
\n"); } builder.append("\n"); + builder.append("- Reference: " + story.getId()
+ + "
\n");
builder.append(" - News link: " + story.getUrlInternal()
+ "
\n");
@@ -146,13 +159,14 @@ public class Html extends Output {
builder.append(" \n");
if (resume) {
- builder.append(" " + StringUtils.xmlEscape(story.getContent())
- + "\n");
+ builder.append(" "
+ + StringUtils.xmlEscape(story.getContent()).replace("\n",
+ " \n");
") + "\n"); } else { builder.append(" " + StringUtils.xmlEscape(story.getFullContent()) - .replace("\n", "
").replace("[ ", "
") - .replace(" ]", "
") + "\n"); + .replace("\n", "").replace("[ ", "
") + .replace(" ]", "
") + "\n"); } builder.append("