*** empty log message ***

diff --git a/bundles/admin_de.properties b/bundles/admin_de.properties
index b92a927..5f6feaf 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.29 2003/04/28 00:44:05 zapata Exp $
+# $Id: admin_de.properties,v 1.29.2.1 2003/06/24 22:28:58 zapata Exp $
 
 languagename=Deutsch
 
@@ -111,7 +111,7 @@ comment.phone=Telefon
 comment.email=Email
 comment.url=Url
 comment.creator=Uhrheber
-comment.article=zu Artikel
+comment.article=Artikel
 comment.html=HTML?
 comment.status=Status 
 comment.language=Sprache

diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index 6cc5919..804a5cd 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.48.2.4 2003/06/23 19:29:54 zapata Exp $
+# $Id: admin_en.properties,v 1.48.2.5 2003/06/24 22:28:58 zapata Exp $
 
 languagename=English
 
@@ -111,10 +111,11 @@ comment.phone=Phone
 comment.email=Email
 comment.url=Url
 comment.creator=Author
-comment.article=For article
+comment.article=Article
 comment.html=HTML
 comment.status=Status 
 comment.language=Language
+comment.allcomments=All comments
 
 comment.operation.hide=hide
 comment.operation.unhide=unhide

diff --git a/bundles/admin_es.properties b/bundles/admin_es.properties
index 07009f2..be673da 100755 (executable)
--- a/bundles/admin_es.properties
+++ b/bundles/admin_es.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: spanish
-# $Id: admin_es.properties,v 1.29 2003/05/03 23:30:49 zapata Exp $
+# $Id: admin_es.properties,v 1.29.2.1 2003/06/24 22:28:58 zapata Exp $
 
 languagename = Castellano
 
@@ -111,7 +111,7 @@ comment.phone = Tel\u00e9fono
 comment.email = Correo electr\u00f3nico
 comment.url = URL
 comment.creator = Autor
-comment.article = del art\u00edculo
+comment.article = Art\u00edculo
 comment.html = HTML
 comment.status = Estado
 comment.language = Idioma

diff --git a/bundles/admin_eu.properties b/bundles/admin_eu.properties
index 411323f..3894769 100755 (executable)
--- a/bundles/admin_eu.properties
+++ b/bundles/admin_eu.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: euskera / basque
-# $Id: admin_eu.properties,v 1.12 2003/04/28 01:57:14 zapata Exp $
+# $Id: admin_eu.properties,v 1.12.2.1 2003/06/24 22:28:58 zapata Exp $
 
 languagename = Euskera
 
@@ -121,7 +121,7 @@ comment.phone = telefonoa
 comment.email = posta elektronikoa
 comment.url = URL
 comment.creator = egilea
-comment.article = hurrengo artikuluarena
+comment.article = Artikuluarena
 comment.html = HTML da?
 comment.status = Egoera
 comment.language = Hizkuntza

diff --git a/bundles/admin_gz.properties b/bundles/admin_gz.properties
index ecfceaf..c33aa88 100755 (executable)
--- a/bundles/admin_gz.properties
+++ b/bundles/admin_gz.properties
@@ -1,6 +1,6 @@
 ########## admin ##########\r
 # language: galician\r
-# $Id: admin_gz.properties,v 1.2 2003/05/03 23:30:49 zapata Exp $\r
+# $Id: admin_gz.properties,v 1.2.2.1 2003/06/24 22:28:58 zapata Exp $\r
 \r
 languagename = Galego\r
 \r
@@ -111,7 +111,7 @@ comment.phone = Tel\u00e9fono
 comment.email = Correo electr\u00f3nico\r
 comment.url = URL\r
 comment.creator = Autor\r
-comment.article = do art\u00edculo\r
+comment.article = Art\u00edculo\r
 comment.html = HTML\r
 comment.status = Estado\r
 comment.language = Idioma\r

diff --git a/bundles/admin_it.properties b/bundles/admin_it.properties
index 089a12b..8306197 100755 (executable)
--- a/bundles/admin_it.properties
+++ b/bundles/admin_it.properties
@@ -1,6 +1,6 @@
 ########## admin #######
 # language: italiano
-# $Id: admin_it.properties,v 1.1 2003/05/15 17:14:59 zapata Exp $
+# $Id: admin_it.properties,v 1.1.2.1 2003/06/24 22:28:58 zapata Exp $
 
 # missing (master value = "English")
 languagename = italiano
@@ -122,7 +122,7 @@ comment.phone = telefono
 comment.email = email
 comment.url = url
 comment.creator = autore
-comment.article = dell'articolo
+comment.article = Articolo
 comment.html = HTML
 comment.status = stato
 comment.language = lingua

