merged 1.1 branch into head

[mir.git] / templates / admin / commentlist.template

diff --git a/templates/admin/commentlist.template b/templates/admin/commentlist.template
index 184d544..cfdf840 100755 (executable)
--- a/templates/admin/commentlist.template
+++ b/templates/admin/commentlist.template
@@ -129,11 +129,6 @@
               <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
               ${lang("edit")}
               </a> |
-<comment>              
-              <a href="${entry.publicurl}">
-                ${lang("start.show")}
-              </a> |
-</comment>              
               <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.to_content.id}">
                 ${lang("commentlist.allcomments")}
               </a>
@@ -142,16 +137,21 @@
             </if>
   
         
-        <b>${entry.title}</b> (${entry.id})&nbsp;
+        <b>${utility.encodeHTML(entry.title)}</b> (${entry.id})&nbsp;
         <if entry.creator>
-          ${lang("by")}: ${entry.creator}
+          ${lang("by")}: ${utility.encodeHTML(entry.creator)}
         </if>
         <br>
         ${utility.prettyEncodeHTML(utility.subString(entry.description, 0, config["Mir.Admin.ListTextLengthLimit"]))}
+
+        <br>
+          <if entry.to_all_media_images || entry.to_all_media_audio || entry.to_all_media_video || entry.to_all_media_other>
+               <call showCommentAttachment(entry, thisurl)>
+          </if>
+        <br>
         
-        <if entry.main_url><br>URL: ${entry.main_url}</if>
+        <if entry.main_url><br>URL: ${utility.encodeHTML(entry.main_url)}</if>
         <br>
-  <!--      <div class="bg-neutral small">-->
         <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)}">${lang("comment.operation."+op)}</a> ]
@@ -171,8 +171,7 @@
           </select>
         </if>
         <if entry.operations>&nbsp;|&nbsp;</if>
-        <a href="${config.actionRoot}?module=Comment&do=edit&id=${entry.id}">${lang("edit")}</a>                
-  <!--      </div>-->
+        <a href="${config.actionRoot}?module=Comment&do=edit&id=${entry.id}">${lang("edit")}</a>
       </td>
         
       <td valign="top">