X-Git-Url: http://git.wpitchoune.net/gitweb/?p=pnews.git;a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FHTML.java;h=72f0b4b3b514573f650f09701220c0b7b73ec241;hp=42564e896d9e857e1da5e685521f2e7bb982e56e;hb=511fe72ae8bad61a60f738c01819af58510ae9d3;hpb=6a601c7b03d36f95fbb69ba487c8a4953828c71d diff --git a/war/src/main/java/pnews/servlet/HTML.java b/war/src/main/java/pnews/servlet/HTML.java index 42564e8..72f0b4b 100644 --- a/war/src/main/java/pnews/servlet/HTML.java +++ b/war/src/main/java/pnews/servlet/HTML.java @@ -105,11 +105,20 @@ public class HTML { buf.append("\n"); } - public static String toHTML(List
articles, Category catActive, Config cfg, ArticleProvider provider) { + private static String toURL(Category catActive, String entity) { + try { + return catActive.getURL() + "?entity=" + URLEncoder.encode(entity, "UTF-8"); + } catch (UnsupportedEncodingException e) { + LOG.log(Level.SEVERE, "Failed to generate link to entity " + entity, e); + return catActive.getURL(); + } + } + + public static String toHTML(List
articles, Category catActive, String entityActive, Config cfg, ArticleProvider provider) { StringBuffer buf; int i; - Category[] cats; List entities; + String cl; buf = new StringBuffer(); buf.append("\n"); @@ -123,8 +132,6 @@ public class HTML { buf.append("\n"); buf.append("\n"); - cats = cfg.getCategories(); - appendMenu(buf, catActive, cfg); try { @@ -136,7 +143,11 @@ public class HTML { i = 0; for (EntityStat s: entities) { buf.append("
  • "); - buf.append(s.getEntity()); + if (entityActive != null && s.getEntity().equals(entityActive)) + cl = "active"; + else + cl = null; + appendA(buf, s.getEntity(), toURL(catActive, s.getEntity()), cl); buf.append("
    • \n"); i++; if (i > 10)