diff --git a/bundles/admin_nl.properties b/bundles/admin_nl.properties
index ce9aea8..57a2c7b 100755 (executable)
--- a/bundles/admin_nl.properties
+++ b/bundles/admin_nl.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: dutch
-# $Id: admin_nl.properties,v 1.8 2003/04/28 01:57:14 zapata Exp $
+# $Id: admin_nl.properties,v 1.8.2.1 2003/06/24 22:28:58 zapata Exp $
 
 languagename = Nederlands
 
@@ -111,7 +111,7 @@ comment.phone = Telefoon
 comment.email = E-mail
 comment.url = Homepage
 comment.creator = Auteur
-comment.article = Voor artikel
+comment.article = Artikel
 comment.html = HTML?
 comment.status = Status 
 comment.language = Taal

diff --git a/bundles/admin_pt.properties b/bundles/admin_pt.properties
index 9fe7c4b..5a42994 100755 (executable)
--- a/bundles/admin_pt.properties
+++ b/bundles/admin_pt.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: portuguese
-# $Id: admin_pt.properties,v 1.5.2.2 2003/05/27 21:08:53 zapata Exp $
+# $Id: admin_pt.properties,v 1.5.2.3 2003/06/24 22:28:58 zapata Exp $
 
 languagename = Portugu\u00eas
 
@@ -111,7 +111,7 @@ comment.phone = Telefone
 comment.email = Email
 comment.url = URL
 comment.creator = Autor(a)
-comment.article = Para o artigo
+comment.article = Artigo
 comment.html = HTML?
 comment.status = Status 
 comment.language = L\u00edngua

diff --git a/bundles/admin_sv.properties b/bundles/admin_sv.properties
index d49ca7e..5c45443 100755 (executable)
--- a/bundles/admin_sv.properties
+++ b/bundles/admin_sv.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: svenska
-# $Id: admin_sv.properties,v 1.6 2003/04/26 23:20:24 zapata Exp $
+# $Id: admin_sv.properties,v 1.6.2.1 2003/06/24 22:28:58 zapata Exp $
 
 languagename=Svenska
 
@@ -96,7 +96,7 @@ comment.phone=Telefon
 comment.email=Email
 comment.url=Url
 comment.creator=Författare
-comment.article=För artikel
+comment.article=Artikel
 comment.html=HTML?
 comment.status=Status 
 comment.language=Språk

