X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=templates%2Fadmin%2Fcontentlist.template;h=45d7601f03941f40e7261aa99d174c631df245bd;hb=09a4328d6efdf8bca4c4fac97773bc69186aefd0;hp=e58001059c2c7066c5eb1ba01612857dfe01c34d;hpb=8297c34c7a424107fd7d1980b6e8e5a3ae26494b;p=mir.git

diff --git a/templates/admin/contentlist.template b/templates/admin/contentlist.template
index e5800105..45d7601f 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,7 +33,7 @@
       <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>
@@ -51,7 +51,7 @@
     </td>
     <td class="table-head" valign="top">
       ${lang("content.type")} - ${lang("content.title")} (id # )<br>
-      ${lang("content.creator")} 
+      ${lang("content.creator")} (${lang("content.language")})
     </td>
     <td class="table-head" valign="top">
       ${lang("content.comment")}
@@ -60,7 +60,7 @@
   </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.format(config["Mir.DefaultDateTimeFormat"])}<br>
@@ -68,8 +68,9 @@
           <if entry.is_published!="0">Pub.<else>-</if> <if entry.is_html!="0">HTML<else>-</if>
       </td>
       <td>
-        ${lang("articletypes." + entry.article_type.name)} <b>${entry.title}</b> (${entry.id})<br>
-        ${lang("by")} <i>${utility.encodeHTML(entry.creator)}</i><br>
+        ${lang("articletypes." + entry.article_type.name)} <b>
+	<if entry.title>${utility.prettyEncodeHTML(entry.title)}<else>${utility.prettyEncodeHTML(entry.description)}</if></b> (${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>
@@ -94,7 +95,7 @@
           </if>
           <if entry.operations> | </if>
           <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("edit")}</a> |
-          <a href="${entry.publicurl}">${lang("preview")}</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">
@@ -102,7 +103,7 @@
         </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">