preliminary support for translation + misc. fixes
authorzapata <zapata>
Thu, 20 Feb 2003 16:06:30 +0000 (16:06 +0000)
committerzapata <zapata>
Thu, 20 Feb 2003 16:06:30 +0000 (16:06 +0000)
bundles/admin_en.properties
etc/log4j.properties
templates/admin/content.template
templates/admin/contentlist.template
templates/admin/start_admin.template

index 632df3d..a9c32d4 100755 (executable)
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: english
-# $Id: admin_en.properties,v 1.33 2003/01/18 15:54:30 zapata Exp $
+# $Id: admin_en.properties,v 1.34 2003/02/20 16:06:30 zapata Exp $
 
 languagename=English
 
@@ -152,9 +152,17 @@ content.create_date=Date
 content.published=published
 content.comments=Comments
 
+content.family=Children & Parents
+content.children=Children
+content.viewchildren=view
+content.parent=Parent
+content.viewparent=view
+content.clearparent=de-select
+content.selectparent=select
 
 contentlist.htmltitle=Articles
-contentlist.comments=comments
+contentlist.comments=Comments
+contentlist.select=Select
 
 # language
 language.htmltitle=Language
index 712620f..32d6afb 100755 (executable)
@@ -1,14 +1,27 @@
 log4j.rootLogger= WARN, A1
 log4j.logger.Servlet= INFO, ServletA
+log4j.logger.Database= INFO, DatabaseA
+log4j.logger.Entity= INFO, EntityA
 log4j.logger.Media= INFO, MediaA
 log4j.logger.Producer= INFO, ProducerA
 log4j.logger.ServletModule= INFO, ServletModuleA
 log4j.logger.Module= INFO, ModuleA
+log4j.logger.Localizer= INFO, LocalizerA 
 
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=%d [%p] %c %x %m%n
 
+log4j.appender.DatabaseA=org.apache.log4j.RollingFileAppender
+log4j.appender.DatabaseA.File=${log.home}/database.log
+log4j.appender.DatabaseA.layout=org.apache.log4j.PatternLayout
+log4j.appender.DatabaseA.layout.ConversionPattern=%d [%p] %c %x %m%n
+
+log4j.appender.EntityA=org.apache.log4j.RollingFileAppender
+log4j.appender.EntityA.File=${log.home}/entity.log
+log4j.appender.EntityA.layout=org.apache.log4j.PatternLayout
+log4j.appender.EntityA.layout.ConversionPattern=%d [%p] %c %x %m%n
+
 log4j.appender.ServletA=org.apache.log4j.RollingFileAppender
 log4j.appender.ServletA.File=${log.home}/servlet.log
 log4j.appender.ServletA.layout=org.apache.log4j.PatternLayout
@@ -34,4 +47,8 @@ log4j.appender.ModuleA.File=${log.home}/module.log
 log4j.appender.ModuleA.layout=org.apache.log4j.PatternLayout
 log4j.appender.ModuleA.layout.ConversionPattern=%d [%p] %c %x %m%n
 
+log4j.appender.LocalizerA=org.apache.log4j.RollingFileAppender
+log4j.appender.LocalizerA.File=${log.home}/localizer.log
+log4j.appender.LocalizerA.layout=org.apache.log4j.PatternLayout
+log4j.appender.LocalizerA.layout.ConversionPattern=%d [%p] %c %x %m%n
 
index a242e7a..84cf9df 100755 (executable)
@@ -8,12 +8,13 @@
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
 
-<include "templates/admin/head.template">
+<include "head.template">
+
 <form accept-charset="${lang("htmlcharset")}" method="post" action="${config.actionRoot}">
   <input type="hidden" name="charset" value="${lang("htmlcharset")}">
   <input type="hidden" name="module" value="Content">
-  <input type="hidden" name="id" value="${utility.encodeHTML(data.id)}">
-  <if data.new>
+  <input type="hidden" name="id" value="${utility.encodeHTML(article.id)}">
+  <if new=="1">
     <input type="hidden" name="do" value="insert">
   <else>
     <input type="hidden" name="do" value="update">
     <tr>
       <td colspan="1">&nbsp</td>
       <td class="minorcommand" colspan="2">
-        <if !data.new>
-          <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${data.id}">${lang("content.comments")}</a>
+        <if new=="0">
+          <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${article.id}">${lang("content.comments")}</a>
         </if>
       </td>
       <td colspan="2" align="right" valign="top">
         ${lang("content.published")} <a href="${config.docRoot}/help/content.html"><img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>:
