Merge pull request #127 from pointhi/template_oscar_map

Template oscar, add map support

searx/engines/openstreetmap.py

@@ -15,7 +15,7 @@ categories = ['map']
 paging = False
 
 # search-url
-url = 'https://nominatim.openstreetmap.org/search/{query}?format=json'
+url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1'
 
 result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'
 
@@ -38,9 +38,54 @@ def response(resp):
         osm_type = r.get('osm_type', r.get('type'))
         url = result_base_url.format(osm_type=osm_type,
                                      osm_id=r['osm_id'])
+
+        osm = {'type':osm_type,
+               'id':r['osm_id']}
+
+        geojson =  r.get('geojson')
+
+        # if no geojson is found and osm_type is a node, add geojson Point
+        if not geojson and\
+           osm_type == 'node':
+            geojson = {u'type':u'Point', 
+                       u'coordinates':[r['lon'],r['lat']]}
+
+        address_raw = r.get('address')
+        address = {}
+
+        # get name
+        if r['class'] == 'amenity' or\
+           r['class'] == 'shop' or\
+           r['class'] == 'tourism' or\
+           r['class'] == 'leisure':
+            if address_raw.get('address29'):
+                address = {'name':address_raw.get('address29')}
+            else:
+                address = {'name':address_raw.get(r['type'])}
+
+        # add rest of adressdata, if something is already found
+        if address.get('name'):
+            address.update({'house_number':address_raw.get('house_number'),
+                       'road':address_raw.get('road'),
+                       'locality':address_raw.get('city',
+                                  address_raw.get('town', 
+                                  address_raw.get('village'))),
+                       'postcode':address_raw.get('postcode'),
+                       'country':address_raw.get('country'),
+                       'country_code':address_raw.get('country_code')})
+        else:
+            address = None
+
         # append result
