Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e30dc2f0 authored by Alexandre Flament's avatar Alexandre Flament Committed by GitHub
Browse files

Merge pull request #2247 from dalf/fix-opensearch 

[fix] opensearch.xml URL contains method and autocomplete parameters
parents 474d56c7 bfdad7bc

searx/templates/__common__/opensearch.xml

+4 −0
Original line number Diff line number Diff line
@@ -15,4 +15,8 @@ 
  {% if autocomplete %}

    <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/>

  {% endif %}



  <Url type="application/opensearchdescription+xml"

      rel="self"

      template="{{ opensearch_url }}" />

</OpenSearchDescription>

searx/templates/__common__/opensearch_response_rss.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>

    <opensearch:startIndex>1</opensearch:startIndex>

    <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>

    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ base_url }}opensearch.xml"/>

    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ opensearch_url }}"/>

    <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />

    {% if error_message %}

    <item>

searx/templates/courgette/base.html

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        {% endblock %}

        {% block meta %}{% endblock %}

        {% block head %}

        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>

        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>

        {% endblock %}

        <script type="text/javascript">

            searx = {};

searx/templates/legacy/base.html

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
        {% endblock %}

        {% block meta %}{% endblock %}

        {% block head %}

        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>

        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>

        {% endblock %}

    </head>

    <body class="{{ endpoint }}_endpoint" >

searx/templates/oscar/base.html

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    {% block head %}

    {% endblock %}



    <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>

    <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>

    <noscript>

        <style type="text/css">

            .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;}