X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2Ftemplates%2Ffactory%2Fmacros;h=ddaeae1bf8e23bff911e551561a3df504fafb1d8;hb=a4b491683c59a0a505501187742b145eb538eb93;hp=c96cb17db8d7818e23b0a04efbbf5273083bd8ce;hpb=c3973978e1373a262d13da63c9e9ecfde4b72cc7;p=maypole.git

diff --git a/lib/Maypole/templates/factory/macros b/lib/Maypole/templates/factory/macros
index c96cb17..ddaeae1 100644
--- a/lib/Maypole/templates/factory/macros
+++ b/lib/Maypole/templates/factory/macros
@@ -10,12 +10,20 @@ system.
 This creates an <A HREF="..."> to a command in the Apache::MVC system by
 catenating the base URL, table, command, and any arguments.
 
+arguments are table, command, additional, label, target.
+
+target specifies a target for the link if provided.
+
 #%]
 [%
-MACRO link(table, command, additional, label) BLOCK;
+MACRO link(table, command, additional, label, target) BLOCK;
     SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional;
-    lnk = lnk | uri | html;
-    '<a href="' _ lnk _ '">';
+    lnk = lnk | uri ;
+    IF target ;
+	'<a href="' _ lnk _ '" target="' _ target _'">';
+    ELSE;
+	'<a href="' _ lnk _ '">';
+    END;
     label | html;
     "</a>";
 END;
@@ -63,8 +71,7 @@ for some.
         ELSIF col == classmetadata.stringify_column;
             maybe_link_view(item);
  		ELSIF col_obj; # its a real column
-            accessor = item.accessor_name_for(col_obj) ||
-			           item.accessor_name(col_obj); # deprecated in cdbi
+            accessor = item.accessor_name_for(col_obj) || item.accessor_name(col_obj); # deprecated in cdbi
             maybe_link_view(item.$accessor);
         ELSE; 
             item.$col;