introduced some customization for the content list in admin

diff --git a/bundles/admin_ay.properties b/bundles/admin_ay.properties
index 25f2312..3939b6f 100755 (executable)
--- a/bundles/admin_ay.properties
+++ b/bundles/admin_ay.properties
@@ -213,7 +213,8 @@ start.content.startspecial=especiales-p
 start.content.not_published=artículos aun sin publicar\r
 start.content.with_media=con recursos mediáticos\r
 start.content.last_changes=últimos cambios\r
-start.content.with_comments=con comentarios de propósito interno\r
+start.content.with_comments=con comentarios de propósito interno
+start.content.all=todos\r
 start.content.search=buscar\r
 start.generate.title=GENERAR MANUALMENTE\r
 start.generate.all.title=todas las areas\r

diff --git a/bundles/admin_de.properties b/bundles/admin_de.properties
index 54b39b1..3a889da 100755 (executable)
--- a/bundles/admin_de.properties
+++ b/bundles/admin_de.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: deutsch / german
-# $Id: admin_de.properties,v 1.16 2002/11/28 07:28:24 mh Exp $
+# $Id: admin_de.properties,v 1.17 2002/11/30 20:21:00 zapata Exp $
 
 # general
 yes=ja
@@ -225,7 +225,10 @@ start.content.hidden=versteckte Artikel
 start.content.with_media=mit medien
 start.content.last_changes=letzte änderungen
 start.content.with_comments=mit internen kommentaren
+start.content.all=alle
 start.content.search=Suche
+
+
 start.generate.title=MANUELL GENERIEREN
 start.generate.all.title=Alle Bereiche
 start.generate.all.new=alles neue (standard, update auf www > 5min.)

diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index 61fcafb..89f0bf8 100755 (executable)
--- a/bundles/admin_en.properties
+++ b/bundles/admin_en.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: english
-# $Id: admin_en.properties,v 1.24 2002/11/28 07:28:24 mh Exp $
+# $Id: admin_en.properties,v 1.25 2002/11/30 20:21:00 zapata Exp $
 
 # general
 yes=yes
@@ -220,6 +220,7 @@ start.breaking.new=add breaking news
 start.content.title=ARTICLES
 start.content.new=new article
 start.show=show
+
 start.content.newswire=newswire
 start.content.feature=feature
 start.content.topicspecial=topic-specials
@@ -229,8 +230,10 @@ start.content.not_published=not (yet) published articles
 start.content.with_media=with media
 start.content.last_changes=latest changes
 start.content.with_comments=with internal comments
+start.content.all=all articles
 start.content.search=search
 
+
 start.producers.title=GENERATE MANUALLY
 start.producers.produceAllNew=Generate all new
 start.producers.advanced=Advanced page (use with care!)

diff --git a/bundles/admin_es.properties b/bundles/admin_es.properties
index 14ff567..f934595 100755 (executable)
--- a/bundles/admin_es.properties
+++ b/bundles/admin_es.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: espanol / spanish
-# $Id: admin_es.properties,v 1.8 2002/11/28 07:28:24 mh Exp $
+# $Id: admin_es.properties,v 1.9 2002/11/30 20:21:00 zapata Exp $
 
 # general
 yes=sí
@@ -218,7 +218,10 @@ start.content.not_published=art
 start.content.with_media=con recursos mediáticos
 start.content.last_changes=últimos cambios
 start.content.with_comments=con comentarios de propósito interno
+start.content.all=todos
 start.content.search=buscar
+
+
 start.producers.title=GENERAR MANUALMENTE
 start.producers.produceAllNew=generar todo nuevo 
 start.producers.advanced=Advanced page (use with care!)             # needs to be translated

diff --git a/bundles/admin_gn.properties b/bundles/admin_gn.properties
index 26b36f3..00a213c 100755 (executable)
--- a/bundles/admin_gn.properties
+++ b/bundles/admin_gn.properties
@@ -215,6 +215,7 @@ start.content.not_published=art
 start.content.with_media=con recursos mediáticos
 start.content.last_changes=últimos cambios
 start.content.with_comments=con comentarios de propósito interno
+start.content.all=todos
 start.content.search=buscar
 start.generate.title=GENERAR MANUALMENTE
 start.generate.all.title=todas las areas