-        <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
-        <if data.new>
+        <input type="checkbox" name="is_published" value="1"<if article.is_published!="0" && article.is_published!=""> checked</if>>
+        <if new=="1">
           <input type="submit" name="save" value="${lang("insert")}">
         <else>
           <input type="submit" name="save" value="${lang("save")}">
@@ -43,7 +44,7 @@
           ${lang("content.import_date")}:
       </td>
       <td>
-          ${data.date}
+          ${article.date}
       </td>
       <td colspan="3">&nbsp;</td>
     </tr>
@@ -52,7 +53,7 @@
          ${lang("content.lastchange_date")}:
       </td>
       <td>
-        ${utility.encodeHTML(data.webdb_lastchange)}<br>
+        ${utility.encodeHTML(article.webdb_lastchange)}<br>
       </td>
       <td colspan="3">&nbsp;</td>
     </tr>
@@ -62,7 +63,7 @@
         ${lang("content.create_date")}:
       </td>
       <td colspan="3">
-        ${utility.encodeHTML(data.webdb_create)}<br><br>${lang("edit")} (yyyy-mm-dd [HH:mm]):
+        ${utility.encodeHTML(article.webdb_create)}<br><br>${lang("edit")} (yyyy-mm-dd [HH:mm]):
         <input type="text" size="10" maxlength="16" name="webdb_create" value=""><br>
       </td>
       <td colspan="3">&nbsp;</td>
           <tr>
             <td>
               <select name="to_article_type">
-                <list extra.articletypePopupData as a>
-                  <option value="${a.key}" <if (a.key == data.to_article_type)>selected</if>>${lang("articletypes."+a.value)}</option>
+                <list articleTypes as a>
+                  <option value="${a.id}" <if (a.id == article.to_article_type)>selected</if>>${lang("articletypes."+a.name)}</option>
                 </list>
               </select>
             </td>
             <td rowspan="2">
               <select name="to_topic" size="5" multiple>
-                <list extra.themenPopupData as t>
-                  <option value="${t.key}" <list data.to_topics as to><if (t.key == to["id"])>selected</if></list>>${t.value}</option>
+                <list topics as t>
+                  <option value="${t.id}" <list article.to_topics as to><if (t.id == to["id"])>selected</if></list>>${t.title}</option>
                 </list>
               </select>
             </td>
@@ -96,8 +97,8 @@
           <tr>
             <td>
               <select name="to_language">
-                <list extra.languagePopupData as l>
-                  <option value="${l.key}" <if (l.key == data.to_language)>selected</if>>${l.value}</option>
+                <list languages as l>
+                  <option value="${l.id}" <if (l.id == article.to_language)>selected</if>>${l.name}</option>
                 </list>
               </select>
             <td>
       ${lang("content.title")}:&nbsp;
     </td>
     <td colspan="4">
-      <input type="text" size="40" name="title" value="${utility.encodeHTML(data.title)}"><br>
+      <input type="text" size="40" name="title" value="${utility.encodeHTML(article.title)}"><br>
     </tr>
     <tr>
       <td align="right" valign="top" class="editfieldname">
           <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
       </td>
       <td colspan="4">
-        <input type="text" size="20" name="subtitle" value="${utility.encodeHTML(data.subtitle)}">
-        <input type="text" size="20" name="edittitle" value="${utility.encodeHTML(data.edittitle)}">
+        <input type="text" size="20" name="subtitle" value="${utility.encodeHTML(article.subtitle)}">
+        <input type="text" size="20" name="edittitle" value="${utility.encodeHTML(article.edittitle)}">
       </td>
     </tr>
     <tr>
         <a href="${config.docRoot}/help/content.html"><img src="${config.docRoot}/img/help.gif" border="0" align="middle"></a>
       </td>
       <td colspan="4" >
-        <input type="text" size="40" name="source" value="${utility.encodeHTML(data.source)}">
+        <input type="text" size="40" name="source" value="${utility.encodeHTML(article.source)}">
       </td>
     </tr>
     <tr>
           <img src="${config.docRoot}/img/help.gif" border="0" align="middle"></a>
       </td>
       <td colspan="4">
-        <input type="text" size="40" name="creator" value="${utility.encodeHTML(data.creator)}"><br>
+        <input type="text" size="40" name="creator" value="${utility.encodeHTML(article.creator)}"><br>
       </td>
     </tr>
   
           <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
       </td>
       <td colspan="4" >
