commentlist fixxing
authorrk <rk>
Tue, 2 Apr 2002 22:01:10 +0000 (22:01 +0000)
committerrk <rk>
Tue, 2 Apr 2002 22:01:10 +0000 (22:01 +0000)
source/mir/misc/HTMLTemplateProcessor.java
templates-dist/admin/commentlist.template

index 9faf4d0..f203920 100755 (executable)
@@ -183,7 +183,7 @@ public final class HTMLTemplateProcessor {
       process(null,templateFilename, (TemplateModelRoot)null, out, locale);
     }
 
-       
+
        /**
    * Mischt die freemarker-Struktur <code>tmr</code> mit
    * Template <code>templateFilename</code> 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);
        }
 
index 92b9406..da709b8 100755 (executable)
@@ -65,7 +65,7 @@
                                ${data.articleHash[entry.to_media]["title"]}<br>
                                <a href="${config.actionRoot}?module=Content&do=edit&id=${data.articleHash[entry.to_media]["id"]}">
                                edit</a> |
-                               <a href="${config.producerDocRoot}${data.articleHash[entry.to_media]["publish_path"]}${data.articleHash[entry.to_media]["id"]}.shtml">
+                               <a href="${config.productionHost}${config.producerDocRoot}${data.articleHash[entry.to_media]["publish_path"]}${data.articleHash[entry.to_media]["id"]}.shtml">
                                view</a>
                </td>