From a5900272c7f8ded37883c98239046b4eac5a6545 Mon Sep 17 00:00:00 2001 From: rk Date: Tue, 2 Apr 2002 22:01:10 +0000 Subject: [PATCH] commentlist fixxing --- source/mir/misc/HTMLTemplateProcessor.java | 17 ++++++++--------- templates-dist/admin/commentlist.template | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java index 9faf4d02..f203920d 100755 --- a/source/mir/misc/HTMLTemplateProcessor.java +++ b/source/mir/misc/HTMLTemplateProcessor.java @@ -183,7 +183,7 @@ public final class HTMLTemplateProcessor { process(null,templateFilename, (TemplateModelRoot)null, out, locale); } - + /** * Mischt die freemarker-Struktur tmr mit * Template templateFilename und gibt das Ergebnis an den PrintWriter @@ -198,7 +198,7 @@ public final class HTMLTemplateProcessor { TemplateModelRoot tmr, PrintWriter out, Locale locale) throws HTMLParseException { process(res,templateFilename,tmr,null,out,locale); - + } /** @@ -219,7 +219,7 @@ public final class HTMLTemplateProcessor { Template tmpl = getTemplateFor(templateFilename); if (tmpl == null) throw new HTMLParseException("no template: " + templateFilename); if (tmr==null) tmr = new SimpleHash(); - + /** @todo what is this for? (rk) */ String session=""; if (res!=null) { @@ -230,13 +230,12 @@ public final class HTMLTemplateProcessor { SimpleHash configHash = new SimpleHash(); configHash.put("producerDocRoot", new SimpleScalar(producerDocRoot)); configHash.put("storageRoot", new SimpleScalar(producerStorageRoot)); - configHash.put("productionHost", new SimpleScalar(productionHost)); + configHash.put("productionHost", new SimpleScalar(productionHost)); configHash.put("openAction", new SimpleScalar(openAction)); configHash.put("actionRootLogin",new SimpleScalar(actionRoot)); configHash.put("docRoot", new SimpleScalar(docRoot)); configHash.put("now", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar()))); configHash.put("actionRoot", new SimpleScalar(actionRoot+session)); - configHash.put("productionHost", new SimpleScalar(productionHost)); configHash.put("videoHost", new SimpleScalar(videoHost)); configHash.put("audioHost", new SimpleScalar(audioHost)); configHash.put("imageHost", new SimpleScalar(imageHost)); @@ -244,9 +243,9 @@ public final class HTMLTemplateProcessor { configHash.put("mirVersion", new SimpleScalar(MirConfig.getProp("Mir.Version"))); // this conform to updated freemarker syntax configHash.put("compressWhitespace", new freemarker.template.utility.CompressWhitespace() ); - + SimpleHash outPutHash = new SimpleHash(); - + if(extra!=null){ outPutHash.put("extra",extra); try{ @@ -257,10 +256,10 @@ public final class HTMLTemplateProcessor { } outPutHash.put("data",tmr); outPutHash.put("config", configHash); - + MessageResources messages = MessageResources.getMessageResources("bundles.admin"); outPutHash.put("lang", new MessageMethodModel(locale, messages) ); - + tmpl.process(outPutHash,out); } diff --git a/templates-dist/admin/commentlist.template b/templates-dist/admin/commentlist.template index 92b94069..da709b82 100755 --- a/templates-dist/admin/commentlist.template +++ b/templates-dist/admin/commentlist.template @@ -65,7 +65,7 @@ ${data.articleHash[entry.to_media]["title"]}
edit | - + view -- 2.11.0