Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.54 -r1.55
--- openacs-4/packages/xowiki/xowiki.info	14 Jul 2007 18:14:26 -0000	1.54
+++ openacs-4/packages/xowiki/xowiki.info	19 Jul 2007 21:20:12 -0000	1.55
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.55" url="http://openacs.org/repository/download/apm/xowiki-0.55.apm">
+    <version name="0.56" url="http://openacs.org/repository/download/apm/xowiki-0.56.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2007-07-14</release-date>
+        <release-date>2007-07-19</release-date>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a wiki implementation for OpenACS in XOTcl. Instead of
 trying to implement the full set of wiki markup commands of systems
@@ -131,16 +131,16 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.55"/>
+        <provides url="xowiki" version="0.56"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
         <requires url="xotcl-core" version="0.53"/>
 
         <callbacks>
-            <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
             <callback type="after-install"  proc="::xowiki::after-install"/>
+            <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
             <callback type="after-upgrade"  proc="::xowiki::upgrade_callback"/>
         </callbacks>
         <parameters>
Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	15 Jul 2007 23:46:35 -0000	1.17
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	19 Jul 2007 21:20:12 -0000	1.18
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.55" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.56" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="admin">Verwalten</msg>
   <msg key="back">Zur�ck</msg>
+  <msg key="create_new_entry_of_type">Neuen Eintrag vom Typ %type% erstellen</msg>
   <msg key="create_this_page_in_language">Erzeuge diese Seite in der folgenden Sprache:</msg>
   <msg key="delete">L�schen</msg>
   <msg key="edit">Bearbeiten</msg>
   <msg key="edit_link">bearbeiten</msg>
   <msg key="Form-form">Formular</msg>
   <msg key="Form-form_constraints">Formular Einschr�nkungen</msg>
   <msg key="index">Index</msg>
-  <msg key="new">Neue Seite</msg>
   <msg key="notifications">Verst�ndigungen</msg>
   <msg key="Page-creator">Creator</msg>
   <msg key="Page-description">Kurzbeschreibung</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	17 Jul 2007 00:16:19 -0000	1.23
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	19 Jul 2007 21:20:12 -0000	1.24
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.55" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.56" locale="en_US" charset="ISO-8859-1">
 
   <msg key="admin">Admin</msg>
   <msg key="back">Back</msg>
+  <msg key="create_new_entry_of_type">Create new entry of type %type%</msg>
   <msg key="create_this_page_in_language">Create this page in a different language</msg>
   <msg key="delete">Delete</msg>
   <msg key="edit">Edit</msg>
@@ -31,7 +32,7 @@
   <msg key="Form-submit_button">       OK       </msg>
   <msg key="Form-validate_form_constraints">%errorMsg%</msg>
   <msg key="index">Index</msg>
-  <msg key="new">New Page</msg>
+  <msg key="new_page">New Page</msg>
   <msg key="notifications">Notifications</msg>
   <msg key="numeric-validate_numeric">Invalid numeric value</msg>
   <msg key="Page-creator">Creator</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml	15 Jul 2007 23:46:35 -0000	1.4
+++ openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml	19 Jul 2007 21:20:12 -0000	1.5
@@ -9,7 +9,7 @@
   <msg key="edit_link">editar tags</msg>
   <msg key="Form-form">Forme</msg>
   <msg key="index">�ndice</msg>
-  <msg key="new">Nueva P�gina</msg>
+  <msg key="new_page">Nueva P�gina</msg>
   <msg key="notifications">Notificaciones</msg>
   <msg key="Page-creator">Autor</msg>
   <msg key="Page-description">Descripci�n</msg>
Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	23 Apr 2007 11:55:21 -0000	1.8
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	19 Jul 2007 21:20:12 -0000	1.9
@@ -67,7 +67,7 @@
     return {<div id='wikicmds'>
   <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
   <if @rev_link@ not nil><a href="@rev_link@" accesskey='r'>#xotcl-core.revisions#</a> &middot; </if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot; </if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot; </if>
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -N -r1.71 -r1.72
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	19 Jul 2007 09:36:15 -0000	1.71
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	19 Jul 2007 21:20:12 -0000	1.72
@@ -74,6 +74,31 @@
     return [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]
   }
 
+  
+  ::xowiki::Portlet proc incr_page_order {p} {
+    regexp {^(.*[.]?)([^.])$} $p _ prefix suffix
+    if {[string is integer -strict $suffix]} {
+      incr suffix
+    } elseif {[string is lower -strict $suffix]} {
+      regexp {^(.*)(.)$} $suffix _ before last
+      if {$last eq "z"} {
+	set last "aa"
+      } else {
+	set last [format %c [expr {[scan $last %c] + 1}]]
+      }
+      set suffix $before$last
+    } elseif {[string is upper -strict $suffix]} {
+      regexp {^(.*)(.)$} $suffix _ before last
+      if {$last eq "Z"} {
+	set last "AA"
+      } else {
+	set last [format %c [expr {[scan $last %c] + 1}]]
+      }
+      set suffix $before$last
+    }
+    return $prefix$suffix
+  }
+
   ::xowiki::Portlet instproc locale_clause {package_id locale} {
     set default_locale [$package_id default_locale]
     set system_locale ""
@@ -1525,6 +1550,7 @@
         {__decoration plain}
         {parameter_declaration {
           {-category_id}
+          {-menu_buttons edit-item-button}
         }}
       }
 