-        <input type="text" size="20" name="creator_email" value="${utility.encodeHTML(data.creator_email)}">
-        <input type="text" size="20" name="creator_main_url" value="${utility.encodeHTML(data.creator_main_url)}">
+        <input type="text" size="20" name="creator_email" value="${utility.encodeHTML(article.creator_email)}">
+        <input type="text" size="20" name="creator_main_url" value="${utility.encodeHTML(article.creator_main_url)}">
       </td>
     </tr>
     <tr>
           <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
       </td>
       <td colspan="4" >
-        <input type="text" size="20" name="creator_address" value="${utility.encodeHTML(data.creator_address)}">
-        <input type="text" size="20" name="creator_phone" value="${utility.encodeHTML(data.creator_phone)}">
+        <input type="text" size="20" name="creator_address" value="${utility.encodeHTML(article.creator_address)}">
+        <input type="text" size="20" name="creator_phone" value="${utility.encodeHTML(article.creator_phone)}">
       </td>
     </tr>
     <tr>
           <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
       </td>
       <td colspan="4">
-        <textarea cols="70" rows="15" name="description" wrap=virtual>${data.description}</textarea>
+        <textarea cols="70" rows="15" name="description" wrap=virtual>${utility.encodeHTML(article.description)}</textarea>
       </td>
     </tr>
   
         <a href="${config.docRoot}/help/content.html"> <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
         <br>
         ${lang("content.html")}
-        <input type="checkbox" name="is_html" value="1"<if data.is_html=="1"> checked</if>>&nbsp;
+        <input type="checkbox" name="is_html" value="1"<if article.is_html=="1"> checked</if>>&nbsp;
         <a href="${config.docRoot}/help/content.html">
           <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle">
         </a>
       </td>
       <td colspan="4">
-        <textarea cols="70" rows="20" name="content_data" wrap=virtual>${data.content_data}</textarea>
+        <textarea cols="70" rows="20" name="content_data" wrap=virtual>${article.content_data}</textarea>
       </td>
     </tr>
     <tr>
           <i>${lang("content.internal")}</i>
       </td>
       <td colspan="4">
-        <textarea cols="70" rows="6" name="comment" wrap=virtual>${utility.encodeHTML(data.comment)}</textarea>
+        <textarea cols="70" rows="6" name="comment" wrap=virtual>${utility.encodeHTML(article.comment)}</textarea>
       </td>
     </tr>
     <tr>
       <td>&nbsp;</td>
       <td>&nbsp;</td>
       <td colspan="2" align="right" valign="top">
-        <if data.new>
+        <if new=="1">
           <input type="submit" name="save" value="${lang("insert")}">
         <else>
           <input type="submit" name="save" value="${lang("save")}">
         </if>
       </td>
     </tr>
+<if new=="0">    
+    <tr>
+      <td class="pink" colspan="5">
+        ${lang("content.family")}
+      </td>
+    </tr>
+    <tr>
+      <td align=right valign=top class="editfieldname">
+        ${lang("content.parent")}:
+      </td>
+      <td colspan="4" align="left" valign="top">
+  <if article.parent>
+        <b>${utility.encodeHTML(article.parent.title)}</b>
+        <a href="${config.actionRoot}?module=Content&do=edit&id=${article.parent.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.viewparent")}</a> |
+        <a href="${config.actionRoot}?module=Content&do=clearparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.clearparent")}</a> |
+  </if>    
+        <a href="${config.actionRoot}?module=Content&do=selectparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.selectparent")}</a>
+      </td>
+    </tr>
+    <tr>
+      <td align=right valign=top class="editfieldname">
+        ${lang("content.children")}:
+      </td>
+      <td colspan="4" align="left" valign="top">
+        <a href="${config.actionRoot}?module=Content&do=listchildren&article_id=${article.id}">${lang("content.viewchildren")}</a>
+      </td>
+    </tr>
+
     <tr>
       <td class="pink" colspan="5">
         ${lang("content.attachments")}
       </td>
     </tr>
 