diff --git a/bundles/admin_qu.properties b/bundles/admin_qu.properties
index fb3a9d6..496f8b8 100755 (executable)
--- a/bundles/admin_qu.properties
+++ b/bundles/admin_qu.properties
@@ -215,6 +215,7 @@ start.content.not_published=art
 start.content.with_media=con recursos mediáticos
 start.content.last_changes=últimos cambios
 start.content.with_comments=con comentarios de propósito interno
+start.content.all=todos
 start.content.search=buscar
 start.generate.title=GENERAR MANUALMENTE
 start.generate.all.title=todas las areas

diff --git a/bundles/admin_tr.properties b/bundles/admin_tr.properties
index 3c2b8b9..b3e73c7 100755 (executable)
Binary files a/bundles/admin_tr.properties and b/bundles/admin_tr.properties differ

diff --git a/templates/admin/contentlist.template b/templates/admin/contentlist.template
index 1b2e13e..6e0998d 100755 (executable)
--- a/templates/admin/contentlist.template
+++ b/templates/admin/contentlist.template
@@ -6,8 +6,8 @@
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
 
-<include "templates/admin/head.template">
-<if data.contentlist>
+<include "head.template">
+<if articles>
        <table border="0" width="100%" cellspacing="0" cellpadding="2">
          <tr class="darkgrey">
            <td><span class="witesmall">
@@ -15,64 +15,72 @@
                        ${lang("content.modificationdate")}<br>
                        ${lang("content.status")}</span></td>
            <td><span class="witesmall">
-                       ${lang("content.type")} / ${lang("content.location")}: ${lang("content.title")}<br>
-                       ${lang("content.creator")}</span></td>
-           <td ><span class="witesmall">${lang("content.topic")}<br>${lang("content.feature")}</span></td>
+        ${lang("content.type")} - ${lang("content.title")} <br>
+                         ${lang("content.creator")}</span></td>
            <td width="25%"><span class="witesmall">
                        ${lang("content.comment")}</span></td>
                <td class="darkgrey">&nbsp;</td>
          </tr>
+         <assign grey="0">
 
-       <list data.contentlist as entry>
+       <list articles as entry>
          <tr <if grey=="1"><assign grey="0">class="list1"<else>class="list2"<assign grey="1"></if>>