diff --git a/templates/admin/FUNCTIONS.template b/templates/admin/FUNCTIONS.template
index c890d53..20a68d8 100755 (executable)
--- a/templates/admin/FUNCTIONS.template
+++ b/templates/admin/FUNCTIONS.template
@@ -1,3 +1,14 @@
+<function showAbsoluteLinkButton(anUrl, aLabel)>
+    <span class="link-box-div">
+  <a class="link-box" href="${utility.encodeHTML(anUrl)}">${aLabel}</a>
+    </span>
+</function>
+<function showButton(anUrl, aLabel)>
+  <call showAbsoluteLinkButton(config.actionRoot+"?"+anUrl, aLabel)>
+</function>
+
+
+
 <comment>creates a full table incl. edit/delete entry.id</comment>
 <function ListTable(contentlist, data_keys, aHeaders, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>
   <assign nrColumns="1">

diff --git a/templates/admin/comment.template b/templates/admin/comment.template
index 8a6575c..deb5feb 100755 (executable)
--- a/templates/admin/comment.template
+++ b/templates/admin/comment.template
@@ -18,9 +18,44 @@
         <input type="hidden" name="do" value="update">
       </if>
     
-      <table border="0">    
+<table width="100%" cellspacing="0" cellpadding="5">
+  <tr>
+    <td align="left" valign="top">
+      <if new=="0">
+        <if comment.to_content>
+          <call showButton(
+            "module=Content&do=edit&id="+comment.to_content.id+"&returnurl="+utility.encodeURI(thisurl),
+            lang("comment.article"))>
+          <call showButton(
+            "module=Comment&do=articlecomments&articleid="+comment.to_content.id+"&returnurl="+utility.encodeURI(thisurl),
+            lang("comment.allcomments"))>
+          <call showAbsoluteLinkButton(
+            comment.publicurl,
+            lang("preview"))>
+        </if>
+
+        <list comment.operations as op>
+          <call showButton(
+            "module=Localizer&do=commentoperation&operation="+op+"&id="+comment.id+"&returnurl="+utility.encodeURI(thisurl), 
+            lang("comment.operation."+op))>
+        </list>
+      </if>
+      
+    </td>
+    <td align="right" valign="top">
+      ${lang("comment.published")} <input type="checkbox" name="is_published" value="1" <if comment.is_published=="1"> checked</if>>
+      <if new=="1">
+        <input type="submit" name="save" value="${lang("insert")}">
+      <else>
+        <input type="submit" name="save" value="${lang("save")}">
+      </if> 
+    </td>
+  </tr>
+</table>
+
+<table width="100%" cellspacing="3" cellpadding="2">
         
-    <tr><td colspan="2" class="table-head">${lang("comment.htmltitle")}</td></tr>
+      <tr><td colspan="2" class="table-head">${lang("comment.htmltitle")}</td></tr>
     
     
       <tr>
@@ -32,14 +67,14 @@
         </td>
       </tr>
       
-    <tr> 
-          <td align="right" class="table-left">
-            ${lang("comment.date")}
-          </td>
-          <td class="listrow2">
-            ${utility.encodeHTML(utility.encodeHTML(comment.webdb_create))}
-          </td>
-        </tr>
+      <tr> 
+        <td align="right" class="table-left">
+          ${lang("comment.date")}
+        </td>
+        <td class="listrow2">
+          ${utility.encodeHTML(utility.encodeHTML(comment.webdb_create))}
+        </td>
+      </tr>
 
 
     <call PulldownTableRow (lang("comment.status"), "to_comment_status", commentstatuses, "id", "name", comment.to_comment_status, "commentstatus.")>
@@ -58,7 +93,6 @@
         <tr>
           <td colspan="2" align="right" class="table-foot" > 
             <span class="text">
-              ${lang("comment.published")} <input type="checkbox" name="is_published" value="1" <if comment.is_published=="1"> checked</if>>
               <if new=="1">
                 <input type="submit" name="save" value="${lang("insert")}">
               <else>
@@ -74,41 +108,6 @@
 <table width="90%" cellspacing="0" cellpadding="0">
 
 <tr>
-<comment>
-<td align="left" valign="top">
-<table cellspacing="3" cellpadding="2">
-  <tr>
-    <td class="table-head" colspan="2">
-      ${lang("content.family")}
-    </td>
-  </tr>
-    
-  <tr>
-    <td align=right valign=top class="table-left">
-      ${lang("content.parent")}:
-    </td>
-    <td align="left" valign="top" class="listrow2">
-      <if article.parent>
-        <b>${utility.encodeHTML(article.parent.title)}</b><br>
-        <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>    
-        &nbsp;<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="table-left">
-      ${lang("content.children")}:
-    </td>
-    <td align="left" valign="top" class="listrow2">
-      <a href="${config.actionRoot}?module=Content&do=listchildren&article_id=${article.id}">${lang("content.viewchildren")}</a>
-    </td>
-  </tr>
-</table>
-
-</td>
-</comment>
 <td align="left" valign="top">
 <call showCommentAttachments(comment)>
 </td>

diff --git a/templates/admin/content.template b/templates/admin/content.template
index 506440b..4fdcb3b 100755 (executable)
--- a/templates/admin/content.template
+++ b/templates/admin/content.template
@@ -19,12 +19,21 @@
     <input type="hidden" name="do" value="update">
   </if>
 
-<table width="90%" cellspacing="3" cellpadding="2">
+<table width="100%" cellspacing="0" cellpadding="5">
   <tr>
     <td align="left" valign="top">
       <if new=="0">
-        [ <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${article.id}&returnurl=${thisurl}">${lang("content.comments")}</a> ] &nbsp;&nbsp;
-          [ <a href="${article.publicurl}">${lang("preview")}</a> ]
+        <call showButton(
+          "module=Comment&do=articlecomments&articleid="+article.id+"&returnurl="+utility.encodeURI(thisurl),
+          lang("content.comments"))>
+        <call showAbsoluteLinkButton(
+          article.publicurl,
+          lang("preview"))>
+        <list article.operations as op>
+          <call showButton(
+            "module=Localizer&do=articleoperation&operation="+op+"&articleid="+article.id+"&returnurl="+utility.encodeURI(thisurl), 
+            lang("content.operation."+op))>
+        </list>
       </if>
       
     </td>
@@ -38,7 +47,8 @@
       </if>
     </td>
   </tr>
-
+</table>
+<table width="100%" cellspacing="3" cellpadding="2">
   <tr>
     <td align="right" class="table-left">
       id # :
@@ -67,7 +77,6 @@
     </td>
   </tr>
 
-
   <call PulldownTableRow (lang("content.articletype"), "to_article_type", articletypes, "id", "name", article.to_article_type, "articletypes.")>
   <call PulldownTableRow (lang("content.language"), "to_language", languages, "id", "name", article.to_language, "")>
   

diff --git a/web/style/admin.css b/web/style/admin.css
index 11908ba..39e01fc 100755 (executable)
--- a/web/style/admin.css
+++ b/web/style/admin.css
@@ -144,6 +144,10 @@ a:hover            {
        padding-right:8px;
        border:1px solid #990000;  
 }
+.link-box-div {
+       padding-top:5px;
+       padding-bottom:5px;
+}
 
 .link-help {  
        background-color:#DDDDDD;