") - .append(story.getMeta().getTitle()) - .append("

\n"); - desc.append( - "\t\t\t\t\n"); - desc.append("\t\t\t\t\t

\n"); - desc.append("\t\t\t\t\n"); - desc.append("\t\t\t\t\n"); + StringBuilder desclines = new StringBuilder(); Map details = BasicLibrary .getMetaDesc(story.getMeta()); for (String key : details.keySet()) { - appendTableRow(desc, 5, key, details.get(key)); + desclines.append(getTemplate("viewer.descline") // + .replace("${key}", key) // + .replace("${value}", details.get(key)) // + ); } - desc.append("\t\t\t\t

\n"); - desc.append("\t\t\t

Description

\n"); - content.append(desc); + viewer = getTemplate("viewer.text") // + .replace("${desc}", desc) // + ; if (chap.getParagraphs().size() <= 0) { - content.append("\t\t\tNo content provided.\n"); + viewer = viewer.replace("${content}", + "No content provided."); } else { - content.append( - "\t\t\t\n"); // - content.append("\t\t\t").append( - new TextOutput(false).convert(chap, chapter > 0)) - .append("\n"); + viewer = viewer.replace("${content}", + new TextOutput(false).convert(chap, chapter > 0)); } - content.append("\t\t

\n" - + "\t\t\t

\n" - + "\t\t

" // - + "\t\t\t%s\n" // - + "\t\t

\n" // - + "\t\t\t<<\n"// - + "\t\t\t<\n" // - + "\t\t\t

\n" // - + "\t\t\t\t

\n", // - disabledLeft, first, // - disabledLeft, previous, // - paragraph > 0 ? paragraph : chapter // - )); - // List of chap/para links - - appendItemA(builder, 5, WebLibraryUrls.getViewUrl(luid, 0, null), - "Description", paragraph == 0 && chapter == 0); + StringBuilder links = new StringBuilder(); + links.append(getTemplate("viewer.link") // + .replace("${link}", + WebLibraryUrls.getViewUrl(luid, 0, null)) // + .replace("${class}", + paragraph == 0 && chapter == 0 ? "selected" : "") // + .replace("${name}", "Description") // + ); if (paragraph > 0) { for (int i = 1; i <= chap.getParagraphs().size(); i++) { - appendItemA(builder, 5, - WebLibraryUrls.getViewUrl(luid, chapter, i), - "Image " + i, paragraph == i); + links.append(getTemplate("viewer.link") // + .replace("${link}", + WebLibraryUrls.getViewUrl(luid, chapter, i)) // + .replace("${class}", + paragraph == i ? "selected" : "") // + .replace("${name}", "Image " + i) // + ); } } else { int i = 1; @@ -741,52 +734,79 @@ abstract class WebLibraryServerHtml implements Runnable { chapName += ": " + c.getName(); } - appendItemA(builder, 5, - WebLibraryUrls.getViewUrl(luid, i, null), chapName, - chapter == i); + links.append(getTemplate("viewer.link") // + .replace("${link}", + WebLibraryUrls.getViewUrl(luid, i, null)) // + .replace("${class}", chapter == i ? "selected" : "") // + .replace("${name}", chapName) // + ); i++; } } - builder.append(String.format("" // - + "\t\t\t\t

\n" // - + "\t\t\t

\n" // - + "\t\t\t>\n" // - + "\t\t\t>>\n"// - + "\t\t

\n"); - builder.append("\t\t\tBACK\n"); - if (paragraph > 0) { - builder.append(String.format("" // - + "\t\t\tREAL\n"// - + "\t\t\tWIDTH\n"// - + "\t\t\tHEIGHT\n", // - disabledZoomReal, - uri + "?optionName=zoom&optionValue=real", // - disabledZoomWidth, - uri + "?optionName=zoom&optionValue=width", // - disabledZoomHeight, - uri + "?optionName=zoom&optionValue=height" // - )); - } + // Full content + + StringBuilder builder = new StringBuilder(); + + builder.append(getTemplateIndexPreBanner(false)); + + builder.append(getTemplate("viewer.navbar") // + .replace("${disabledFirst}", disabledLeft) // + .replace("${disabledPrevious}", disabledLeft) // + .replace("${disabledNext}", disabledRight) // + .replace("${disabledLast}", disabledRight) // + .replace("${hrefFirst}", first) // + .replace("${hrefPrevious}", previous) // + .replace("${hrefNext}", next) // + .replace("${hrefLast}", last) // + .replace("${current}", + "" + (paragraph > 0 ? paragraph : chapter)) // + .replace("${links}", links.toString()) // + ); - builder.append("\t\t

"); - builder.append(name); - builder.append("

Fanfix

${title}

diff --git a/src/be/nikiroo/fanfix/library/web/templates/package-info.java b/src/be/nikiroo/fanfix/library/web/templates/package-info.java new file mode 100644 index 00000000..5d4f3b2e --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/package-info.java @@ -0,0 +1 @@ +package be.nikiroo.fanfix.library.web.templates; \ No newline at end of file diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html new file mode 100644 index 00000000..21cddc45 --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html @@ -0,0 +1,9 @@ +

${title}

+ +

+ + +${details}

Description

diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html new file mode 100644 index 00000000..9d619879 --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html @@ -0,0 +1 @@ + ${key}${value} diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.image.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.image.html new file mode 100644 index 00000000..24165162 --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.image.html @@ -0,0 +1,6 @@ + +

+ diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.link.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.link.html new file mode 100644 index 00000000..5812c80a --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.link.html @@ -0,0 +1 @@ + ${name} diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html new file mode 100644 index 00000000..59f35be1 --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html @@ -0,0 +1,11 @@ + diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html new file mode 100644 index 00000000..b85f9a9a --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html @@ -0,0 +1 @@ + ${value} diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html new file mode 100644 index 00000000..1d1eaec1 --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html @@ -0,0 +1,2 @@ +

+${buttons}

diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.text.html b/src/be/nikiroo/fanfix/library/web/templates/viewer.text.html new file mode 100644 index 00000000..4562ea47 --- /dev/null +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.text.html @@ -0,0 +1,4 @@ +

+${desc} + ${content} +

diff --git a/src/be/nikiroo/fanfix/reader/TextOutput.java b/src/be/nikiroo/fanfix/reader/TextOutput.java index 60b3a7f7..732fced7 100644 --- a/src/be/nikiroo/fanfix/reader/TextOutput.java +++ b/src/be/nikiroo/fanfix/reader/TextOutput.java @@ -145,4 +145,18 @@ public class TextOutput { } return builder.toString(); } + + /** + * Convert the paragraph into HTML3 code. + * + * @param para + * the {@link Paragraph} to convert + * + * @return HTML3 code tested with Java Swing + */ + public String convert(Paragraph para) { + Chapter fakeChapter = new Chapter(0, ""); + fakeChapter.setParagraphs(Arrays.asList(para)); + return convert(fakeChapter, false); + } }

") - .append(story.getMeta().getTitle()) - .append("

Description

Fanfix

") // - .append(Version.getCurrentVersion()) // - .append("

Fanfix

${version}

${title}

Description