Index: trac/search/web_ui.py
===================================================================
--- trac/search/web_ui.py (revision 4320)
+++ trac/search/web_ui.py (working copy)
@@ -65,6 +65,10 @@
def process_request(self, req):
req.perm.assert_permission('SEARCH_VIEW')
+ if req.path_info == '/search/opensearch':
+ return ('opensearch.xml', {},
+ 'application/opensearchdescription+xml')
+
available_filters = []
for source in self.search_sources:
available_filters += source.get_search_filters(req)
Index: trac/web/chrome.py
===================================================================
--- trac/web/chrome.py (revision 4320)
+++ trac/web/chrome.py (working copy)
@@ -323,16 +323,13 @@
add_script(fakereq, 'common/js/trac.js')
add_script(fakereq, 'common/js/search.js')
- icon = self.env.project_icon
- if icon:
- if not icon.startswith('/') and icon.find('://') == -1:
- if '/' in icon:
- icon = req.href.chrome(icon)
- else:
- icon = req.href.chrome('common', icon)
- mimetype = mimeview.get_mimetype(icon)
- add_link(fakereq, 'icon', icon, mimetype=mimetype)
- add_link(fakereq, 'shortcut icon', icon, mimetype=mimetype)
+ # Shortcut icon
+ chrome['icon'] = self.get_icon_data(req)
+ if chrome['icon']:
+ src = chrome['icon']['src']
+ mimetype = chrome['icon']['mimetype']
+ add_link(fakereq, 'icon', src, mimetype=mimetype)
+ add_link(fakereq, 'shortcut icon', src, mimetype=mimetype)
# Logo image
chrome['logo'] = self.get_logo_data(req.href)
@@ -369,6 +366,23 @@
return chrome
+
+ def get_icon_data(self, req):
+ icon = {}
+ icon_src = icon_abs_src = self.env.project_icon
+ if icon_src:
+ if not icon_src.startswith('/') and icon_src.find('://') == -1:
+ if '/' in icon_src:
+ icon_abs_src = req.abs_href.chrome(icon_src)
+ icon_src = req.href.chrome(icon_src)
+ else:
+ icon_abs_src = req.abs_href.chrome('common', icon_src)
+ icon_src = req.href.chrome('common', icon_src)
+ mimetype = mimeview.get_mimetype(icon_src)
+ icon = {'src': icon_src, 'abs_src': icon_abs_src,
+ 'mimetype': mimetype}
+ return icon
+
def get_logo_data(self, href):
logo = {}
logo_src = self.logo_src
Index: templates/search.html
===================================================================
--- templates/search.html (revision 4320)
+++ templates/search.html (working copy)
@@ -7,6 +7,11 @@
Search<py:if test="query"> Results</py:if>
+
+
+
+
+
Index: templates/layout.html
===================================================================
--- templates/layout.html (revision 4320)
+++ templates/layout.html (working copy)
@@ -16,6 +16,10 @@
+
+
+
${select("*[local-name() != 'title']")}
Index: templates/opensearch.xml
===================================================================
--- templates/opensearch.xml (revision 0)
+++ templates/opensearch.xml (revision 0)
@@ -0,0 +1,10 @@
+
+
+ Search $project.name
+ UTF-8
+ $chrome.icon.abs_src
+
+