UI fixes for searching

rhodecode/lib/indexers/__init__.py

@@ -40,7 +40,7 from whoosh.index import create_in, open
 from whoosh.formats import Characters
 from whoosh.highlight import highlight, HtmlFormatter, ContextFragmenter
 
-from webhelpers.html.builder import escape
+from webhelpers.html.builder import escape, literal
 from sqlalchemy import engine_from_config
 
 from rhodecode.model import init_model
@@ -231,7 +231,7 class WhooshResultWrapper(object):
         if self.search_type != 'content':
             return ''
         hl = highlight(
-            text=escape(content),
+            text=content,
             terms=self.highlight_items,
             analyzer=ANALYZER,
             fragmenter=FRAGMENTER,

rhodecode/templates/search/search.html

@@ -65,7 +65,7
 		</div>
 	</div>
 	${h.end_form()}
-
+    <div class="search">
     %if c.cur_search == 'content':
         <%include file='search_content.html'/>
     %elif c.cur_search == 'path':
@@ -75,6 +75,7
     %elif c.cur_search == 'repository':
         <%include file='search_repository.html'/>
     %endif
+    </div>
 </div>
 
 </%def>