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

Unverified Commit a3bbf95a authored by Markus Heiser's avatar Markus Heiser Committed by GitHub
Browse files

Merge pull request #1781 from finn0/bug/oscar-theme 

Oscar: move info box at top of the page
parents 17b6faa4 1d86d005

searx/templates/oscar/results.html

+62 −62
Original line number Diff line number Diff line
@@ -15,7 +15,68 @@ 
    {% include 'oscar/search.html' %}



    <div class="row">

        <div class="col-sm-8" id="main_results">

        <div class="col-sm-4 col-sm-push-8" id="sidebar_results">

            {% if number_of_results != '0' -%}

                <p><small>{{ _('Number of results') }}: {{ number_of_results }}</small></p>

            {%- endif %}



            {% if unresponsive_engines and results|length >= 1 -%}

            <div class="alert alert-danger fade in" role="alert">

                <p>{{ _('Engines cannot retrieve results') }}:</p>

                {%- for engine_name, error_type in unresponsive_engines -%}

                {{- engine_name }} ({{ error_type }}){% if not loop.last %}, {% endif %}{{- "" -}}

                {%- endfor -%}

            </div>

            {%- endif %}



            {% if infoboxes -%}

                {% for infobox in infoboxes %}

                    {% include 'oscar/infobox.html' %}{{- "\n\n" -}}

                {% endfor %}

            {%- endif %}



            {% if suggestions %}

            <div class="panel panel-default">

                <div class="panel-heading">

                    <h4 class="panel-title">{{ _('Suggestions') }}</h4>

                </div>

                <div class="panel-body">

                    {% for suggestion in suggestions %}

                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} suggestion_item">

                        <input type="hidden" name="q" value="{{ suggestion.url }}">

                        <button type="submit" class="btn btn-default btn-xs">{{ suggestion.title }}</button>

                    </form>

                    {% endfor %}

                </div>

            </div>

            {%- endif %}



            <div class="panel panel-default">

                <div class="panel-heading">{{- "" -}}

                    <h4 class="panel-title">{{ _('Links') }}</h4>{{- "" -}}

                </div>

                <div class="panel-body">

                    <form role="form">{{- "" -}}

                        <div class="form-group">{{- "" -}}

                            <label for="search_url">{{ _('Search URL') }}</label>{{- "" -}}

                            <input id="search_url" type="url" class="form-control select-all-on-click cursor-text" name="search_url" value="{{ search_url() }}" readonly>{{- "" -}}

                        </div>{{- "" -}}

                    </form>

                    <label>{{ _('Download results') }}</label>

                    <div class="clearfix"></div>

                    {% for output_type in ('csv', 'json', 'rss') %}

                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} result_download">

                        {{- search_form_attrs(pageno) -}}

                        <input type="hidden" name="format" value="{{ output_type }}">{{- "" -}}

                        <button type="submit" class="btn btn-default">{{ output_type }}</button>{{- "" -}}

                    </form>

                    {% endfor %}

                    <div class="clearfix"></div>

                </div>

            </div>

        </div><!-- /#sidebar_results -->



        <div class="col-sm-8 col-sm-pull-4" id="main_results">

            <h1 class="sr-only">{{ _('Search results') }}</h1>



            {% if corrections -%}
@@ -91,66 +152,5 @@ 
            {% endif %}

            {% endif %}

        </div><!-- /#main_results -->



        <div class="col-sm-4" id="sidebar_results">

            {% if number_of_results != '0' -%}

                <p><small>{{ _('Number of results') }}: {{ number_of_results }}</small></p>

            {%- endif %}



            {% if unresponsive_engines and results|length >= 1 -%}

            <div class="alert alert-danger fade in" role="alert">

                <p>{{ _('Engines cannot retrieve results') }}:</p>

                {%- for engine_name, error_type in unresponsive_engines -%}

                {{- engine_name }} ({{ error_type }}){% if not loop.last %}, {% endif %}{{- "" -}}

                {%- endfor -%}

            </div>

            {%- endif %}



            {% if infoboxes -%}

                {% for infobox in infoboxes %}

                    {% include 'oscar/infobox.html' %}{{- "\n\n" -}}

                {% endfor %}

            {%- endif %}



            {% if suggestions %}

            <div class="panel panel-default">

                <div class="panel-heading">

                    <h4 class="panel-title">{{ _('Suggestions') }}</h4>

                </div>

                <div class="panel-body">

                    {% for suggestion in suggestions %}

                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} suggestion_item">

                        <input type="hidden" name="q" value="{{ suggestion.url }}">

                        <button type="submit" class="btn btn-default btn-xs">{{ suggestion.title }}</button>

                    </form>

                    {% endfor %}

                </div>

            </div>

            {%- endif %}



            <div class="panel panel-default">

                <div class="panel-heading">{{- "" -}}

                    <h4 class="panel-title">{{ _('Links') }}</h4>{{- "" -}}

                </div>

                <div class="panel-body">

                    <form role="form">{{- "" -}}

                        <div class="form-group">{{- "" -}}

                            <label for="search_url">{{ _('Search URL') }}</label>{{- "" -}}

                            <input id="search_url" type="url" class="form-control select-all-on-click cursor-text" name="search_url" value="{{ search_url() }}" readonly>{{- "" -}}

                        </div>{{- "" -}}

                    </form>

                    <label>{{ _('Download results') }}</label>

                    <div class="clearfix"></div>

                    {% for output_type in ('csv', 'json', 'rss') %}

                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} result_download">

                        {{- search_form_attrs(pageno) -}}

                        <input type="hidden" name="format" value="{{ output_type }}">{{- "" -}}

                        <button type="submit" class="btn btn-default">{{ output_type }}</button>{{- "" -}}

                    </form>

                    {% endfor %}

                    <div class="clearfix"></div>

                </div>

            </div>

        </div><!-- /#sidebar_results -->

    </div>

{% endblock %}