-  <!-- image stuff -->
-  <list data.to_media_images as m>
-<tr>
-  <td align=right valign=top class="editfieldname">
-      ${lang("content.images")}:
-  </td>
-  <td colspan="4" align="left" valign="top">
-    <a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=getIcon&id=${m["id"]}" alt="edit" border="0"></a>
-      <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
-  </td>
-</tr>
-</list>
-<tr>
-  <td align=right valign=top class="editfieldname">
-      ${lang("content.media")}:
-  </td>
-  <td colspan="4" align="left" valign="top">
-      <a href="${config.actionRoot}?module=Images&do=list&cid=${data.id}">${lang("content.addimage")}</a>
-  </td>
-</tr>
-<list data.to_media_audio as m>
-<tr>
-  <td align=right valign=top class="editfieldname">
-    ${lang("content.audio")}:
-  </td>
-  <td colspan="4" align="left" valign="top">
-    <a href="${config.actionRoot}?module=Audio&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
-      <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
-  </td>
-</tr>
-</list>
-<tr>
-  <td align=right valign=top class="editfieldname">
-    ${lang("content.media")}:
-  </td>
-  <td colspan="4" align="left" valign="top">
-      <a href="${config.actionRoot}?module=Audio&do=list&cid=${data.id}">${lang("content.addaudio")}</a>
-  </td>
-</tr>
-<list data.to_media_video as m>
-<tr>
-  <td align=right valign=top class="editfieldname">
-      ${lang("content.video")}:
-  </td>
-  <td colspan="4" align="left" valign="top">
-    <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
-      <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
-  </td>
-</tr>
-</list>
-<tr>
-  <td align=right valign=top class="editfieldname">
-      ${lang("content.media")}:
-  </td>
-  <td colspan="4" align="left" valign="top">
-      <a href="${config.actionRoot}?module=Video&do=list&cid=${data.id}">${lang("content.addvideo")}</a>
-  </td>
-</tr>
-          <list data.to_media_other as m>
+          <list article.to_media_images as m>
+            <tr>
+              <td align=right valign=top class="editfieldname">
+                  ${lang("content.images")}:
+              </td>
+              <td colspan="4" align="left" valign="top">
+                <a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=getIcon&id=${m["id"]}" alt="edit" border="0"></a>
+                  <a href="${config.actionRoot}?module=Content&do=dettach&cid=${article.id}&mid=${m["id"]}">${lang("delete")}</a>
+              </td>
+            </tr>
+          </list>
+          <tr>
+            <td align=right valign=top class="editfieldname">
+                ${lang("content.images")}:
+            </td>
+            <td colspan="4" align="left" valign="top">
+                <a href="${config.actionRoot}?module=Images&do=list&cid=${article.id}">${lang("content.addimage")}</a>
+            </td>
+          </tr>
+
+          <list article.to_media_audio as m>
+            <tr>
+              <td align=right valign=top class="editfieldname">
+                ${lang("content.audio")}:
+              </td>
+              <td colspan="4" align="left" valign="top">
+                <a href="${config.actionRoot}?module=Audio&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+                  <a href="${config.actionRoot}?module=Content&do=dettach&cid=${article.id}&mid=${m["id"]}">${lang("delete")}</a>
+              </td>
+            </tr>
+          </list>
+          <tr>
+            <td align=right valign=top class="editfieldname">
+              ${lang("content.audio")}:
+            </td>
+            <td colspan="4" align="left" valign="top">
+                <a href="${config.actionRoot}?module=Audio&do=list&cid=${article.id}">${lang("content.addaudio")}</a>
+            </td>
+          </tr>
+
+          <list article.to_media_video as m>
+            <tr>
+              <td align=right valign=top class="editfieldname">
+                  ${lang("content.video")}:
+              </td>
+              <td colspan="4" align="left" valign="top">
+                <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+                  <a href="${config.actionRoot}?module=Content&do=dettach&cid=${article.id}&mid=${m["id"]}">${lang("delete")}</a>
+              </td>
+            </tr>
+          </list>
+          <tr>
+            <td align=right valign=top class="editfieldname">
+                ${lang("content.video")}:
+            </td>
+            <td colspan="4" align="left" valign="top">
+                <a href="${config.actionRoot}?module=Video&do=list&cid=${article.id}">${lang("content.addvideo")}</a>
+            </td>
+          </tr>
+          <list article.to_media_other as m>
             <tr>
               <td align=right valign=top class="editfieldname">
                   ${lang("content.other")}:
               </td>
               <td colspan="4" align="left" valign="top">
                 <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
-                <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
+                <a href="${config.actionRoot}?module=Content&do=dettach&cid=${article.id}&mid=${m["id"]}">${lang("delete")}</a>
               </td>
             </tr>
           </list>
           <tr>
             <td align=right valign=top class="editfieldname">
-                ${lang("content.media")}:
+                ${lang("content.other")}:
             </td>
             <td colspan="4" align="left" valign="top">