-           <td><span class="x-small">
-                       ${entry.webdb_create_formatted}<br>
-                       <if entry.webdb_lastchange>${entry.webdb_lastchange_formatted}<else>-</if><br>
-                       <if entry.is_published!="0">F<else>-</if>
-                       <if entry.is_html!="0">H<else>-</if>
-                       </span></td>
-           <td><span class="small"><b>
-                       <span class="x-small">${articletypeHash[entry.to_article_type]["name"]} -- </span><if entry.place>${entry.place}: </if>${entry.title}</b><br>
-                       ${entry.creator}&nbsp;
-                       <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&where=${data.where_encoded}&order=${data.order_encoded}&offset=${data.offset}">${lang("edit")}</a>
-                       <if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${config.actionRoot}?module=Content&do=newswire&id=${entry.id}&where=${data.where_encoded}&order=${data.order_encoded}&offset=${data.offset}">newswire</a></if></span></td>
-           <td><span class="small">
-                       <if entry.thema_id!="0">${themenHashData[entry.thema_id]["name"]}</if>&nbsp;<br>
-                       <if entry.to_feature!="0">${schwerpunktHashData[entry.to_feature]["title"]}</if>&nbsp;</span></td>
+           <td>
+             <span class="x-small">
+               ${entry.webdb_create_formatted}<br>
+                           <if entry.webdb_lastchange>${entry.webdb_lastchange_formatted}<else>-</if><br>
+                           <if entry.is_published!="0">F<else>-</if><if entry.is_html!="0">H<else>-</if>
+                         </span>
+                       </td>
+           <td>
+             <span class="small">
+               <b>
+               <span class="x-small">
+            ${entry.article_type.name} -
+                           </span>
+               ${entry.title}
+                           </b><br>
+                           ${entry.creator}&nbsp;
+                           <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("edit")}</a>
+                           |
+                           <list entry.operations as op>
+                             [<a href="${config.actionRoot}?module=Localizer&do=articleoperation&operation=${op}&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${op}</a>]
+                           </list>
+<comment>                          
+                           <if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${config.actionRoot}?module=Content&do=newswire&id=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">newswire</a></if>
+</comment>                         
+
+                         </span>
+                       </td>
            <td width="20%" <if grey=="1">class="list3"<else>class="list4"</if> valign="top"><span class="x-small">
-                       ${entry.comment}&nbsp;</span></td>
-           <td class0"litegrey"><span class="text">
-             <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&where=${data.where_encoded}&order=${data.order_encoded}&offset=${data.offset}">${lang("delete")}</a>
-             </span></td>
-       </tr>
+
+      ${entry.comment}&nbsp;</span></td>
+      <td class0"litegrey">
+        <span class="text">
+          <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>
+             </span>
+      </td>
+    </tr>
        </list>
        <tr class="darkgrey">
-           <td colspan="4"><span class="witesmall">${data.count} ${lang("records")}
-      / ${lang("show_from_to", data.from, data.to)}</span></td></tr>
+           <td colspan="4"><span class="witesmall">${count} ${lang("records")}
+      / ${lang("show_from_to", from, to)}</span></td></tr>
        </table>
-
-      <P>
-<if data.prev || data.next>
- <form method="post" action="${config.actionRoot}">
- <input type="hidden" name="module" value="Content">
- <input type="hidden" name="do" value="listop">
- <input type="hidden" name="where" value="${data.where}">
- <input type="hidden" name="order" value="${data.order}">
-<if data.prev>
- <input type="hidden" name="prevoffset" value="${data.prev}">
- <input type="submit" name="prev" value="${lang("list.previous")}">
-</if>
-<if data.next>
- <input type="hidden" name="nextoffset" value="${data.next}">
- <input type="submit" name="next" value="${lang("list.next")}">
-</if>
- </form>
-</if>
+  <P>
+  
+  <if prevurl || nexturl>      
+    <if prevurl>
+      <a href="${config.actionRoot}?${prevurl}">${lang("list.previous")}</a>
+    </if>
+    <if nexturl>
+      <a href="${config.actionRoot}?${nexturl}">${lang("list.next")}</a>
+    </if>
+  </if>
 
 <else>
   <P align="center">${lang("no_matches_found")}</p>
 </if>
 
-<include "templates/admin/foot.template">
+<include "foot.template">
 </body>
 </html>

diff --git a/templates/admin/start_admin.template b/templates/admin/start_admin.template
index 3d1baf0..0f22eb2 100755 (executable)
--- a/templates/admin/start_admin.template
+++ b/templates/admin/start_admin.template
@@ -53,18 +53,24 @@
       </list>
 
       <br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
+                       <a href="${config.actionRoot}?module=Content&do=list&where=&order=${utility.encodeURI("webdb_create desc")}">${lang("start.content.all")}</a><br>
+
+      <br>
            <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
-                       <a href="${config.actionRoot}?module=Content&do=list&where=nfrei" >${lang("start.content.not_published")}</a><br>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("is_published='f'")}&order=${utility.encodeURI("webdb_create desc")}" >${lang("start.content.not_published")}</a><br>
                        <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
-                       <a href="${config.actionRoot}?module=Content&do=list&where=media">${lang("start.content.with_media")}</a><br>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("id in (select content_id from content_x_media, media where media.id=media_id)")}&order=${utility.encodeURI("webdb_create desc")}">${lang("start.content.with_media")}</a><br>
                        <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
-                       <a href="${config.actionRoot}?module=Content&do=list&where=lastchange">${lang("start.content.last_changes")}</a><br>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=&order=${utility.encodeURI("webdb_lastchange desc")}">${lang("start.content.last_changes")}</a><br>
                        <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
-                       <a href="${config.actionRoot}?module=Content&do=list&where=comments">${lang("start.content.with_comments")}</a><br>
-                        <br>
-                        <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
-                        <a href="${config.actionRoot}?module=Hidden&do=list">${lang("start.content.hidden")}</a><br><br>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("not (comment is null or comment like '')")}&order=${utility.encodeURI("webdb_create desc")}">${lang("start.content.with_comments")}</a><br>
 
+      <br>
+      <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
+      <a href="${config.actionRoot}?module=Hidden&do=list">${lang("start.content.hidden")}</a>
+      <br>
+      <br>
       <span class="spezialtext"><b>
         ${lang("start.editfiles.title")}
       </b></span>
@@ -99,7 +105,6 @@
     <p>
       <a href="${config.actionRoot}?module=Producer&do=produceAllNew">${lang("start.producers.produceAllNew")}</a><br>
       <a href="${config.actionRoot}?module=Producer&do=showProducerQueueStatus">${lang("start.producers.advanced")}</a>
-
     </td>