X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fsearch-html.html;h=af0c8fc09bd0161055f8aa2f3a50159d1643d0b7;hb=c6e4f9460f44a7440ef2fa7e67ed51dfe40a7668;hp=32f26e86680366058971c87506970aad3e931870;hpb=f09bfd28e16b27d8d62c81abebb8062223ce0114;p=freeside.git
diff --git a/httemplate/search/elements/search-html.html b/httemplate/search/elements/search-html.html
index 32f26e866..af0c8fc09 100644
--- a/httemplate/search/elements/search-html.html
+++ b/httemplate/search/elements/search-html.html
@@ -29,42 +29,36 @@
% }
% }
%
-% 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'}
- )
- : ''
- %>
-
-% } else {
+% unless ( $opt{nohtmlheader} ) {
%
-% my @menubar = ();
-% if ( $opt{'menubar'} ) {
-% @menubar = @{ $opt{'menubar'} };
-% #} else {
-% # @menubar = ( 'Main menu' => $p );
+% if ( $type eq 'html-print' ) {
+ <& /elements/header-popup.html, $opt{'title'} &>
+% } else {
+% if ( $type eq 'select' ) {
+ <&/elements/header-popup.html, $opt{'title'} &>
+% } else {
+%
+% my @menubar = ();
+% if ( $opt{'menubar'} ) {
+% @menubar = @{ $opt{'menubar'} };
+% #} else {
+% # @menubar = ( 'Main menu' => $p );
+% }
+
+ <& /elements/header.html, $opt{'title'},
+ include( '/elements/menubar.html', @menubar )
+ &>
+
+% }
% }
+%
+% }
+%
+% unless ( $type eq 'html-print' ) {
- <% $opt{nohtmlheader}
- ? ''
- : include( '/elements/header.html', $opt{'title'},
- include( '/elements/menubar.html', @menubar )
- )
- %>
+% if ( $opt{'add_link'} ) { #or after html_init?
+ Add a <% $opt{'name_singular'} %>
+% }
<% defined($opt{'html_init'})
? ( ref($opt{'html_init'})
@@ -78,7 +72,7 @@
% unless ( $total ) {
% unless ( $opt{'disable_nonefound'} ) {
- No matching <% $opt{'name'} %> found.
+
No matching <% $opt{'name'} %> found.
% }
% }
%
@@ -302,6 +296,11 @@
% ? ''
% : ''
% ).
+% ( $e->{'onclick'} # don't use with 'link'
+% ? ''
+% : ''
+% ).
% ( $e->{'size'}
% ? ''
% : ''
@@ -316,7 +315,9 @@
% : ''
% ).
% ( $e->{'size'} ? '' : '' ).
-% ( $e->{'link'} ? '' : '' ).
+% ( $e->{'link'} || $e->{'onclick'}
+% ? ''
+% : '' ).
% '';
%
% } @$rowref ).