diff -r 5a7188bf2894 -r 1ab95857d584 templates/channel_search.tmpl
--- a/templates/channel_search.tmpl	Mon Feb 09 23:49:57 2009 +0200
+++ b/templates/channel_search.tmpl	Tue Feb 10 00:04:15 2009 +0200
@@ -1,8 +1,12 @@
 <%inherit file="channel.tmpl" />
 
-<%def name="paginate(url, count, skip, max, **args)">
+<%def name="paginate(url, count, skip, max, _more=None, **args)">
     ## update max?
-    <% max = h.max(max, skip) %>
+    % if more :
+        <% max = h.max(max, skip) %>
+    % else :
+        <% max = skip %>
+    % endif
     ## number of pages
     <% page_count = max / count + 1 %>
     <div class="paginate">
@@ -24,7 +28,13 @@
             </li>
         % endfor
             <li>
+            % if _more :
                 <a href="${h.build_url(url, count=count, skip=h.skip_next(count, max), **args)}">More &raquo;</a>
+            % elif False : 
+                <a href="${h.build_url(url, count=count, skip=h.skip_next(count, max), **args)}">Next &raquo;</a>
+            % else : ## last page
+                <span>Next &raquo;</span>
+            % endif
             </li>
         </ul>
     </div>
@@ -61,7 +71,11 @@
 % else :
 <div id="title">${channel.title} :: Search '${search_query}'</div>
 
-${paginate(urls.channel_search, count, skip, max, channel=channel, q=search_query)}
+${paginate(urls.channel_search, count, skip, max, channel=channel, q=search_query, _more=bool(lines))}
+% if lines :
 <%include file="lines.tmpl" />
-${paginate(urls.channel_search, count, skip, max, channel=channel, q=search_query)}
+% else :
+<div id="search-error">No results found</div>
 % endif
+${paginate(urls.channel_search, count, skip, max, channel=channel, q=search_query, _more=bool(lines))}
+% endif