zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[enh] better highlighting

This commit is contained in:
Adam Tauber 2014-05-09 02:04:20 +02:00
parent 58de2801ce
commit 5d9d04a16e
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searx/static/css/style.css
View File

@ -48,6 +48,8 @@ a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}
.right{float:right} .right{float:right}
.invisible{display:none} .invisible{display:none}
.left{float:left} .left{float:left}
.highlight{color:#094089}
.content .highlight{color:#000}
.image_result{float:left;margin:10px 10px;position:relative;height:160px}.image_result img{border:0;height:160px} .image_result{float:left;margin:10px 10px;position:relative;height:160px}.image_result img{border:0;height:160px}
.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff} .image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}
.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em} .image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}

3
searx/static/less/definitions.less
View File

@ -9,7 +9,8 @@
@color-base: #3498DB; @color-base: #3498DB;
@color-base-dark: #2980B9; @color-base-dark: #2980B9;
@color-base-light: #ECF0F1; @color-base-light: #ECF0F1;
@color-highlight: #094089;
@color-black: #000000;
/// General /// General

8
searx/static/less/style.less
View File

@ -273,6 +273,14 @@ a {
float: left; float: left;
} }
.highlight {
color: @color-highlight;
}
.content .highlight {
color: @color-black;
}
.image_result { .image_result {
float: left; float: left;
margin: 10px 10px; margin: 10px 10px;

4
searx/utils.py
View File

@ -28,7 +28,7 @@ def highlight_content(content, query):
query = query.decode('utf-8') query = query.decode('utf-8')
if content.lower().find(query.lower()) > -1: if content.lower().find(query.lower()) > -1:
query_regex = u'({0})'.format(re.escape(query)) query_regex = u'({0})'.format(re.escape(query))
content = re.sub(query_regex, '<b>\\1</b>', content, flags=re.I | re.U) content = re.sub(query_regex, '<span class="highlight">\\1</span>', content, flags=re.I | re.U)
else: else:
regex_parts = [] regex_parts = []
for chunk in query.split(): for chunk in query.split():
@ -37,7 +37,7 @@ def highlight_content(content, query):
else: else:
regex_parts.append(u'{0}'.format(re.escape(chunk))) regex_parts.append(u'{0}'.format(re.escape(chunk)))
query_regex = u'({0})'.format('|'.join(regex_parts)) query_regex = u'({0})'.format('|'.join(regex_parts))
content = re.sub(query_regex, '<b>\\1</b>', content, flags=re.I | re.U) content = re.sub(query_regex, '<span class="highlight">\\1</span>', content, flags=re.I | re.U)
return content return content