small fixes here and there

diff --git a/templates/admin/commentlist.template b/templates/admin/commentlist.template
index 14f29b5..165ab7f 100755 (executable)
--- a/templates/admin/commentlist.template
+++ b/templates/admin/commentlist.template
@@ -97,14 +97,17 @@
           <tr <if grey=="1"><assign grey="0">class="list1"<else><assign grey="1">class="list2"</if>>
         
                        <td>${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
-                 <if entry.is_published=="0"><span class="spezialtext">hidden</span><else>-</if>
+                 <if entry.is_published=="0"><span class="spezialtext">${lang("comment.hidden")}</span><else>-</if>
                        </td>
         
-            <td>
-                ${lang("comment.article")}
-                <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
-                  ${utility.encodeHTML(entry.to_content.title)}
-                </a>
+            <td><if entry.to_content>
+                  ${lang("comment.article")}
+                  <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
+                    ${utility.encodeHTML(entry.to_content.title)}
+                  </a>
+                  (${lang("articletypes."+entry.to_content.article_type.name)})
+                </if><br>
+                [<a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.to_content.id}">${lang("commentlist.allcomments")}</a>]
                 <br>
                   <a name="${entry.id}"></a>
                     <if entry.status>${lang("commentstatus." + entry.status.name)} - </if> 
@@ -116,19 +119,19 @@
                 <br>
                 <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
                                      <list entry.operations as op>
-                               [<a href="${config.actionRoot}?module=Localizer&do=commentoperation&operation=${op}&id=${entry.id}&returnurl=${utility.encodeURI(thisurl + "#" + entry.id)}">${op}</a>]
+                               [<a href="${config.actionRoot}?module=Localizer&do=commentoperation&operation=${op}&id=${entry.id}&returnurl=${utility.encodeURI(thisurl + "#" + entry.id)}">${lang("comment.operation."+op)}</a>]
                              </list>
                            </if>
                 <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
                                      <list entry.operations as op>
-                                   [<input type="checkbox" name="operation" value="${entry.id};${op}">${op}]
+                                   [<input type="checkbox" name="operation" value="${entry.id};${op}">${lang("comment.operation."+op)}]
                              </list>
                            </if>
                 <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="2">
                      <select name="operation">
                     <option value="" selected>&nbsp;</option>
                                        <list entry.operations as op>
-                      <option value="${entry.id};${op}">${op}</option>
+                      <option value="${entry.id};${op}">${lang("comment.operation."+op)}</option>
                                </list>
                   </select>
                            </if>

diff --git a/templates/admin/content.template b/templates/admin/content.template
index ad16fc4..246d561 100755 (executable)
--- a/templates/admin/content.template
+++ b/templates/admin/content.template
@@ -192,7 +192,7 @@
         <input type="checkbox" name="is_html" value="1"<if article.is_html=="1"> checked</if>>&nbsp;
       </td>
       <td colspan="4">
-        <textarea cols="70" rows="20" name="content_data" wrap=virtual>${article.content_data}</textarea>
+        <textarea cols="70" rows="20" name="content_data" wrap=virtual>${utility.encodeHTML(article.content_data)}</textarea>
       </td>
     </tr>
     <tr>

diff --git a/templates/admin/contentlist.template b/templates/admin/contentlist.template
index 61d2765..2d54005 100755 (executable)
--- a/templates/admin/contentlist.template
+++ b/templates/admin/contentlist.template
@@ -54,7 +54,7 @@
                 <select name="searcharticletype">
                   <option value="">--</option>
                   <list articletypes as at>
-                    <option value="${at.id}" <if searcharticletype==at.id> selected</if>>${lang("articletype."+at.name)}</option>
+                    <option value="${at.id}" <if searcharticletype==at.id> selected</if>>${lang("articletypes."+at.name)}</option>
                   </list>
                 </select>
             </td>
@@ -130,19 +130,19 @@
                 <if showactions=="1">
                   <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
                     <list entry.operations as op>
-                      [<a href="${config.actionRoot}?module=Localizer&do=articleoperation&operation=${op}&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${op}</a>]
+                      [<a href="${config.actionRoot}?module=Localizer&do=articleoperation&operation=${op}&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.operation."+op)}</a>]
                     </list>
                   </if>
                   <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
                     <list entry.operations as op>
-                      [<input type="checkbox" name="operation" value="${entry.id};${op}">${op}]
+                      [<input type="checkbox" name="operation" value="${entry.id};${op}">${lang("content.operation."+op)}]
                     </list>
                   </if>
                   <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="2">
                     <select name="operation">
                       <option value="" selected>&nbsp;</option>
                       <list entry.operations as op>
-                        <option value="${entry.id};${op}">${op}</option>
+                        <option value="${entry.id};${op}">${lang("content.operation."+op)}</option>
                       </list>
                     </select>
                   </if>
@@ -150,7 +150,7 @@
                     |
                   </if>
                   <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("edit")}</a> |
-                  <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.id}">${lang("contentlist.comments")}</a> (${entry.commentcount})
+                  <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("contentlist.comments")}</a> (${entry.commentcount})
                 <else>
                   <span class="text">
                     <a href="${config.actionRoot}?${selectarticleurl}&id=${entry.id}">${lang("contentlist.select")}</a>