searx

commit: ead8d30ea0a9d46896bd996b079457de0a56f582
parent: c761d93dd6889d60a4c5d01c21bea1a9f6384011
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sat, 10 May 2014 06:39:07 +0200

[mod] inline suggestions

Diffstat:
M
searx/static/css/style.css
8
+++++---
M
searx/static/less/style.less
25
++++++++++++++-----------
M
searx/templates/results.html
20
++++++++++----------

3 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/searx/static/css/style.css b/searx/static/css/style.css
@@ -62,11 +62,13 @@ tr:hover{background:#ddd}
 #results{margin:auto;padding:0;width:50em;margin-bottom:20px}
 #sidebar{position:absolute;top:100px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}
 #sidebar input[type="submit"]{text-decoration:underline}
-#suggestions span{display:block;margin:0 2px 2px 2px;padding:0}
-#suggestions form{display:block}
+#suggestions span{display:inline;margin:0 2px 2px 2px;padding:0}
+#suggestions input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}
+#suggestions input[type="submit"]{text-decoration:underline}
+#suggestions form{display:inline}
 #search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}
 #preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}
 #pagination{clear:both;width:40em}
 #apis{margin-top:8px;clear:both}
-@media screen and (max-width:50em){#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto} #results{margin:auto;padding:0;width:90%} .checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}}@media screen and (max-width:70em){#suggestions span{display:inline} #suggestions form{display:inline} .right{display:none;postion:fixed !important;top:100px;right:0} #sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0} #apis{display:none} #search_url{display:none} .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}
+@media screen and (max-width:50em){#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto} #results{margin:auto;padding:0;width:90%} .checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}}@media screen and (max-width:70em){.right{display:none;postion:fixed !important;top:100px;right:0} #sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0} #apis{display:none} #search_url{display:none} .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}
 .preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff}
diff --git a/searx/static/less/style.less b/searx/static/less/style.less
@@ -383,13 +383,25 @@ tr {
 #suggestions {
 
 	span {
-		display: block;
+		display: inline;
 		margin: 0 2px 2px 2px;
 		padding: 0;
 	}
+	input {
+		padding: 0;
+		margin: 3px;
+		font-size: 0.8em;
+		display: inline-block;
+        background: transparent;
+        color: @color-result-search-url-font;
+		cursor: pointer;
+	}
+    input[type="submit"] {
+		text-decoration: underline;
+    }
 
 	form {
-		display: block;
+		display: inline;
 	}
 }
 
@@ -463,15 +475,6 @@ tr {
 }
 
 @media screen and (max-width: 70em) {
-	#suggestions {
-		span {
-			display: inline;
-		}
-
-		form {
-			display: inline;
-		}
-	}
 	.right {
 		display: none;
 		postion: fixed !important;
diff --git a/searx/templates/results.html b/searx/templates/results.html
@@ -7,16 +7,6 @@
 </div>
 <div id="results">
     <div id="sidebar">
-        {% if suggestions %}
-        <div id="suggestions"><span>{{ _('Suggestions') }}</span>
-            {% for suggestion in suggestions %}
-            <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
-                <input type="hidden" name="q" value="{{ suggestion }}">
-                <input type="submit" value="{{ suggestion }}" />
-            </form>
-            {% endfor %}
-        </div>
-        {% endif %}
 
         <div id="search_url">
             {{ _('Search URL') }}:
@@ -40,6 +30,16 @@
         </div>
     </div>
 
+    {% if suggestions %}
+    <div id="suggestions"><span>{{ _('Suggestions') }}</span>
+        {% for suggestion in suggestions %}
+        <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
+            <input type="hidden" name="q" value="{{ suggestion }}">
+            <input type="submit" value="{{ suggestion }}" />
+        </form>
+        {% endfor %}
+    </div>
+    {% endif %}
 
     {% for result in results %}
         {% if result['template'] %}