X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Flist;h=d52d3e887075252ce886923e1de6cf05e47f15a3;hb=d4dc7a8a0ca5bf94fddf2653ed611eec11bb4c89;hp=69bb8680a8aa18820b83e3d1867d84b536cab702;hpb=0ad4ba7aa71b7dda17f0b07ccc9d8f0ad3424b82;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index 69bb868..d52d3e8 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,11 +1,17 @@
-[% PROCESS list_macros %]
+[% PROCESS macros %]
 
 [% INCLUDE header %]
 
+[% IF search %]
+<h2> Search results </h2>
+[% ELSE %]
 <h2> Listing of all [% classmetadata.plural %]</h2>
+[% END %]
 
 [% INCLUDE navbar %]
+<DIV class="search"> [% INCLUDE search_form %] </DIV>
 
+<DIV class="list">
 <TABLE id="matrix" WIDTH="100%">
 <TR>
 [% FOR col = classmetadata.columns.list;
@@ -24,6 +30,5 @@ FOR item = objects;
     "</tr>";
 END %]
 </TABLE>
-
-
 [% INCLUDE addnew; %]
+</DIV>