Ticket #1269: quickjump.diff

htdocs/css/search.css

@@ -9 +9 @@
 #results dd { font-size: 80%; margin: 0; padding: 0 }
 #results .author, #results .date, #results .keywords { color: #090 }
 
+#quickjump { margin-left: 2em; font-style: italic }
+
 #paging { margin: 0 0 2em; text-align: center }

trac/Search.py

@@ -163 +163 @@
         query = req.args.get('q')
         if query:
             page = int(req.args.get('page', '1'))
+            quickjump = int(req.args.get('quickjump', '0'))
             redir = self.quickjump(req, query)
-            if redir:
-                req.redirect(redir)
+            if redir is not None:
+                if quickjump:
+                    req.redirect(redir.attr['href'])
+                else:
+                    req.hdf['search.quickjump'] = redir
             elif query.startswith('!'):
                 query = query[1:]
             terms = search_terms(query)
@@ -218 +222 @@
             return req.href.browser(kwd)
         link = wiki_to_link(kwd, self.env, req)
         if isinstance(link, Element):
-            return link.attr['href']
+            return link
 
     # IWikiSyntaxProvider methods
     

templates/header.cs

@@ -45 +45 @@
   <input type="hidden" name="wiki" value="on" />
   <input type="hidden" name="changeset" value="on" />
   <input type="hidden" name="ticket" value="on" />
+  <input type="hidden" name="quickjump" value="1" />
  </div><?cs /if ?>
 </form>
 

templates/search.cs

@@ -46 +46 @@
    var:(search.page-1) * search.page_size + len(search.result) ?> 
    of <?cs var:search.n_hits?>)<?cs
   /if ?></h2>
+  <?cs if:search.quickjump ?>
+   <div id="quickjump">Quickjump to <?cs var:search.quickjump ?></div>
+  <?cs /if ?>
  <div id="searchable">
   <dl id="results"><?cs
    each item=search.result ?>