-        results.append({'title': title,
+        results.append({'template': 'map.html',
+                        'title': title,
                         'content': '',
+                        'longitude': r['lon'],
+                        'latitude': r['lat'],
+                        'boundingbox': r['boundingbox'],
+                        'geojson': geojson,
+                        'address': address,
+                        'osm': osm,
                         'url': url})
 
     # return results

searx/static/oscar/js/scripts.js

@@ -7,6 +7,13 @@
 
 */
 
+requirejs.config({
+baseUrl: '/static/oscar/js',
+paths: {
+app: '../app'
+}
+});
+
 if(searx.autocompleter) {
     searx.searchResults = new Bloodhound({
         datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
@@ -61,4 +68,157 @@ $(document).ready(function(){
             source: searx.searchResults.ttAdapter()
         });
     }
+    
+    $(".searx_overpass_request").on( "click", function( event ) {
+        var overpass_url = "http://overpass-api.de/api/interpreter?data=";
+        var query_start = overpass_url + "[out:json][timeout:25];(";
+        var query_end = ");out meta;";
+        
+        var osm_id = $(this).data('osm-id');
+        var osm_type = $(this).data('osm-type');
+        var result_table = $(this).data('result-table');
+        var result_table_loadicon = "#" + $(this).data('result-table-loadicon');
+        
+        // tags which can be ignored
+        var osm_ignore_tags = [ "addr:city", "addr:country", "addr:housenumber", "addr:postcode", "addr:street" ]
+        
+        if(osm_id && osm_type && result_table) {
+            result_table = "#" + result_table;
+            var query = null;
+            switch(osm_type) {
+                case 'node':
+                    query = query_start + "node(" + osm_id + ");" + query_end;
+                    break;
+                case 'way':
+                    query = query_start + "way(" + osm_id + ");" + query_end;
+                    break;
+                case 'relation':
+                    query = query_start + "relation(" + osm_id + ");" + query_end;
+                    break;
+                default:
+                    break;
+            }
+            if(query) {
+                //alert(query);
+                var ajaxRequest = $.ajax( query )
+                .done(function( html) {
+                    if(html && html['elements'] && html['elements'][0]) {
+                        var element = html['elements'][0];
+                        var newHtml = $(result_table).html();
+                        for (var row in element.tags) {
+                            if(element.tags["name"] == null || osm_ignore_tags.indexOf(row) == -1) {
+                                newHtml += "<tr><td>" + row + "</td><td>";
+                                switch(row) {
+                                    case "phone":
+                                    case "fax":
+                                        newHtml += "<a href=\"tel:" + element.tags[row].replace(/ /g,'') + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "email":
+                                        newHtml += "<a href=\"mailto:" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "website":
+                                    case "url":
+                                        newHtml += "<a href=\"" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikidata":
+                                        newHtml += "<a href=\"https://www.wikidata.org/wiki/" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikipedia":
+                                        if(element.tags[row].indexOf(":") != -1) {
+                                            newHtml += "<a href=\"https://" + element.tags[row].substring(0,element.tags[row].indexOf(":")) + ".wikipedia.org/wiki/" 
+                                                + element.tags[row].substring(element.tags[row].indexOf(":")+1) + "\">" + element.tags[row] + "</a>";
+                                            break;
+                                        }
+                                    default:
+                                        newHtml += element.tags[row];
+                                        break;
+                                }
+                                newHtml += "</td></tr>";
+                            }
+                        }
+                        $(result_table).html(newHtml);
+                        $(result_table).removeClass('hidden');
+                        $(result_table_loadicon).addClass('hidden');
+                    }
+                })
+                .fail(function() {
+                    alert( "could not load " );
+                })
+            }
+        }
+
+        // this event occour only once per element
+        $( this ).off( event );    
+    });
+
+    $(".searx_init_map").on( "click", function( event ) {
+        var leaflet_target = $(this).data('leaflet-target');
+        var map_lon = $(this).data('map-lon');
+        var map_lat = $(this).data('map-lat');
+        var map_zoom = $(this).data('map-zoom');
+        var map_boundingbox = $(this).data('map-boundingbox');
+        var map_geojson = $(this).data('map-geojson');
+  
+        require(['leaflet-0.7.3.min'], function(leaflet) {
+            if(map_boundingbox) {
+                var southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]),
+                    northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]),
+                    map_bounds = L.latLngBounds(southWest, northEast);
+            }
+
+            // TODO hack
+            // change default imagePath
+            L.Icon.Default.imagePath = 	"/static/oscar/img/map";
+
+            // init map
+            var map = L.map(leaflet_target);
+
+            // create the tile layer with correct attribution
+	        var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+	        var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	        var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
+	        
+	        var osmMapquestUrl='http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg';
+	        var osmMapquestAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">';
+	        var osmMapquest = new L.TileLayer(osmMapquestUrl, {minZoom: 1, maxZoom: 18, subdomains: '1234', attribution: osmMapquestAttrib});
+	        
+	        var osmMapquestOpenAerialUrl='http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg';
+	        var osmMapquestOpenAerialAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png"> | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';
+	        var osmMapquestOpenAerial = new L.TileLayer(osmMapquestOpenAerialUrl, {minZoom: 1, maxZoom: 11, subdomains: '1234', attribution: osmMapquestOpenAerialAttrib});
+
+            // init map view
+            if(map_bounds) {
+                // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021
+                setTimeout(function () {
+                    map.fitBounds(map_bounds, {
+                        maxZoom:17
+                    });
+                }, 0);
+            } else if (map_lon && map_lat) {
+                if(map_zoom) 
+                    map.setView(new L.LatLng(map_lat, map_lon),map_zoom);
+                else
+                    map.setView(new L.LatLng(map_lat, map_lon),8);
+            }
+
+	        map.addLayer(osmMapquest);
+	        
+	        var baseLayers = {
+             "OSM Mapnik": osmMapnik,
+             "MapQuest": osmMapquest/*,
+             "MapQuest Open Aerial": osmMapquestOpenAerial*/
+            };
+
+            L.control.layers(baseLayers).addTo(map);
+
+
+            if(map_geojson)
+                L.geoJson(map_geojson).addTo(map);
+            /*else if(map_bounds)
+                L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/
+        });
+
+        // this event occour only once per element
+        $( this ).off( event );
+    });
 });  

searx/static/oscar/less/oscar/cursor.less

@@ -2,3 +2,7 @@
 .cursor-text {
     cursor: text !important;
 }
+
+.cursor-pointer {
+    cursor: pointer !important;
+}

searx/static/oscar/less/oscar/results.less

@@ -1,3 +1,29 @@
+
+.result_header {
+    margin-bottom:5px;
+    margin-top:20px;
+
+    .favicon {
+        margin-bottom:-3px;
+    }
+    
+    a {
+        vertical-align: bottom;
+        
+        .highlight {
+            font-weight:bold;
+        }
+    }
+}
+
+.result-content {
+    margin-top: 5px;
+
+    .highlight {
+        font-weight:bold;
+    }
+}
+
 // default formating of results
 .result-default {
     clear: both;
@@ -24,6 +50,11 @@
     clear: both;
 }
 
+// map formating of results
+.result-map {
+    clear: both;
+}
+
 // suggestion
 .suggestion_item {
     margin: 2px 5px;

searx/templates/courgette/result_templates/map.html

@@ -0,0 +1,13 @@
+<div class="result {{ result.class }}">
+
+  {% if result['favicon'] %}
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
+  {% endif %}
+
+  <div>
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+	{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
+    <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
+    <p class="url">{{ result.pretty_url }}</p>
+  </div>
+</div>

searx/templates/default/result_templates/map.html

@@ -0,0 +1,13 @@
+<div class="result {{ result.class }}">
+
+  {% if result['favicon'] %}
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
+  {% endif %}
+
+  <div>
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
+	{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
+    <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
+  </div>
+</div>

searx/templates/oscar/base.html

@@ -11,6 +11,7 @@
     
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -71,6 +72,7 @@
     <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
     {% if autocomplete %}<script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %}
+    <script src="{{ url_for('static', filename='js/require-2.1.15.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/scripts.js') }}"></script>
 </body>
 </html>

searx/templates/oscar/result_templates/default.html

@@ -1,8 +1,13 @@
-<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+{% from 'oscar/macros.html' import icon %}
+
+<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
 
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+<small><a class="text-info" href="https://web.archive.org/web/{{ result.pretty_url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
 
-{% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
+{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
+
+<div class="clearfix"></div>
 
 <span class="label label-default pull-right">{{ result.engine }}</span>
 <p class="text-muted">{{ result.pretty_url }}</p>

searx/templates/oscar/result_templates/images.html

@@ -11,9 +11,10 @@
             </div>
             <div class="modal-body">
                 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
-                {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
+                {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
             </div>
             <div class="modal-footer">
+                <div class="clearfix"></div>
                 <span class="label label-default pull-right">{{ result.engine }}</span>
                 <p class="text-muted pull-left">{{ result.pretty_url }}</p>
                 <div class="clearfix"></div>

searx/templates/oscar/result_templates/map.html

@@ -0,0 +1,74 @@
+{% from 'oscar/macros.html' import icon %}
+
+<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
+
+{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+
+<small><a class="text-info" href="https://web.archive.org/web/{{ result.pretty_url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
+
+{% if (result.latitude and result.longitude) or result.boundingbox %}
+    <small> &bull; <a class="text-info btn-collapse collapsed searx_init_map cursor-pointer" data-toggle="collapse" data-target="#result-map-{{ index }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %} data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}">{{ icon('globe') }} {{ _('show map') }}</a></small>
+{% endif %}
+
+{% if result.osm and (result.osm.type and result.osm.id) %}
+    <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer searx_overpass_request" data-toggle="collapse" data-target="#result-overpass-{{ index }}" data-osm-type="{{ result.osm.type }}" data-osm-id="{{ result.osm.id }}" data-result-table="result-overpass-table-{{ index }}" data-result-table-loadicon="result-overpass-table-loading-{{ index }}" data-btn-text-collapsed="{{ _('show details') }}" data-btn-text-not-collapsed="{{ _('hide details') }}">{{ icon('map-marker') }} {{ _('show details') }}</a></small>
+{% endif %}
+
+{# {% if (result.latitude and result.longitude) %}
+    <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer" data-toggle="collapse" data-target="#result-geodata-{{ index }}" data-btn-text-collapsed="{{ _('show geodata') }}" data-btn-text-not-collapsed="{{ _('hide geodata') }}">{{ icon('map-marker') }} {{ _('show geodata') }}</a></small>
+{% endif %} #}
+
+<div class="container-fluid">
+
+{% if result.address %}
+<p class="row result-content result-adress col-xs-12 col-sm-5 col-md-4" itemscope itemtype="http://schema.org/PostalAddress">
+    {% if result.address.name %}
+        <strong itemprop="name">{{ result.address.name }}</strong><br/>
+    {% endif %}
+    {% if result.address.road %}
+        <span itemprop="streetAddress">
+            {% if result.address.house_number %}{{ result.address.house_number }}, {% endif %}
+            {{ result.address.road }}
+        </span><br/>
+    {% endif %}
+    {% if result.address.locality %}
+        <span itemprop="addressLocality">{{ result.address.locality }}</span>
+        {% if result.address.postcode %}, <span itemprop="postalCode">{{ result.address.postcode }}</span>{% endif %}
+        <br/>
+    {% endif %}
+    {% if result.address.country %}
+        <span itemprop="addressCountry">{{ result.address.country }}</span>
+    {% endif %}
+</p>
+{% endif %}
+
+{% if result.osm and (result.osm.type and result.osm.id) %}
+    <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}">
+        <div class="text-center" id="result-overpass-table-loading-{{ index }}"><img src="{{ url_for('static', filename='img/loader.gif') }}" alt="Loading ..."/></div>
+        <table class="table table-striped table-condensed hidden" id="result-overpass-table-{{ index }}">
+            <tr><th>key</th><th>value</th></tr>
+        </table>
+    </div>
+{% endif %}
+
+{# {% if (result.latitude and result.longitude) %}
+    <div class="row collapse col-xs-12 col-sm-5 col-md-4" id="result-geodata-{{ index }}">
+        <strong>Longitude:</strong> {{ result.longitude }} <br/>
+        <strong>Latitude:</strong> {{ result.latitude }}
+    </div>
+{% endif %} #}
+
+{% if result.content %}<p class="row result-content col-xs-12 col-sm-12 col-md-12">{{ result.content|safe }}</p>{% endif %}
+
+</div>
+    
+{% if (result.latitude and result.longitude) or result.boundingbox %}
+    <div class="collapse" id="result-map-{{ index }}">
+        <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
+    </div>
+{% endif %}
+
+<div class="clearfix"></div>
+
+<span class="label label-default pull-right">{{ result.engine }}</span>
+<p class="text-muted">{{ result.pretty_url }}</p>

searx/templates/oscar/result_templates/torrent.html

@@ -1,14 +1,17 @@
 {% from 'oscar/macros.html' import icon %}
 
-<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
 
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+<small><a class="text-info" href="https://web.archive.org/web/{{ result.pretty_url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
 
-<p>{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span>, {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span></p>
+<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span>, {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>
+<br/>
+<a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} magnet link</a></p>
 
-<p><a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} magnet link</a></p>
+{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
 
-{% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
+<div class="clearfix"></div>
 
 <span class="label label-default pull-right">{{ result.engine }}</span>
 <p class="text-muted">{{ result.pretty_url }}</p>

searx/templates/oscar/result_templates/videos.html

@@ -1,13 +1,18 @@
-<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+{% from 'oscar/macros.html' import icon %}
+
+<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
     
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+<small><a class="text-info" href="https://web.archive.org/web/{{ result.pretty_url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
 
 <div class="container-fluid">
     <div class="row">
-        <img class="thumbnail col-xs-6 col-sm-4 col-md-4" src="{{ result.thumbnail|safe }}" />
+        <img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" />
-        {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif %}
+        {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}
     </div>
 </div>
 
+<div class="clearfix"></div>
+
 <span class="label label-default pull-right">{{ result.engine }}</span>
 <p class="text-muted">{{ result.pretty_url }}</p>

searx/translations/de/LC_MESSAGES/messages.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-03-15 18:40+0000\n"
 "Last-Translator: pointhi\n"
 "Language-Team: German "
@@ -216,13 +216,13 @@ msgstr "Suchmaschinenstatistik"
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
-msgstr ""
+msgstr "eine privatsphären respektierende, hackbare Metasuchmaschine"
 
 #: searx/templates/oscar/navbar.html:6
 msgid "Toggle navigation"
@@ -230,7 +230,7 @@ msgstr ""
 
 #: searx/templates/oscar/navbar.html:15
 msgid "home"
-msgstr ""
+msgstr "Startseite"
 
 #: searx/templates/oscar/preferences.html:11
 msgid "General"
@@ -238,19 +238,19 @@ msgstr "Allgemein"
 
 #: searx/templates/oscar/preferences.html:12
 msgid "Engines"
-msgstr ""
+msgstr "Suchmaschinen"
 
 #: searx/templates/oscar/preferences.html:36
 msgid "What language do you prefer for search?"
-msgstr ""
+msgstr "Welche Sprache bevorzugst du für die Suche?"
 
 #: searx/templates/oscar/preferences.html:47
 msgid "Change the language of the layout"
-msgstr ""
+msgstr "Ändere die Sprache des Layouts"
 
 #: searx/templates/oscar/preferences.html:60
 msgid "Find stuff as you type"
-msgstr ""
+msgstr "finde Sachen während der Eingabe"
 
 #: searx/templates/oscar/preferences.html:70
 msgid ""
@@ -258,14 +258,17 @@ msgid ""
 "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
 " rel=\"external\">learn more about request methods</a>"
 msgstr ""
+"ändere wie Formulare übertragen werden, <a "
+"href=\"https://de.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-Anfragemethoden\""
+" rel=\"external\">lerne mehr über Anfragemethoden</a>"
 
 #: searx/templates/oscar/preferences.html:81
 msgid "Change searx layout"
-msgstr ""
+msgstr "ändere das Aussehen von searx"
 
 #: searx/templates/oscar/results.html:6
 msgid "Search results"
-msgstr ""
+msgstr "Suchergebnisse"
 
 #: searx/templates/oscar/results.html:73
 msgid "Links"
@@ -273,31 +276,31 @@ msgstr ""
 
 #: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
 msgid "Start search"
-msgstr ""
+msgstr "Suche starten"
 
 #: searx/templates/oscar/search_full.html:11
 msgid "Show search filters"
-msgstr ""
+msgstr "Suchfilter anzeigen"
 
 #: searx/templates/oscar/search_full.html:11
 msgid "Hide search filters"
-msgstr ""
+msgstr "Suchfilter verstecke"
 
 #: searx/templates/oscar/stats.html:2
 msgid "stats"
-msgstr ""
+msgstr "Statistiken"
 
 #: searx/templates/oscar/messages/first_time.html:4
 #: searx/templates/oscar/messages/no_results.html:5
 #: searx/templates/oscar/messages/save_settings_successfull.html:5
 #: searx/templates/oscar/messages/unknow_error.html:5
 msgid "Close"
-msgstr ""
+msgstr "Schließen"
 
 #: searx/templates/oscar/messages/first_time.html:6
 #: searx/templates/oscar/messages/no_data_available.html:3
 msgid "Heads up!"
-msgstr ""
+msgstr "Information!"
 
 #: searx/templates/oscar/messages/first_time.html:7
 msgid "It look like you are using searx first time."
@@ -305,55 +308,79 @@ msgstr ""
 
 #: searx/templates/oscar/messages/js_disabled.html:2
 msgid "Warning!"
-msgstr ""
+msgstr "Warnung!"
 
 #: searx/templates/oscar/messages/js_disabled.html:3
 msgid "Please enable JavaScript to use full functionality of this site."
-msgstr ""
+msgstr "Bitte aktiviere JavaScript um alle möglichkeiten dieser Seite zu nutzen."
 
 #: searx/templates/oscar/messages/no_data_available.html:4
 msgid "There is currently no data available. "
-msgstr ""
+msgstr "Es sind derzeit keine Daten vorhanden."
 
 #: searx/templates/oscar/messages/no_results.html:7
 msgid "Sorry!"
-msgstr ""
+msgstr "Entschuldigung!"
 
 #: searx/templates/oscar/messages/no_results.html:8
 msgid ""
 "we didn't find any results. Please use another query or search in more "
 "categories."
-msgstr ""
+msgstr "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen "
+"anderen Suchbegriff oder Suche das gewünschte in einer anderen Kategorie."
 
 #: searx/templates/oscar/messages/save_settings_successfull.html:7
 msgid "Well done!"
-msgstr ""
+msgstr "Gut gemacht!"
 
 #: searx/templates/oscar/messages/save_settings_successfull.html:8
 msgid "Settings saved successfully."
-msgstr ""
+msgstr "Einstellungen wurden erfolgreich gespeichert."
 
 #: searx/templates/oscar/messages/unknow_error.html:7
 msgid "Oh snap!"
-msgstr ""
+msgstr "Verdammt!"
 
 #: searx/templates/oscar/messages/unknow_error.html:8
 msgid "Something went wrong."
-msgstr ""
+msgstr "Irgendetwas ist falsch gelaufen."
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
-msgstr ""
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
+msgstr "cached"
 
 #: searx/templates/oscar/result_templates/images.html:21
-msgid "View source"
+msgid "Get image"
-msgstr ""
+msgstr "Bild ansehen"
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/images.html:22
+msgid "View source"
+msgstr "Seite besuchen"
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr "Karte anzeigen"
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr "Karte verstecken"
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr "Details anzeigen"
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr "Details verstecke"
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""
 

searx/translations/en/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-01-30 15:22+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
@@ -333,19 +333,42 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
 msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:22
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""
 

searx/translations/es/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-09-08 11:01+0000\n"
 "Last-Translator: Alejandro León Aznar\n"
 "Language-Team: Spanish "
@@ -214,11 +214,11 @@ msgstr "Estadísticas del motor de búsqueda"
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
@@ -339,19 +339,42 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
 msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:22
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""
 

searx/translations/fr/LC_MESSAGES/messages.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-09-07 21:24+0000\n"
 "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
 "Language-Team: French "
@@ -216,11 +216,11 @@ msgstr "Statistiques du moteur"
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
@@ -341,19 +341,42 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
 msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:22
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""
 

searx/translations/hu/LC_MESSAGES/messages.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-09-07 21:30+0000\n"
 "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
 "Language-Team: Hungarian "
@@ -213,11 +213,11 @@ msgstr "Kereső statisztikák"
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
@@ -338,19 +338,42 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
 msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:22
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""
 

searx/translations/it/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-09-08 08:19+0000\n"
 "Last-Translator: dp <d.pitrolo@gmx.com>\n"
 "Language-Team: Italian "
@@ -214,11 +214,11 @@ msgstr "Statistiche dei motori"
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
@@ -339,19 +339,42 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
 msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:22
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""
 

searx/translations/ja/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-10-05 16:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <LL@li.org>\n"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
@@ -333,19 +333,42 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
 msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:22
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""
 

searx/translations/nl/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"POT-Creation-Date: 2014-11-19 15:14+0100\n"
 "PO-Revision-Date: 2014-09-09 15:33+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch "
@@ -214,11 +214,11 @@ msgstr "Zoekmachinestatistieken"
 msgid "Answers"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:61
+#: searx/templates/oscar/base.html:62
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
@@ -339,19 +339,42 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:20
+#: searx/templates/oscar/result_templates/default.html:6
-msgid "Get image"
+#: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/oscar/result_templates/videos.html:6
+msgid "cached"
 msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:22
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "show map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:10
+msgid "hide map"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "show details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/map.html:14
+msgid "hide details"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
 msgstr ""