[freeside-commits] freeside/httemplate/search/elements search-html.html, 1.11.2.1, 1.11.2.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search/elements
In directory wavetail.420.am:/tmp/cvs-serv13355/httemplate/search/elements

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	search-html.html 
Log Message:
maintain freeradius nas table, RT#14697

Index: search-html.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/elements/search-html.html,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -w -d -r1.11.2.1 -r1.11.2.2
--- search-html.html	18 Aug 2011 22:55:18 -0000	1.11.2.1
+++ search-html.html	14 Oct 2011 08:56:12 -0000	1.11.2.2
@@ -29,27 +29,13 @@
 %       }
 %     }
 %
+%     unless ( $opt{nohtmlheader} ) {
+%
 %     if ( $type eq 'html-print' ) {
-
-        <% $opt{nohtmlheader}
-             ? ''
-             : include( '/elements/header-popup.html', $opt{'title'} )
-        %>
-
-%     } elsif ( $type eq 'select' ) {
-
-        <% $opt{nohtmlheader}
-             ? ''
-             : include( '/elements/header-popup.html', $opt{'title'} )
-        %>
-        <% defined($opt{'html_init'}) 
-              ? ( ref($opt{'html_init'})
-                    ? &{$opt{'html_init'}}()
-                    : $opt{'html_init'}
-                )
-              : ''
-        %>
-
+          <& /elements/header-popup.html, $opt{'title'} &>
+%       } else {
+%         if ( $type eq 'select' ) {
+            <&/elements/header-popup.html, $opt{'title'} &>
 %     } else {
 %
 %       my @menubar = ();
@@ -59,12 +45,20 @@
 %       #  @menubar = ( 'Main menu' => $p );
 %       }
 
-        <% $opt{nohtmlheader}
-             ? ''
-             : include( '/elements/header.html', $opt{'title'},
+            <& /elements/header.html, $opt{'title'},
                           include( '/elements/menubar.html', @menubar )
-                      )
-        %>
+            &>
+
+%         }
+%       }
+%
+%     }
+%
+%     unless ( $type eq 'html-print' ) {
+
+%       if ( $opt{'add_link'} ) { #or after html_init?
+          <A HREF="<%$p%>edit/<% $opt{query}->{table} %>.html"><I>Add a <% $opt{'name_singular'} %></I></A><BR><BR>
+%       }
 
         <% defined($opt{'html_init'}) 
               ? ( ref($opt{'html_init'})