@@ -1573,9 +1599,13 @@
           set content [string map [list "\{\{" "\\\{\{"] $content]
         }
       }
-      set menu [$p include_portlet "edit-item-button"] 
+      set menu [list]
+      foreach b $menu_buttons {
+	set html [$p include_portlet $b]
+	if {$html ne ""} {lappend menu $html}
+      }
       append output "<h$level class='book'>" \
-          "<div style='float: right'>$menu</div>" \
+          "<div style='float: right'>" [join $menu "&nbsp;"] "</div>" \
           "<a name='[toc anchor $name]'></a>$page_order $title</h$level>" \
           $content
     }
@@ -1590,14 +1620,21 @@
         {__decoration none}
       }
 
-  item-button instproc render_button {-method -src -return_url} {
-    my get_parameters
-    my instvar __including_page
+  item-button instproc render_button {
+    -page 
+    -method 
+    -src 
+    -alt 
+    -title 
+    -return_url 
+    -page_order
+  } {
     set html ""
-    set page [expr {[info exists page_id] ? $page_id : $__including_page}]
-
+    set package_id [$page package_id]
     set p_link [$package_id pretty_link [$page name]]
-    set edit_link [$package_id make_link -link $p_link $page $method return_url]
+    if {![info exists return_url]} {set return_url $p_link}
+    if {![info exists alt]} {set alt $method}
+    set edit_link [$package_id make_link -link $p_link $page $method return_url page_order]
     if {$edit_link ne ""} {
       set html "<a href=\"$edit_link\"><image src='$src' border='0' alt=\"$alt\" title=\"$title\"></a>"
     }
@@ -1608,50 +1645,71 @@
       -parameter {
         {parameter_declaration {
           {-page_id}
-          {-title "edit item"}
+          {-title "#xowiki.edit#"}
           {-alt "edit"}
         }}
       }
   
   edit-item-button instproc render {} {
-    return [my render_button -method edit -src /resources/acs-subsite/Edit16.gif]
+    my get_parameters
+    my instvar __including_page
+    set page [expr {[info exists page_id] ? $page_id : $__including_page}]
+    if {[$page istype ::xowiki::FormPage]} {
+      set template [$page page_template]
+      set title "$title [$template title] [$page name]"
+    }
+    return [my render_button \
+		-page $page -method edit \
+		-title $title -alt $alt \
+		-return_url [::xo::cc url] \
+		-src /resources/acs-subsite/Edit16.gif]
   }
-#   {
-#     my get_parameters
-#     my instvar __including_page
-#     set html ""
-#     set page [expr {$page_id ? $page_id : $__including_page}]
 
-#     set p_link [$package_id pretty_link [$page name]]
-#     set edit_link [$package_id make_link -link $p_link $page edit return_url]
-#     if {$edit_link ne ""} {
-#       set html "<a href=\"$edit_link\"><image src='/resources/acs-subsite/Edit16.gif' border='0' alt=\"$alt\" title=\"$title\"></a>"
-#     }
-#     return $html
-#   }
+  Class create delete-item-button -superclass ::xowiki::portlet::item-button \
+      -parameter {
+        {__decoration none}
+        {parameter_declaration {
+          {-page_id}
+          {-title "#xowiki.delete#"}
+          {-alt "delete"}
+        }}
+      }
 
-  Class create new-item-button -superclass ::xowiki::portlet::item-button \
+  delete-item-button instproc render {} {
+    my get_parameters
+    my instvar __including_page
+    set page [expr {[info exists page_id] ? $page_id : $__including_page}]
+    return [my render_button \
+		  -page $page -method delete \
+		  -title $title -alt $alt \
+		  -return_url [::xo::cc url] \
+		  -src /resources/acs-subsite/Delete16.gif]
+  }
+
+  Class create create-item-button -superclass ::xowiki::portlet::item-button \
       -parameter {
         {__decoration none}
         {parameter_declaration {
           {-page_id}
-          {-title "new item"}
           {-alt "new"}
         }}
       }
-  
-  new-item-button instproc render {} {
+
+  create-item-button instproc render {} {
     my get_parameters
     my instvar __including_page
-    set html ""
-    set page [expr {$page_id ? $page_id : $__including_page}]
-
-    set p_link [$package_id pretty_link [$page name]]
-    set edit_link [$package_id make_link -link $p_link $page edit return_url]
-    if {$edit_link ne ""} {
-      set html "<a href=\"$edit_link\"><image src='/resources/acs-subsite/Edit16.gif' border='0' alt=\"$alt\" title=\"$title\"></a>"
+    set page [expr {[info exists page_id] ? $page_id : $__including_page}]
+    if {[$page istype ::xowiki::FormPage]} {
+      set template [$page page_template]
+      set page_order [::xowiki::Portlet incr_page_order [$page page_order]]
+      return [my render_button \
+		  -page $template -method create-new \
+		  -title [_ xowiki.create_new_entry_of_type [list type [$template title]]] \
+		  -alt $alt -page_order $page_order \
+		  -return_url [::xo::cc url] \
+		  -src /resources/acs-subsite/Add16.gif]
     }
-    return $html
+    return ""
   }
 
 }
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.86 -r1.87
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	19 Jul 2007 09:36:15 -0000	1.86
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	19 Jul 2007 21:20:12 -0000	1.87
@@ -781,7 +781,11 @@
     if {$form eq ""} {
       my msg "no form found in page [$page_template name]"
     } else {
-      $form setAttribute action [$package_id pretty_link [my name]]?m=edit method POST
+      if {[my exists_query_parameter "return_url"]} {
+	set return_url [my query_parameter "return_url"]
+      }
+      set url [export_vars -base [$package_id pretty_link [my name]] {{m "edit"} return_url}] 
+      $form setAttribute action $url method POST
       set oldCSSClass [expr {[$form hasAttribute class] ? [$form getAttribute class] : ""}]
       $form setAttribute class [string trim "$oldCSSClass margin-form"]
     }
@@ -1012,10 +1016,20 @@
                -parent_id [my parent_id] \
                -publish_status "production" \
                -page_template [my item_id]]
+    
+    # set some default values if they are provided
+    foreach key {name title page_order last_page_id} {
+      if {[$package_id exists_query_parameter $key]} {
+        $f set $key [$package_id query_parameter $key]
+      }
+    }
     $f set __title_prefix [my title]
     $f save_new
+    if {[my exists_query_parameter "return_url"]} {
+      set return_url [my query_parameter "return_url"]
+    }
     $package_id returnredirect \
-        [my query_parameter "return_url" [$package_id pretty_link [$f name]]?m=edit]
+        [export_vars -base [$package_id pretty_link [$f name]] {{m edit} return_url}]
   }
 
 
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -N -r1.38 -r1.39
--- openacs-4/packages/xowiki/www/oacs-view.adp	25 Jun 2007 12:18:57 -0000	1.38
+++ openacs-4/packages/xowiki/www/oacs-view.adp	19 Jul 2007 21:20:13 -0000	1.39
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 22 14:25:02 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -56,7 +56,7 @@
 <div id='wikicmds'>
   <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
   <if @rev_link@ not nil><a href="@rev_link@" accesskey='r'>#xotcl-core.revisions#</a> &middot; </if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot; </if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot; </if>
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/xowiki/www/oacs-view2.adp	25 Jun 2007 12:18:57 -0000	1.17
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	19 Jul 2007 21:20:13 -0000	1.18
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 22 14:25:02 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -58,7 +58,7 @@
 <div id='wikicmds'>
   <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
   <if @rev_link@ not nil><a href="@rev_link@" accesskey='r'>#xotcl-core.revisions#</a> &middot; </if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot; </if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot; </if>
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/xowiki/www/oacs-view3.adp	25 Jun 2007 12:18:57 -0000	1.12
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	19 Jul 2007 21:20:13 -0000	1.13
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 22 14:25:02 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -58,7 +58,7 @@
 <div id='wikicmds'>
   <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
   <if @rev_link@ not nil><a href="@rev_link@" accesskey='r'>#xotcl-core.revisions#</a> &middot; </if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot; </if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot; </if>
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v
diff -u -N -r1.34 -r1.35
--- openacs-4/packages/xowiki/www/view-default.adp	25 Jun 2007 12:18:57 -0000	1.34
+++ openacs-4/packages/xowiki/www/view-default.adp	19 Jul 2007 21:20:13 -0000	1.35
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 22 14:25:02 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -50,7 +50,7 @@
 <div id='wikicmds'>
   <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
   <if @rev_link@ not nil><a href="@rev_link@" accesskey='r'>#xotcl-core.revisions#</a> &middot; </if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot; </if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot; </if>
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/xowiki/www/view-links.adp	25 Jun 2007 12:18:57 -0000	1.24
+++ openacs-4/packages/xowiki/www/view-links.adp	19 Jul 2007 21:20:13 -0000	1.25
@@ -1,11 +1,11 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 22 14:25:02 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
 <div id='wikicmds'>
   <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
   <if @rev_link@ not nil><a href="@rev_link@" accesskey='r'>#xotcl-core.revisions#</a> &middot; </if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot; </if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot; </if>
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
Index: openacs-4/packages/xowiki/www/view-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-page.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/view-page.adp	28 Jan 2007 23:03:26 -0000	1.2
+++ openacs-4/packages/xowiki/www/view-page.adp	19 Jul 2007 21:20:13 -0000	1.3
@@ -6,7 +6,7 @@
 <div style='top: -50px ! important;' id='wikicmds'>
   <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
   <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' >#xotcl-core.revisions#</a> &middot;</if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot;</if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot;</if>
   <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot;</if>
   <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot;</if>
   <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/xowiki/www/view-plain.adp	25 Jun 2007 12:18:57 -0000	1.20
+++ openacs-4/packages/xowiki/www/view-plain.adp	19 Jul 2007 21:20:13 -0000	1.21
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 22 14:25:02 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>