Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	2 May 2007 10:13:39 -0000	1.23
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	10 May 2007 00:18:46 -0000	1.24
@@ -11,10 +11,20 @@
   #
   # generic links
   #
+  Class create ExternalLink -parameter {
+    href label title
+  }
+  ExternalLink instproc render {} {
+    my instvar href label title
+    set title_att ""
+    if {[info exists title]} {set title_att "title='$title'"}
+    return "<a $title_att class='external' href='$href'>$label</a>"
+  }
 
   Class create Link -parameter {
     type name lang stripped_name label page 
-    folder_id package_id
+    folder_id package_id 
+    title
   }
   Link instproc init {} {
     set class [self class]::[my type]
@@ -29,7 +39,9 @@
     ::Generic::CrItem lookup -name $name -parent_id [my folder_id]
   }
   Link instproc render_found {href label} {
-    return "<a href='$href'>$label</a>"
+    set title_att ""
+    if {[my exists title]} {set title_att "title='[my set title]'"}
+    return "<a $title_att href='$href'>$label</a>"
   }
   Link instproc render_not_found {href label} {
     return "<a href='$href'> \[ </a>$label <a href='$href'> \] </a>"
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	5 May 2007 21:32:50 -0000	1.42
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	10 May 2007 00:18:46 -0000	1.43
@@ -609,5 +609,11 @@
     #my log "--fields = [my fields]"
   }
 
+  Class create FormForm -superclass ::xowiki::WikiForm \
+    -parameter {
+	{field_list {item_id name title creator text form_constraints description nls_language}}
+	{f.form_constraints
+	  {form_constraints:text,nospell,optional {label Constraints} {html {size 80}} }}
+    }
 }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.93 -r1.94
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 May 2007 18:37:49 -0000	1.93
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 May 2007 00:18:46 -0000	1.94
@@ -83,7 +83,7 @@
         ::Generic::Attribute new -attribute_name form_constraints -datatype text \
             -pretty_name "Form Constraints"
       } \
-      -form ::xowiki::WikiForm
+      -form ::xowiki::FormForm
   ::Generic::CrClass create FormInstance -superclass PageInstance \
       -pretty_name "XoWiki FormInstance" -pretty_plural "XoWiki FormInstances" \
       -table_name "xowiki_form_instance" -id_column "xowiki_form_instance_id" \
@@ -136,7 +136,7 @@
   #
   # Page definitions
   #
-  
+
   Page parameter {
     page_id
     {creator ""}
@@ -513,7 +513,11 @@
     regexp {^([^|]+)[|](.*)$} $label _ label options
     if {[string match "http*//*" $link] || [string match "//*" $link]} {
       regsub {^//} $link / link
-      return "$ch<a class='external' href='$link'>$label</a>"
+      set l [ExternalLink new -label $label -href $link]
+      eval $l configure $options
+      set html [$l render]
+      $l destroy
+      return "$ch$html"
     }
 
     set name ""