X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FWebLibraryServer.java;h=b76d8dc100df5de6682e05618de5a0b92768da10;hb=842afa6c148fa14a6c294a27696f2e59b8294d4e;hp=fe79f96ad455c0814e0c759196ff580c37609733;hpb=599b05c7917edbe2fe4d6449628f2b261eae2f5e;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/WebLibraryServer.java b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
index fe79f96..b76d8dc 100644
--- a/src/be/nikiroo/fanfix/library/WebLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
@@ -713,6 +713,8 @@ public class WebLibraryServer implements Runnable {
if (img != null) {
in = img.newInputStream();
}
+ // TODO: get correct image type
+ mimeType = "image/png";
} else if ("metadata".equals(chapterStr)) {
MetaData meta = meta(luid, whitelist);
JSONObject json = JsonIO.toJson(meta);
@@ -858,6 +860,9 @@ public class WebLibraryServer implements Runnable {
StringBuilder desc = new StringBuilder();
if (chapter <= 0) {
+ desc.append("
\n");
desc.append("\t
\n");
desc.append("\t\t
\n");
@@ -877,9 +882,9 @@ public class WebLibraryServer implements Runnable {
content.append(desc);
String description = new TextOutput(false).convert(chap,
chapter > 0);
- content.append(
- description.isEmpty() ? "No description provided."
- : description);
+ content.append(chap.getParagraphs().size() <= 0
+ ? "No content provided."
+ : description);
content.append("
\n");
if (chapter <= 0)
@@ -935,10 +940,12 @@ public class WebLibraryServer implements Runnable {
}
}
+ String javascript = "document.getElementById(\"previous\").click(); return false;";
content.append(String.format("" //
- + "
"
+ + ""
+ ""
+ "", //
+ javascript, //
next, //
zoomStyle, //
getStoryUrl(luid, chapter, paragraph)));
@@ -952,12 +959,47 @@ public class WebLibraryServer implements Runnable {
builder.append(String.format("" //
+ "
\n" //
+ "\t
<<\n"//
- + "\t
<\n"//
- + "\t
>\n"//
- + "\t
>>\n"//
- + "
\n", //
+ + "\t
<\n" //
+ + "\t
\n" //
+ + "\t\t
%d
\n" //
+ + "\t\t
\n", //
disabledLeft, first, //
disabledLeft, previous, //
+ paragraph > 0 ? paragraph : chapter //
+ ));
+
+ // List of chap/para links
+
+ String blink = "/view/story/" + luid + "/";
+ appendItemA(builder, 3, blink + "0", "Description",
+ paragraph == 0 && chapter == 0);
+
+ if (paragraph > 0) {
+ blink = blink + chapter + "/";
+ for (int i = 1; i <= chap.getParagraphs().size(); i++) {
+ appendItemA(builder, 3, blink + i, "Image " + i,
+ paragraph == i);
+ }
+ } else {
+ int i = 1;
+ for (Chapter c : story.getChapters()) {
+ String chapName = "Chapter " + c.getNumber();
+ if (c.getName() != null && !c.getName().isEmpty()) {
+ chapName += ": " + c.getName();
+ }
+
+ appendItemA(builder, 3, blink + i, chapName, chapter == i);
+
+ i++;
+ }
+ }
+
+ builder.append(String.format("" //
+ + "\t\t
\n" //
+ + "\t
\n" //
+ + "\t
>\n" //
+ + "\t
>>\n"//
+ + "
\n", //
disabledRight, next, //
disabledRight, last //
));
@@ -1178,6 +1220,23 @@ public class WebLibraryServer implements Runnable {
builder.append("\n");
}
+ private void appendItemA(StringBuilder builder, int depth, String link,
+ String name, boolean selected) {
+ for (int i = 0; i < depth; i++) {
+ builder.append("\t");
+ }
+
+ builder.append("