-              <a href="${config.actionRoot}?module=OtherMedia&do=list&cid=${data.id}">${lang("content.addother")}</a>
+              <a href="${config.actionRoot}?module=OtherMedia&do=list&cid=${article.id}">${lang("content.addother")}</a>
             </td>
           </tr>
+          
+</if>          
         </table>
       </form>
-    <include "templates/admin/foot.template">
+      
+    <include "foot.template">
   </body>
 </html>
index 9406084..bfae89c 100755 (executable)
-<html>
-<head>
-       <title>${config["Mir.Name"]} | ${lang("contentlist.htmltitle")}</title>
-        <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
-</head>
+<comment>
+  if selectarticleurl is set, this list is used to select an article
+</comment>
 
-<body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
+<if selectarticleurl!="">
+  <assign showsearch="1">
+  <assign showactions="0">
+<else>
+  <assign showactions="1">
+  <assign showsearch="0">
+</if>
 
-<include "head.template">
-<if articles>
+<html>
+  <head>
+    <title>${config["Mir.Name"]} | ${lang("contentlist.htmltitle")} </title>
+    <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  </head>
 
-<if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
-  <form method="post" action="${config.actionRoot}">
-    <input type="hidden" name="module" value="Localizer">
-    <input type="hidden" name="do" value="articleoperationbatch">
-    <input type="hidden" name="returnurl" value="${utility.encodeHTML(thisurl)}">
+  <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
 
-    <p>
-      <input class="majorbutton" type="submit" name="save" value="${lang("save")}">
-    </p>
-</if>    
+    <include "head.template">
+    
+    <if showsearch=="1">
+      <form method="get" action="${config.actionRoot}">
+        <input type="hidden" name="module" value="Content">
+        <input type="hidden" name="do" value="search">
+        <input type="hidden" name="selectarticleurl" value="${utility.encodeHTML(selectarticleurl)}">
+         
+        <table border="0" cellpadding="2" cellspacing="1">
+          <tr class="pink">
+            <td>for value</td>
+            <td>search in field</td>
+            <td>published</td>
+            <td>article type</td>
+            <td>order</td>
+          </tr>
+          <tr>
+            <td><input type="text"   size="10" maxlength="20" name="searchvalue" value="${searchvalue}"></td>
+            <td>
+                     <select name="searchfield">
+                  <option value="title"<if searchfield=="title"> selected</if>>${lang("content.title")}</option>
+                  <option value="creator"<if searchfield=="creator"> selected</if>>${lang("content.creator")}</option>
+                  <option value="contents"<if searchfield=="content"> selected</if>>${lang("content.contents")}</option>
+                </select>
+            </td>
+            <td>
+                <select name="searchispublished">
+                  <option value="">--</option>
+                  <option value="0" <if searchispublished=="0"> selected</if>>${lang("contentlist.hidden")}</option>
+                  <option value="1" <if searchispublished=="1"> selected</if>>${lang("contentlist.published")}</option>
+                </select>
+            </td>
+            <td>
+                <select name="searcharticletype">
+                  <option value="">--</option>
+                  <list articletypes as at>
+                    <option value="${at.id}" <if searcharticletype=="${at.id}"> selected</if>>${lang("articletype."+at.name)}</option>
+                  </list>
+                </select>
+            </td>
+            <td>
+                <select name="searchorder">
+                  <option value="datedesc" <if searchorder=="datedesc"> selected</if>>${lang("contentlist.order.datedesc")}</option>
+                  <option value="dateasc" <if searchorder=="dateasc"> selected</if>>${lang("contentlist.order.dateasc")}</option>
+                  <option value="title" <if searchorder=="title"> selected</if>>${lang("contentlist.order.title")}</option>
+                  <option value="creator" <if searchorder=="creator"> selected</if>>${lang("contentlist.order.creator")}</option>
+                </select>
+            </td>
+            <td>
+                <input type="submit" name="search" value="${lang("contentlist.search")}">
+            </td>
+          </tr>
+        </table>
+      </form>
+    </if>
 
