commit: 06b9238786df1b353a041ff339e2c3a9085db72c
parent: ba9305afee904313c706800ac14058c308226e1a
Author: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 17 Mar 2014 18:30:08 +0100
[fix] #38
Diffstat:
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/searx/static/css/style.css b/searx/static/css/style.css
@@ -12,7 +12,7 @@ a:hover.hmarg{color:#3498db}
.top_margin{margin-top:60px}
.center{text-align:center}
h1{font-size:5em}
-div.title{background:url('/static/img/searx.png') no-repeat;width:100%;background-position:center}div.title h1{visibility:hidden}
+div.title{background:url('static/img/searx.png') no-repeat;width:100%;background-position:center}div.title h1{visibility:hidden}
input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}
input[type="checkbox"]{visibility:hidden}
fieldset{margin:8px;border:1px solid #3498db}
@@ -55,14 +55,14 @@ tr:hover{background:#ddd}
#search_wrapper{position:relative;max-width:600px;padding:10px}
.center #search_wrapper{margin-left:auto;margin-right:auto}
.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}
-#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('/static/img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}
+#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('static/img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}
#results{margin:10px;padding:0;margin-bottom:20px}
#sidebar{position:absolute;left:54em;width:15em;margin:0 2px 5px 5px;padding:0 2px 2px 2px}
#suggestions span{display:block;margin:0 2px 2px 2px;padding:0}
#suggestions form{display:block}
#suggestions input{padding:2px 6px;margin:2px 4px;font-size:.8em;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}
#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:20em;display:block;margin:4px}
-#preferences{top:10px;padding:0;border:0;background:url('/static/img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}
+#preferences{top:10px;padding:0;border:0;background:url('static/img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}
#pagination{clear:both}
#apis{margin-top:8px;clear:both}
@media screen and (max-width:60em){#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto} #suggestions span{display:inline;font-size:.8em} #suggestions form{display:inline} #suggestions input{padding:2px 6px;margin:2px 4px;font-size:.8em;display:inline-block;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}}@media screen and (max-width:680px){#search_wrapper{width:90%;clear:both;overflow:hidden} .right{display:none;postion:fixed !important;top:100px;right:0} #apis{display:none} #categories{font-size:80%;clear:both}#categories .checkbox_container{margin-top:2px;margin:0 2px} .checkbox_container{display:block;width:100%}.checkbox_container label{border-bottom:0} .result{border-top:1px solid #e8e7e6;margin:7px 0 6px 0}.result img{max-width:90%;width:auto;height:auto}}.favicon{float:left;margin-right:4px;margin-top:2px}
diff --git a/searx/static/less/style.less b/searx/static/less/style.less
@@ -87,7 +87,7 @@ h1 {
}
div.title {
- background: url('/static/img/searx.png') no-repeat;
+ background: url('static/img/searx.png') no-repeat;
width: 100%;
background-position: center;
@@ -388,7 +388,7 @@ tr {
right: 1px;
padding: 0;
border: 0;
- background: url('/static/img/search-icon.png') no-repeat;
+ background: url('static/img/search-icon.png') no-repeat;
background-size: 24px 24px;
opacity: 0.8;
width: 24px;
@@ -451,7 +451,7 @@ tr {
top: 10px;
padding: 0;
border: 0;
- background: url('/static/img/preference-icon.png') no-repeat;
+ background: url('static/img/preference-icon.png') no-repeat;
background-size: 28px 28px;
opacity: 0.8;
width: 28px;
diff --git a/searx/templates/about.html b/searx/templates/about.html
@@ -45,7 +45,7 @@ Searx can be added to your browser's search bar; moreover, it can be set as the
<h2 id="faq">FAQ</h2>
<h3>How to add to firefox?</h3>
-<p><a href="#" onclick="window.external.AddSearchProvider(window.location.protocol + '//' + window.location.host + '/opensearch.xml')">Install</a> searx as a search engine on any version of Firefox! (javascript required)</p>
+<p><a href="#" onclick="window.external.AddSearchProvider(window.location.protocol + '//' + window.location.host + '{{ url_for('opensearch') }}');">Install</a> searx as a search engine on any version of Firefox! (javascript required)</p>
<h2 id="dev_faq">Developer FAQ</h2>
diff --git a/searx/webapp.py b/searx/webapp.py
@@ -250,7 +250,7 @@ def preferences():
if engine_name in engines:
blocked_engines.append(engine_name)
- resp = make_response(redirect('/'))
+ resp = make_response(redirect(url_for('index')))
user_blocked_engines = request.cookies.get('blocked_engines', '').split(',') # noqa
