X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=templates%2Fadmin%2Fcontentlist.template;h=5b5aec6aafcbfec4964bc185ac2481125b767ae5;hb=fa665e26819bb91be0c3685cfd80793d95c05ed4;hp=26482dd75aa6998f2a5f0f3fec3f50c6b3907299;hpb=386e5efa787066632dabe1965c7272146ac72b63;p=mir.git

diff --git a/templates/admin/contentlist.template b/templates/admin/contentlist.template
index 26482dd7..5b5aec6a 100755
--- a/templates/admin/contentlist.template
+++ b/templates/admin/contentlist.template
@@ -2,7 +2,7 @@
   if selectarticleurl is set, this list is used to select an article
 </comment>
 
-<if selectarticleurl!="">
+<if selectarticleurl && selectarticleurl!="">
   <assign showsearch="1">
   <assign showactions="0">
 <else>
@@ -24,7 +24,7 @@
   <call ContentSearch ("layouted")>
 </if>
 
-<if articles>
+<if entities>
 
 <if showactions=="1">
   <if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
@@ -33,12 +33,12 @@
       <input type="hidden" name="do" value="articleoperationbatch">
       <input type="hidden" name="returnurl" value="${utility.encodeHTML(thisurl)}">
       <p class="box">
-        <input type="submit" name="save" value="${lang("save")}"> &nbsp; (${lang("commentlist.activate")})
+        <input type="submit" class="majorbutton" name="save" value="${lang("save")}"> &nbsp; (${lang("commentlist.activate")})
       </p>
   </if>    
 </if>
 
-<call PrevNext ("right")>
+<call showPrevNextLinks(prevurl, nexturl, "right")>
 
 <table border="0" width="100%" cellspacing="3" cellpadding="2">
   <tr>
@@ -50,8 +50,8 @@
       </span>
     </td>
     <td class="table-head" valign="top">
-      ${lang("content.type")} - ${lang("content.title")} <br>
-      ${lang("content.creator")}
+      ${lang("content.type")} - ${lang("content.title")} (id # )<br>
+      ${lang("content.creator")} (${lang("content.language")})
     </td>
     <td class="table-head" valign="top">
       ${lang("content.comment")}
@@ -60,18 +60,17 @@
   </tr>
 
 <assign grey="0">
-
-  <list articles as entry>
+  <list entities as entry>
     <tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<assign grey="1"></if>>
       <td class="x-small">
-          ${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
-          ${entry.changedate.formatted["dd.MM.yyyy HH:mm"]}<br>
+          ${entry.creationdate.format(config["Mir.DefaultDateTimeFormat"])}<br>
+          ${entry.changedate.format(config["Mir.DefaultDateTimeFormat"])}<br>
           <if entry.is_published!="0">Pub.<else>-</if> <if entry.is_html!="0">HTML<else>-</if>
       </td>
       <td>
-        <b>${entry.title}</b><br>
-        ${lang("by")}: ${entry.creator}<br>
-        (${lang("articletypes." + entry.article_type.name)}) 
+        ${lang("articletypes." + entry.article_type.name)}
+	<if entry.title><b>${utility.prettyEncodeHTML(entry.title)}</b><else><br>${utility.prettyEncodeHTML(entry.description)}<br></if> (${entry.id})<br>
+        ${lang("by")} <i>${utility.prettyEncodeHTML(entry.creator)}</i> (${entry.language.name})<br>
         <if showactions=="1">
           <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
             <list entry.operations as op>
@@ -84,15 +83,19 @@
           </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}">${lang("content.operation."+op)}</option>
-              </list>
-            </select>
+            <if entry.operations>
+              <br>
+              <select name="operation">
+                <option value="" selected>&nbsp;</option>
+                <list entry.operations as op>
+                  <option value="${entry.id};${op}">${lang("content.operation."+op)}</option>
+                </list>
+              </select>
+            </if>
           </if>
           <if entry.operations> | </if>
           <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("edit")}</a> |
+	  <comment> <a href="${entry.publicurl}">${lang("preview")}</a> |</comment>
           <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">
@@ -100,12 +103,12 @@
         </if>
       </td>
       <td width="25%"  <if grey=="1">class="listrow3"<else>class="listrow4"</if> valign="top">
-        <span class="small">${entry.comment}&nbsp;</span>
+        <span class="small">${utility.prettyEncodeHTML(entry.comment)}&nbsp;</span>
       </td>
       <td valign="top" class="listcommand">
         <if showactions=="1">
           <if config["Mir.Localizer.Admin.AllowDeleteArticle"]=="1">
-            <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&where=${utility.encodeURI(where)}&order=${utility.encodeURI(order)}&offset=${utility.encodeURI(offset)}">[${lang("delete")}]</a>
+            <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&okurl=${utility.encodeURI(thisurl)}&cancelurl=${utility.encodeURI(thisurl)}">[${lang("delete")}]</a>
           </if>
         </if>
       </td>
@@ -127,10 +130,7 @@
   </if>  
 </if>
 
-
-<call PrevNext ("right")>
-
-
+<call showPrevNextLinks(prevurl, nexturl, "right")>
 
 <else>
 <p align="center" class="box">${lang("no_matches_found")}</p>