right-click = go back

[nikiroo-utils.git] / src / be / nikiroo / fanfix / library / WebLibraryServer.java

diff --git a/src/be/nikiroo/fanfix/library/WebLibraryServer.java b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
index 982d224d03cc7f12c1415dbf4b0dd3324210139d..b76d8dc100df5de6682e05618de5a0b92768da10 100644 (file)
--- 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("<h1 class='title'>");
+                                       desc.append(story.getMeta().getTitle());
+                                       desc.append("</h1>\n");
                                        desc.append("<div class='desc'>\n");
                                        desc.append("\t<div class='cover'>\n");
                                        desc.append("\t\t<img src='/story/" + luid + "/cover'/>\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("</div>\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("" //
-                                                       + "<a class='viewer link' href='%s'>"
+                                                       + "<a class='viewer link' oncontextmenu='%s' href='%s'>"
                                                        + "<img class='viewer img' style='%s' src='%s'/>"
                                                        + "</a>", //
+                                                       javascript, //
                                                        next, //
                                                        zoomStyle, //
                                                        getStoryUrl(luid, chapter, paragraph)));
@@ -952,7 +959,7 @@ public class WebLibraryServer implements Runnable {
                        builder.append(String.format("" //
                                        + "<div class='bar navbar'>\n" //
                                        + "\t<a%s class='button first' href='%s'>&lt;&lt;</a>\n"//
-                                       + "\t<a%s class='button previous' href='%s'>&lt;</a>\n" //
+                                       + "\t<a%s id='previous' class='button previous' href='%s'>&lt;</a>\n" //
                                        + "\t<div class='gotobox itemsbox'>\n" //
                                        + "\t\t<div class='button goto'>%d</div>\n" //
                                        + "\t\t<div class='items goto'>\n", //