and this time right...

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

diff --git a/templates/admin/commentlist.template b/templates/admin/commentlist.template
index 8238f08..14f29b5 100755 (executable)
--- a/templates/admin/commentlist.template
+++ b/templates/admin/commentlist.template
@@ -16,18 +16,11 @@
    
   <table border="0" cellpadding="2" cellspacing="1">
     <tr class="pink">
-      <td>
-        search in field
-      </td>
-      <td>
-        for value
-      </td>
-      <td>
-        published
-      </td>
-      <td>
-        order
-      </td>
+      <td>${lang("commentsearch.field")}</td>
+      <td>${lang("commentsearch.value")}</td>
+      <td>${lang("commentsearch.publishedstate")}</td>
+      <td>${lang("commentsearch.status")}</td>
+      <td>${lang("commentsearch.order")}</td>
     </tr>
     <tr>
       <td>
@@ -36,27 +29,35 @@
 
       <td>
              <select name="searchfield">
-            <option value="title"<if searchfield=="title"> selected</if>>${lang("comment.title")}</option>
-            <option value="creator"<if searchfield=="creator"> selected</if>>${lang("comment.creator")}</option>
-            <option value="description"<if searchfield=="description"> selected</if>>${lang("comment.text")}</option>
+            <option value="title"<if searchfield=="title"> selected</if>>${lang("commentsearch.field.title")}</option>
+            <option value="creator"<if searchfield=="creator"> selected</if>>${lang("commentsearch.field.creator")}</option>
+            <option value="description"<if searchfield=="description"> selected</if>>${lang("commentsearch.field.description")}</option>
           </select>
       </td>
       <td>
           <select name="searchispublished">
             <option value="">--</option>
-            <option value="0" <if searchispublished=="0"> selected</if>>${lang("commentlist.hidden")}</option>
-            <option value="1" <if searchispublished=="1"> selected</if>>${lang("commentlist.published")}</option>
+            <option value="0" <if searchispublished=="0"> selected</if>>${lang("commentsearch.publishedstate.hidden")}</option>
+            <option value="1" <if searchispublished=="1"> selected</if>>${lang("commentsearch.publishedstate.published")}</option>
+          </select>
+      </td>
+      <td>
+          <select name="searchstatus">
+            <option value="">--</option>
+            <list commentstatuses as cs>
+              <option value="${cs.id}" <if searchstatus==cs.id> selected</if>>${lang("commentstatus." + cs.name)}</option>
+            </list>
           </select>
       </td>
       <td>
           <select name="searchorder">
-            <option value="datedesc" <if searchorder=="datedesc"> selected</if>>${lang("commentlist.order.datedesc")}</option>
-            <option value="dateasc" <if searchorder=="dateasc"> selected</if>>${lang("commentlist.order.dateasc")}</option>
-            <option value="articletitle" <if searchorder=="articletitle"> selected</if>>${lang("commentlist.order.articletitle")}</option>
+            <option value="datedesc" <if searchorder=="datedesc"> selected</if>>${lang("commentsearch.order.datedesc")}</option>
+            <option value="dateasc" <if searchorder=="dateasc"> selected</if>>${lang("commentsearch.order.dateasc")}</option>
+            <option value="articletitle" <if searchorder=="articletitle"> selected</if>>${lang("commentsearch.order.articletitle")}</option>
           </select>
       </td>
       <td>
-          <input type="submit" name="search" value="${lang("commentlist.search")}">
+          <input class="majorbutton" type="submit" name="search" value="${lang("commentsearch.searchbutton")}">
       </td>
     </tr>
   </table>
@@ -85,34 +86,32 @@
           </if>
         </td></tr>
       </if>
-      <tr class="pink">
-       <td><p class="head">${lang("comment.date")}</p></td>
-               <td><p class="head">${lang("comment.title")}/ ${lang("comment.creator")}<br>
-                                       ${lang("comment.text")}</p></td>
+      <tr class="darkgrey">
+        <td><p class="witesmall">${lang("comment.date")}</p></td>
+        <td><p class="witesmall">${lang("comment.title")}/ ${lang("comment.creator")}<br>
+            ${lang("comment.text")}</p></td>
+        <td>&nbsp;</td>
       </tr>
     
         <list comments as entry>
           <tr <if grey=="1"><assign grey="0">class="list1"<else><assign grey="1">class="list2"</if>>
         
-                       <td>${entry.creationdate.formatted["dd.mm.yyyy"]}<br>
+                       <td>${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
                  <if entry.is_published=="0"><span class="spezialtext">hidden</span><else>-</if>
                        </td>
         
             <td>
-              <span class="small">
                 ${lang("comment.article")}
                 <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
                   ${utility.encodeHTML(entry.to_content.title)}
                 </a>
                 <br>
                   <a name="${entry.id}"></a>
-                  <span class="x-small">
                     <if entry.status>${lang("commentstatus." + entry.status.name)} - </if> 
-                  </span>
                     <b>${entry.title}</b><br>
       
                 <if entry.creator>${lang("comment.creator")}: ${entry.creator}<br></if>
-                <span class="small">${entry.description}</span>
+                <span>${utility.encodeHTML(entry.description)}</span>
                 <if entry.main_url><br>URL: ${entry.main_url}</if>
                 <br>
                 <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
@@ -135,20 +134,19 @@
                            </if>
                 <if entry.operations>|</if>
                 <a href="${config.actionRoot}?module=Comment&do=edit&id=${entry.id}">${lang("edit")}</a>                
-                         </span>
             </td>
       
             <td>
               <span class="text">&nbsp;
-                <a href="${config.actionRoot}?module=Comment&do=delete&id=${entry.id}">${lang("delete")}</a>
+                <a href="${config.actionRoot}?module=Comment&do=delete&id=${entry.id}&searchtext=${utility.encodeHTML(searchtext)}&searchfield=${utility.encodeHTML(searchfield)}&searchispublished=${searchispublished}&searchorder=${searchorder}&offset=${offset}">${lang("delete")}</a>
               </span>
             </td>
         
                </tr>
         </list>
       
-        <tr class="pink">
-          <td colspan="3">${count} ${lang("records")} / ${lang("show_from_to", from, to)}</span></td>
+        <tr class="darkgrey">
+          <td colspan="3"><span class="witesmall">${count} ${lang("records")} / ${lang("show_from_to", from, to)}</span></td>
         </tr>
         <tr><td>
           <if prevurl>