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

Commit 46ceca3c authored by Johnny Kalajdzic's avatar Johnny Kalajdzic
Browse files

change preferences engines interface

parent f530137f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ general:
    instance_name : "eelo" # displayed name

search:
    safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
    safe_search : 2 # Filter results. 0: None, 1: Moderate, 2: Strict
    autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
    language : "en-US"

+40 −14
Original line number Diff line number Diff line
@@ -185,13 +185,7 @@ input.btn[type="submit"] {
  -moz-appearance: none;
  font-weight: normal;
  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
cwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGn
sAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW8
6/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0
ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0w
Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
7jwaAAAAAElFTkSuQmCC) 96% no-repeat;
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGnsAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW86/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNy0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC) 96% no-repeat;
}
.custom-select.flat {
  border: none;
@@ -598,17 +592,11 @@ footer {
  display: flex;
  margin-bottom: 8px;
}
#preferences #engines .engine .data {
#preferences #engines .engine {
  width: 100%;
  margin-left: 16px;
  margin-right: 16px;
}
#preferences #engines .engine input:checked ~ .data .danger {
  display: inline;
}
#preferences #engines .engine input:not(:checked) ~ .data i.danger {
  display: none;
}
@media screen and (max-width: 600px) {
  .preference.inline {
    flex-direction: column;
@@ -617,3 +605,41 @@ footer {
    margin-bottom: 8px;
  }
}

.checkmark::after {
    left: 9px;
    top: 5px;
    width: 5px;
    height: 10px;
    border: solid white;
    border-width: 0 3px 3px 0;
    -webkit-transform: rotate(45deg);
    -ms-transform: rotate(45deg);
    transform: rotate(45deg);
    content: "";
    position: absolute;
    display: none;
}

.checkmark {
    position: absolute;
    height: 25px;
    width: 25px;
    background: #ccc;
}

.checkmark_input {
    display: none;
}

.checkmark_input:not(:checked) + .checkmark {
    background: #2196F3;
}

.checkmark_input:not(:checked) + .checkmark::after {
    display: block;
}
.data {
    margin-left: 35px;
    height: 38px;
}
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,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/logicodev.min.css') }}" type="text/css" /> -->
    <!-- <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" /> -->
    <link rel="stylesheet" href="{{ url_for('static', filename='css/eelo.min.css') }}" type="text/css" />
    <link rel="stylesheet" href="{{ url_for('static', filename='css/eelo.css') }}" type="text/css" />

    {% for css in styles %}
        <link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" />
+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@
{%- endmacro %}

{% macro checkbox_toggle(id, blocked) -%}
    <input type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox">
    <input class="checkmark_input" type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox">
    <label for="{{ id }}" class="checkmark"></label>
{%- endmacro %}

{% macro support_toggle(supports) -%}
+2 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@
        <input type="radio" class="tab-radio" id="tab_engines_r" value="engines" name="tab">
        <div id="tab_engines" class="tab-content">

            {% for categ in all_categories %}
            {% for categ in ['general', 'images'] %}
            <!-- <input type="radio" class="tab-radio" id="" value="" name="engines_category_tab"> -->
            <section id="engines">
                <h3>{{categ}}</h3>
@@ -97,9 +97,7 @@
                        {% set disabled = (search_engine.name, categ) in disabled_engines %}
                        {{ checkbox_toggle('engine_' + search_engine.name | replace(' ', '_') + '__' + categ | replace(' ', '_'), disabled) }}
                        <span class="data">
                            <div><b>{{ search_engine.name }}</b> <i>{{_("Shortcuts")}}</i> {{ shortcuts[search_engine.name] }} 
                                <i class="danger">({{_('disabled')}})</i>
                            </div>
                           <b>{{ search_engine.name }}</b><br>
                            <small class="danger"><i>
                                {% set support_text_str = [(stats[search_engine.name].supports_selected_language, "%s %s " | format(locales[current_locale], _("not supported"))), 
                                                           (search_engine.safesearch == True, _("No safe search")),