stas 2002/07/09 03:27:02
Modified: src/search README search.tt
tmpl/custom/html head search search_field tail
Log:
various layout fixes, mostly search pages
Revision Changes Path
1.11 +1 -1 modperl-docs/src/search/README
Index: README
===================================================================
RCS file: /home/cvs/modperl-docs/src/search/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- README 30 Jun 2002 17:21:57 -0000 1.10
+++ README 9 Jul 2002 10:27:02 -0000 1.11
@@ -138,7 +138,7 @@
search form includes the hidden variable C<sbm> (mnemonics: 'search by
meta'). For example:
- <input type="checkbox" name="sbm" value="docs/1.0/guide" />
+ <input type="checkbox" name="sbm" value="docs/1.0/guide">
will search all the documents under I<docs/1.0/guide> directory.
1.20 +25 -18 modperl-docs/src/search/search.tt
Index: search.tt
===================================================================
RCS file: /home/cvs/modperl-docs/src/search/search.tt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- search.tt 3 Jul 2002 18:58:21 -0000 1.19
+++ search.tt 9 Jul 2002 10:27:02 -0000 1.20
@@ -1,16 +1,13 @@
[% # This template is used for rendering the search results
# It expects the search hash ref to be set.
-%]
-
-
-[% PROCESS search_options %]
-
-
-[% WRAPPER searchresults.html %]
-[%
+[%- WRAPPER searchresults.html -%]
+ [%
# Title takes up space for no reason
# PROCESS swish_header;
+ PROCESS search_options;
+
title = PROCESS title;
IF ! search.results;
@@ -19,13 +16,27 @@
ELSE;
nav_bar_res = PROCESS nav_bar;
- nav_bar_res;
- PROCESS results_list;
- nav_bar_res IF search.navigation('hits') >
search.config('page_size');
- '<p><a name="search_form"></a><br><br></p>';
- PROCESS search_form;
- END;
-%]
+ -%]
+ <table cellpadding="1" cellspacing="0" border="0">
+ [% nav_bar_res %]
+ <tr>
+ <td height="10" colspan="2"><br></td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ [% PROCESS results_list %]
+ </td>
+ </tr>
+ [% IF search.navigation('hits') > search.config('page_size') %]
+ <tr>
+ <td height="10" colspan="2"><br></td>
+ </tr>
+ [% nav_bar_res %]
+ [% END %]
+ </table>
+ <p><a name="search_form"></a><br><br></p>
+ [% PROCESS search_form %]
+ [% END %]
[% END %]
@@ -102,7 +113,6 @@
[% BLOCK nav_bar %]
[% search.stopwords_removed %]
- <table cellpadding="1" cellspacing="0" border="0" width="100%">
<tr>
<td class="search-header">
Results for <b>[% search.query_simple | html %]</b>
@@ -133,11 +143,8 @@
<td align="right" class="search-nav">
<a href="#search_form">Advanced Search</a>
</td>
-
</tr>
[% END %]
-
- </table>
[% END %]
1.12 +1 -1 modperl-docs/tmpl/custom/html/head
Index: head
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/head,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- head 28 Jun 2002 06:36:57 -0000 1.11
+++ head 9 Jul 2002 10:27:02 -0000 1.12
@@ -14,7 +14,7 @@
background-attachment: fixed; /* needed for mac/ie5*/
color: #000000;
font-family: helvetica, arial, verdana, sans-serif;
- font-size: 1.0em;
+ /* font-size: 1.0em; /*
position: relative !important; /* needed for ie5*/
}
</style>
1.29 +4 -5 modperl-docs/tmpl/custom/html/search
Index: search
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/search,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- search 3 Jul 2002 19:21:16 -0000 1.28
+++ search 9 Jul 2002 10:27:02 -0000 1.29
@@ -55,7 +55,6 @@
[% BLOCK search_widget %]
[% search_input %]
- <br class="smallbr">
[% search_options %]
<br>
<input type="submit" name="submit" value="search"
class="inp-submit">
@@ -71,10 +70,10 @@
[% search_input = BLOCK %]
[% stag %] CGI.textfield( {
- name => 'query',
- size => 12,
+ name => 'query',
+ size => 12,
maxlength => 200,
- class => 'inp-text',
+ class => 'inp-text',
} )
[% etag %]
@@ -86,7 +85,7 @@
Name => 'sbm',
Values => search_areas,
Labels => search_labels,
- class => 'inp-select',
+ class => 'inp-select',
})
[% etag %]
1.4 +2 -2 modperl-docs/tmpl/custom/html/search_field
Index: search_field
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/search_field,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- search_field 29 Apr 2002 22:30:09 -0000 1.3
+++ search_field 9 Jul 2002 10:27:02 -0000 1.4
@@ -47,7 +47,7 @@
[% etag %]
</td>
- <td nowrap="nowrap"><input type="image" src="[%
doc.dir.abs_doc_root %]/images/go.gif" border="0" hspace="0" alt="search"
/></td>
+ <td nowrap="nowrap"><input type="image" src="[%
doc.dir.abs_doc_root %]/images/go.gif" border="0" hspace="0" alt="search"></td>
</tr>
</table>
[% END %]
@@ -71,7 +71,7 @@
})
%]
</td>
- <td nowrap="nowrap"><input type="image" src="[%
doc.dir.abs_doc_root %]/images/go.gif" width="29" height="20" border="0"
hspace="0" alt="search" /></td>
+ <td nowrap="nowrap"><input type="image" src="[%
doc.dir.abs_doc_root %]/images/go.gif" width="29" height="20" border="0"
hspace="0" alt="search"></td>
</tr>
</table>
1.18 +0 -3 modperl-docs/tmpl/custom/html/tail
Index: tail
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/tail,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tail 5 Jul 2002 11:15:31 -0000 1.17
+++ tail 9 Jul 2002 10:27:02 -0000 1.18
@@ -1,8 +1,5 @@
<div class="footer">
- <div class="changes">
- [%- INCLUDE changes_link -%]
- </div>
<hr noshade size="1">
<!-- footer (tail )-->
<p class="modified">Last modified [% doc.last_modified %]</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
