ui

diff --git a/src/be/nikiroo/fanfix/library/WebLibraryServer.java b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
index 4abd438b6046a31053d71f5f7e772afb825f1314..7c5cf425bd0dd21394c9e4e881c33c5657530ae2 100644 (file)
--- a/src/be/nikiroo/fanfix/library/WebLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
@@ -93,8 +93,8 @@ public class WebLibraryServer implements Runnable {
                                                subkeys.add("");
 
                                                for (String subkey : subkeys) {
-                                                       if (CookieUtils.validateCookie(
-                                                                       wookie + subkey + opts, rehashed)) {
+                                                       if (CookieUtils.validateCookie(wookie + subkey
+                                                                       + opts, rehashed)) {
                                                                this.wookie = wookie;
                                                                this.token = token;
                                                                this.success = true;
@@ -148,8 +148,7 @@ public class WebLibraryServer implements Runnable {
                Integer port = Instance.getInstance().getConfig()
                                .getInteger(Config.SERVER_PORT);
                if (port == null) {
-                       throw new IOException(
-                                       "Cannot start web server: port not specified");
+                       throw new IOException("Cannot start web server: port not specified");
                }
 
                int cacheMb = Instance.getInstance().getConfig()
@@ -173,8 +172,8 @@ public class WebLibraryServer implements Runnable {
                        if (!keystorePath.isEmpty()) {
                                File keystoreFile = new File(keystorePath);
                                try {
-                                       KeyStore keystore = KeyStore
-                                                       .getInstance(KeyStore.getDefaultType());
+                                       KeyStore keystore = KeyStore.getInstance(KeyStore
+                                                       .getDefaultType());
                                        InputStream keystoreStream = new FileInputStream(
                                                        keystoreFile);
                                        try {
@@ -226,8 +225,8 @@ public class WebLibraryServer implements Runnable {
                                                        params.get("login"), whitelist);
                                } else {
                                        String token = cookies.get("token");
-                                       login = login(who, token, Instance.getInstance().getConfig()
-                                                       .getList(Config.SERVER_ALLOWED_SUBKEYS));
+                                       login = login(who, token, Instance.getInstance()
+                                                       .getConfig().getList(Config.SERVER_ALLOWED_SUBKEYS));
                                }
 
                                if (login.isSuccess()) {
@@ -236,8 +235,9 @@ public class WebLibraryServer implements Runnable {
                                        }
 
                                        // refresh token
-                                       session.getCookies().set(new Cookie("token",
-                                                       login.getToken(), "30; path=/"));
+                                       session.getCookies()
+                                                       .set(new Cookie("token", login.getToken(),
+                                                                       "30; path=/"));
 
                                        // set options
                                        String optionName = params.get("optionName");
@@ -247,8 +247,9 @@ public class WebLibraryServer implements Runnable {
                                                        session.getCookies().delete(optionName);
                                                        cookies.remove(optionName);
                                                } else {
-                                                       session.getCookies().set(new Cookie(optionName,
-                                                                       optionValue, "; path=/"));
+                                                       session.getCookies().set(
+                                                                       new Cookie(optionName, optionValue,
+                                                                                       "; path=/"));
                                                        cookies.put(optionName, optionValue);
                                                }
                                        }
@@ -258,7 +259,7 @@ public class WebLibraryServer implements Runnable {
                                if (!login.isSuccess() && (uri.equals("/") //
                                                || uri.startsWith(STORY_URL_BASE) //
                                                || uri.startsWith(VIEWER_URL_BASE) //
-                                               || uri.startsWith(LIST_URL))) {
+                               || uri.startsWith(LIST_URL))) {
                                        rep = loginPage(login, uri);
                                }
 
@@ -302,9 +303,10 @@ public class WebLibraryServer implements Runnable {
                                                                        NanoHTTPD.MIME_PLAINTEXT, "Not Found");
                                                }
                                        } catch (Exception e) {
-                                               Instance.getInstance().getTraceHandler().error(
-                                                               new IOException("Cannot process web request",
-                                                                               e));
+                                               Instance.getInstance()
+                                                               .getTraceHandler()
+                                                               .error(new IOException(
+                                                                               "Cannot process web request", e));
                                                rep = newFixedLengthResponse(Status.INTERNAL_ERROR,
                                                                NanoHTTPD.MIME_PLAINTEXT, "An error occured");
                                        }
@@ -413,8 +415,8 @@ public class WebLibraryServer implements Runnable {
                        wl = false;
                }
 
-               rw = Instance.getInstance().getConfig().getBoolean(Config.SERVER_RW,
-                               rw);
+               rw = Instance.getInstance().getConfig()
+                               .getBoolean(Config.SERVER_RW, rw);
                if (!subkey.isEmpty()) {
                        List<String> allowed = Instance.getInstance().getConfig()
                                        .getList(Config.SERVER_ALLOWED_SUBKEYS);
@@ -448,10 +450,9 @@ public class WebLibraryServer implements Runnable {
                        uri = "/";
                }
 
-               builder.append(
-                               "<form method='POST' action='" + uri + "' class='login'>\n");
-               builder.append(
-                               "<p>You must be logged into the system to see the stories.</p>");
+               builder.append("<form method='POST' action='" + uri
+                               + "' class='login'>\n");
+               builder.append("<p>You must be logged into the system to see the stories.</p>");
                builder.append("\t<input type='text' name='login' />\n");
                builder.append("\t<input type='password' name='password' />\n");
                builder.append("\t<input type='submit' value='Login' />\n");
@@ -474,8 +475,8 @@ public class WebLibraryServer implements Runnable {
                        }
 
                        return newInputStreamResponse("application/json",
-                                       new ByteArrayInputStream(
-                                                       new JSONArray(jsons).toString().getBytes()));
+                                       new ByteArrayInputStream(new JSONArray(jsons).toString()
+                                                       .getBytes()));
                }
 
                return NanoHTTPD.newFixedLengthResponse(Status.BAD_REQUEST,
@@ -489,20 +490,24 @@ public class WebLibraryServer implements Runnable {
                result = new MetaResultList(result.filter(whitelist, null, null));
                StringBuilder builder = new StringBuilder();
 
+               
                appendPreHtml(builder, true);
 
+               Map<String, String> params = session.getParms();
+               
                String filter = cookies.get("filter");
+               if (params.get("clear") != null)
+                       filter = null;
                if (filter == null) {
                        filter = "";
                }
 
-               Map<String, String> params = session.getParms();
-               String browser = params.get("browser") == null ? ""
-                               : params.get("browser");
-               String browser2 = params.get("browser2") == null ? ""
-                               : params.get("browser2");
-               String browser3 = params.get("browser3") == null ? ""
-                               : params.get("browser3");
+               String browser = params.get("browser") == null ? "" : params
+                               .get("browser");
+               String browser2 = params.get("browser2") == null ? "" : params
+                               .get("browser2");
+               String browser3 = params.get("browser3") == null ? "" : params
+                               .get("browser3");
 
                String filterSource = null;
                String filterAuthor = null;
@@ -586,31 +591,29 @@ public class WebLibraryServer implements Runnable {
                // TODO: javascript in realtime, using visible=false + hide [submit]
                builder.append("<div class='filter'>\n");
                builder.append("\tFilter: \n");
-               builder.append(
-                               "\t<input name='optionName'  type='hidden' value='filter' />\n");
+               builder.append("\t<input name='optionName'  type='hidden' value='filter' />\n");
                builder.append("\t<input name='optionValue' type='text'   value='"
                                + filter + "' place-holder='...' />\n");
-               builder.append(
-                               "\t<input name='submit' type='submit' value='Filter' />\n");
+               builder.append("\t<input name='clear'  type='submit' value='x' />");
+               builder.append("\t<input name='submit' type='submit' value='Filter' />\n");
                builder.append("</div>\n");
                builder.append("</form>\n");
 
                builder.append("\t<div class='books'>");
                for (MetaData meta : result.getMetas()) {
-                       if (!filter.isEmpty() && !meta.getTitle().toLowerCase()
-                                       .contains(filter.toLowerCase())) {
+                       if (!filter.isEmpty()
+                                       && !meta.getTitle().toLowerCase()
+                                                       .contains(filter.toLowerCase())) {
                                continue;
                        }
 
                        // TODO Sub sources
-                       if (filterSource != null
-                                       && !filterSource.equals(meta.getSource())) {
+                       if (filterSource != null && !filterSource.equals(meta.getSource())) {
                                continue;
                        }
 
                        // TODO: sub authors
-                       if (filterAuthor != null
-                                       && !filterAuthor.equals(meta.getAuthor())) {
+                       if (filterAuthor != null && !filterAuthor.equals(meta.getAuthor())) {
                                continue;
                        }
 
@@ -626,12 +629,10 @@ public class WebLibraryServer implements Runnable {
 
                        if (lib.isCached(meta.getLuid())) {
                                // ◉ = &#9673;
-                               builder.append(
-                                               "<span class='cache_icon cached'>&#9673;</span>");
+                               builder.append("<span class='cache_icon cached'>&#9673;</span>");
                        } else {
                                // ○ = &#9675;
-                               builder.append(
-                                               "<span class='cache_icon uncached'>&#9675;</span>");
+                               builder.append("<span class='cache_icon uncached'>&#9675;</span>");
                        }
                        builder.append("<span class='luid'>");
                        builder.append(meta.getLuid());
@@ -672,8 +673,7 @@ public class WebLibraryServer implements Runnable {
                // 1-based (0 = desc)
                int chapter = 0;
                if (chapterStr != null && !"cover".equals(chapterStr)
-                               && !"metadata".equals(chapterStr)
-                               && !"json".equals(chapterStr)) {
+                               && !"metadata".equals(chapterStr) && !"json".equals(chapterStr)) {
                        try {
                                chapter = Integer.parseInt(chapterStr);
                                if (chapter < 0) {
@@ -729,8 +729,8 @@ public class WebLibraryServer implements Runnable {
                                                        builder.append(p.getContent());
                                                }
 
-                                               in = new ByteArrayInputStream(
-                                                               builder.toString().getBytes("utf-8"));
+                                               in = new ByteArrayInputStream(builder.toString()
+                                                               .getBytes("utf-8"));
                                        } else {
                                                Paragraph para = story.getChapters().get(chapter - 1)
                                                                .getParagraphs().get(paragraph - 1);
@@ -740,8 +740,8 @@ public class WebLibraryServer implements Runnable {
                                                        mimeType = "image/png";
                                                        in = img.newInputStream();
                                                } else {
-                                                       in = new ByteArrayInputStream(
-                                                                       para.getContent().getBytes("utf-8"));
+                                                       in = new ByteArrayInputStream(para.getContent()
+                                                                       .getBytes("utf-8"));
                                                }
                                        }
                                }
@@ -860,8 +860,7 @@ public class WebLibraryServer implements Runnable {
                                        desc.append("\t\t<img src='/story/" + luid + "/cover'/>\n");
                                        desc.append("\t</div>\n");
                                        desc.append("\t<table>\n");
-                                       desc.append(
-                                                       "\t\t<tr><th>HEAD 1</th><th>HEAD 2</th></tr>\n");
+                                       desc.append("\t\t<tr><th>HEAD 1</th><th>HEAD 2</th></tr>\n");
                                        desc.append("\t\t<tr><td>KEY 1</td><td>VAL 1</td></tr>\n");
                                        desc.append("\t\t<tr><td>KEY 2</td><td>VAL 2</td></tr>\n");
                                        desc.append("\t</table>\n");
@@ -871,8 +870,7 @@ public class WebLibraryServer implements Runnable {
 
                                content.append("<div class='viewer text'>\n");
                                content.append(desc);
-                               content.append(
-                                               new TextOutput(false).convert(chap, chapter > 0));
+                               content.append(new TextOutput(false).convert(chap, chapter > 0));
                                content.append("</div>\n");
 
                                if (chapter <= 1)
@@ -897,8 +895,8 @@ public class WebLibraryServer implements Runnable {
                                        para = chap.getParagraphs().get(paragraph - 1);
                                } catch (IndexOutOfBoundsException e) {
                                        return NanoHTTPD.newFixedLengthResponse(Status.NOT_FOUND,
-                                                       NanoHTTPD.MIME_PLAINTEXT,
-                                                       "Paragraph " + paragraph + " not found");
+                                                       NanoHTTPD.MIME_PLAINTEXT, "Paragraph " + paragraph
+                                                                       + " not found");
                                }
 
                                if (para.getType() == ParagraphType.IMAGE) {
@@ -943,7 +941,7 @@ public class WebLibraryServer implements Runnable {
                                        disabledLeft, previous, //
                                        disabledRight, next, //
                                        disabledRight, last //
-                       ));
+                                       ));
 
                        builder.append(content);
 
@@ -957,18 +955,19 @@ public class WebLibraryServer implements Runnable {
                        builder.append("        <a class='button back' href='/'>BACK</a>\n");
 
                        if (paragraph > 0) {
-                               builder.append(String.format("" //
-                                               + "\t<a%s class='button zoomreal'   href='%s'>REAL</a>\n"//
-                                               + "\t<a%s class='button zoomwidth'  href='%s'>WIDTH</a>\n"//
-                                               + "\t<a%s class='button zoomheight' href='%s'>HEIGHT</a>\n"//
-                                               + "</div>\n", //
-                                               disabledZoomReal,
-                                               uri + "?optionName=zoom&optionValue=real", //
-                                               disabledZoomWidth,
-                                               uri + "?optionName=zoom&optionValue=width", //
-                                               disabledZoomHeight,
-                                               uri + "?optionName=zoom&optionValue=height" //
-                               ));
+                               builder.append(String
+                                               .format("" //
+                                                               + "\t<a%s class='button zoomreal'   href='%s'>REAL</a>\n"//
+                                                               + "\t<a%s class='button zoomwidth'  href='%s'>WIDTH</a>\n"//
+                                                               + "\t<a%s class='button zoomheight' href='%s'>HEIGHT</a>\n"//
+                                                               + "</div>\n", //
+                                                               disabledZoomReal, uri
+                                                                               + "?optionName=zoom&optionValue=real", //
+                                                               disabledZoomWidth, uri
+                                                                               + "?optionName=zoom&optionValue=width", //
+                                                               disabledZoomHeight, uri
+                                                                               + "?optionName=zoom&optionValue=height" //
+                                               ));
                        }
 
                        appendPostHtml(builder);
@@ -984,21 +983,23 @@ public class WebLibraryServer implements Runnable {
 
        private Response newInputStreamResponse(String mimeType, InputStream in) {
                if (in == null) {
-                       return NanoHTTPD.newFixedLengthResponse(Status.NO_CONTENT, "",
-                                       null);
+                       return NanoHTTPD
+                                       .newFixedLengthResponse(Status.NO_CONTENT, "", null);
                }
                return NanoHTTPD.newChunkedResponse(Status.OK, mimeType, in);
        }
 
        private String getContentOf(String file) {
-               InputStream in = IOUtils.openResource(WebLibraryServerIndex.class,
-                               file);
+               InputStream in = IOUtils
+                               .openResource(WebLibraryServerIndex.class, file);
                if (in != null) {
                        try {
                                return IOUtils.readSmallStream(in);
                        } catch (IOException e) {
-                               Instance.getInstance().getTraceHandler().error(
-                                               new IOException("Cannot get file: index.pre.html", e));
+                               Instance.getInstance()
+                                               .getTraceHandler()
+                                               .error(new IOException(
+                                                               "Cannot get file: index.pre.html", e));
                        }
                }
 
@@ -1048,8 +1049,7 @@ public class WebLibraryServer implements Runnable {
        }
 
        // NULL if not whitelist OK or if not found
-       private Story story(String luid, List<String> whitelist)
-                       throws IOException {
+       private Story story(String luid, List<String> whitelist) throws IOException {
                synchronized (storyCache) {
                        if (storyCache.containsKey(luid)) {
                                Story story = storyCache.get(luid);
@@ -1111,8 +1111,8 @@ public class WebLibraryServer implements Runnable {
                        favicon = "icon_" + icon.replace("-", "_") + ".png";
                }
 
-               builder.append(
-                               getContentOf("index.pre.html").replace("favicon.ico", favicon));
+               builder.append(getContentOf("index.pre.html").replace("favicon.ico",
+                               favicon));
 
                if (banner) {
                        builder.append("<div class='banner'>\n");

diff --git a/src/be/nikiroo/fanfix/library/web/clear-32x32.png b/src/be/nikiroo/fanfix/library/web/clear-32x32.png
new file mode 100644 (file)
index 0000000..bdc51d0
Binary files /dev/null and b/src/be/nikiroo/fanfix/library/web/clear-32x32.png differ

diff --git a/src/be/nikiroo/fanfix/library/web/clear.png b/src/be/nikiroo/fanfix/library/web/clear.png
new file mode 100644 (file)
index 0000000..db0509f
Binary files /dev/null and b/src/be/nikiroo/fanfix/library/web/clear.png differ

diff --git a/src/be/nikiroo/fanfix/library/web/style.css b/src/be/nikiroo/fanfix/library/web/style.css
index fb0119015fecd15c0faae17aca548a94cfe8cd72..e00a52ac343ca57486addaee999f0c07402b62a0 100644 (file)
--- a/src/be/nikiroo/fanfix/library/web/style.css
+++ b/src/be/nikiroo/fanfix/library/web/style.css
@@ -63,7 +63,7 @@ h3 {
        width: 250px;
        display: flex;
        margin: auto;
-       margin-top: 200px;
+       margin-top: calc(50% - 320px);
        flex-direction: column;
        border: 1px solid gray;
        padding: 20px;
@@ -84,6 +84,18 @@ h3 {
 
 .filter {
        padding: 10px;
+       height: 36px;
+}
+
+.filter > * {
+       height: 36px;
+}
+
+.filter input[name='clear'] {
+       background-image: url('/clear-32x32.png');
+       color: transparent;
+       width: 36px;
+       height: 36px;
 }
 
 .books {
@@ -96,8 +108,7 @@ h3 {
 
 .book_line .link, .book_line .title {
        flex-grow: 100;
-       padding-right: 5px;
-       padding-left: 5px;
+       padding: 5px;
 }
 
 .book_line .link {
@@ -200,6 +211,10 @@ a.viewer.link:hover {
        display: flex;
 }
 
+.desc .cover img {
+       width: 100px;
+}
+
 @media(min-width: 800px) {
         .main {
                max-width: 800px;