-       <table border="0" width="100%" cellspacing="0" cellpadding="2">
-         <tr class="darkgrey">
-           <td><span class="witesmall">
-                       ${lang("content.creationdate")}<br>
-                       ${lang("content.modificationdate")}<br>
-                       ${lang("content.status")}</span></td>
-           <td><span class="witesmall">
-          ${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 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.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
-               ${entry.changedate.formatted["dd.MM.yyyy HH:mm"]}<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">
-              ${lang("articletypes." + entry.article_type.name)} -
-                           </span>
-               ${entry.title}
-                           </b><br>
-                           ${entry.creator}<br>
+    <if articles>
 
-            <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
-                             <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>
-                           </if>
-            <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
-                             <list entry.operations as op>
-                               [<input type="checkbox" name="operation" value="${entry.id};${op}">${op}]
-                             </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}">${op}</option>
-                               </list>
-              </select>
-                           </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="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.id}">${lang("contentlist.comments")}</a>
-                         </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=${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">${count} ${lang("records")}
-        / ${lang("show_from_to", from, to)}</span></td></tr>
-       </table>
-<if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
-    <p>
-      <input class="majorbutton" type="submit" name="save" value="${lang("save")}">
-    </p>
+      <if showactions=="1">
+        <if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
+          <form method="post" action="${config.actionRoot}">
+            <input type="hidden" name="module" value="Localizer">
+            <input type="hidden" name="do" value="articleoperationbatch">
+            <input type="hidden" name="returnurl" value="${utility.encodeHTML(thisurl)}">
+        
+            <p>
+              <input class="majorbutton" type="submit" name="save" value="${lang("save")}">
+            </p>
+        </if>    
+      </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>
+      <table border="0" width="100%" cellspacing="0" cellpadding="2">
+        <tr class="darkgrey">
+          <td><span class="witesmall">
+            ${lang("content.creationdate")}<br>
+            ${lang("content.modificationdate")}<br>
+            ${lang("content.status")}
+          </span></td>
+          <td><span class="witesmall">
+            ${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>
 
-<else>
-  <P align="center">${lang("no_matches_found")}</p>
-</if>
+        <assign grey="0">
 
-<include "foot.template">
-</body>
+        <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.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
+                ${entry.changedate.formatted["dd.MM.yyyy HH:mm"]}<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">
+                    ${lang("articletypes." + entry.article_type.name)} -
+                  </span>
+                  ${entry.title}
+                </b><br>
+                ${entry.creator}<br>
+                
+                <if showactions=="1">
+                  <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
+                    <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>
+                  </if>
+                  <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
+                    <list entry.operations as op>
+                      [<input type="checkbox" name="operation" value="${entry.id};${op}">${op}]
+                    </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}">${op}</option>
+                      </list>
+                    </select>
+                  </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="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.id}">${lang("contentlist.comments")}</a> (${entry.commentcount})
+                <else>
+                  <span class="text">
+                    <a href="${config.actionRoot}?${selectarticleurl}&id=${entry.id}">${lang("contentlist.select")}</a>
+                  </span>
+                </if>
+              </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>
+              <if showactions=="1">
+                <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>
+              </if>
+            </td>
+          </tr>
+        </list>
+        <tr class="darkgrey">
+          <td colspan="4"><span class="witesmall">
+            ${count} ${lang("records")} / ${lang("show_from_to", from, to)}
+          </span></td>
+        </tr>
+      </table>
+      
+      <if showactions=="1">
+        <if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
+            <p>
+              <input class="majorbutton" type="submit" name="save" value="${lang("save")}">
+            </p>
+          </form> 
+        </if>  
+      </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 "foot.template">
+  </body>
 </html>
index c35ba2c..e3bd337 100755 (executable)
@@ -17,7 +17,7 @@
                <b>${lang("start.openpostings.title")}</b></span>
 
         <p>
-               <a href="${config.actionRoot}?module=Content&do=listop&order=webdb_create+desc">
+               <a href="${config.actionRoot}?module=Content&do=list&to_article_type%3D1&order=webdb_create+desc">
                <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;${lang("edit")}</a>
 
                <p>
      <form action="${config.actionRoot}" method="post">
             <input type="hidden" name="module" value="Content">
        <input type="hidden" name="do" value="search">
-       <input type="hidden" name="order" value="date desc">
+       <input type="hidden" name="order" value="datedesc">
                    ${lang("start.content.search")}: <span class="small">
-       <input type="text" name="fieldvalue" size="15">
-       <select name="field">
+       <input type="text" name="searchvalue" size="15">
+       <select name="searchfield">
                <option value="title">${lang("content.title")}</option>
         <option value="creator">${lang("content.creator")}</option>
-        <option value="place">${lang("content.location")}</option>
-        <option value="description">${lang("content.abstract")}</option>
+        <option value="source">${lang("content.location")}</option>
                                <option value="comment">${lang("content.comment")}</option>
-        <option value="content_data">${lang("content.content")}</option>
+        <option value="contents">${lang("content.content")}</option>
        </select></span>
       </form>