Browse Source

Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies

Conflicts:
	searx/templates/oscar/preferences.html
Adam Tauber 10 years ago
parent
commit
41e00e65a5
1 changed files with 37 additions and 11 deletions
  1. 37
    11
      searx/templates/oscar/preferences.html

+ 37
- 11
searx/templates/oscar/preferences.html View File

@@ -17,6 +17,7 @@
17 17
           <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
18 18
           <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
19 19
           <li><a href="#tab_plugins" role="tab" data-toggle="tab">{{ _('Plugins') }}</a></li>
20
+          <li><a href="#tab_cookies" role="tab" data-toggle="tab">{{ _('Cookies') }}</a></li>
20 21
         </ul>
21 22
 
22 23
         <!-- Tab panes -->
@@ -159,22 +160,47 @@
159 160
                     <h3>{{ _('Plugins') }}</h3>
160 161
                 </noscript>
161 162
                 <fieldset>
162
-                <div class="container-fluid">
163
-                    {% for plugin in plugins %}
164
-                    <div class="panel panel-default">
165
-                        <div class="panel-heading">
166
-                            <h3 class="panel-title">{{ plugin.name }}</h3>
167
-                        </div>
168
-                        <div class="panel-body">
169
-                            <div class="col-xs-6 col-sm-4 col-md-6">{{ plugin.description }}</div>
170
-                            <div class="col-xs-6 col-sm-4 col-md-6">
171
-                                {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}
163
+                    <div class="container-fluid">
164
+                        {% for plugin in plugins %}
165
+                        <div class="panel panel-default">
166
+                            <div class="panel-heading">
167
+                                <h3 class="panel-title">{{ plugin.name }}</h3>
168
+                            </div>
169
+                            <div class="panel-body">
170
+                                <div class="col-xs-6 col-sm-4 col-md-6">{{ plugin.description }}</div>
171
+                                <div class="col-xs-6 col-sm-4 col-md-6">
172
+                                    {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}
173
+                                </div>
172 174
                             </div>
173 175
                         </div>
176
+                        {% endfor %}
174 177
                     </div>
178
+                </fieldset>
179
+            </div>
180
+
181
+            <div class="tab-pane active_if_nojs" id="tab_cookies">
182
+                <noscript>
183
+                    <h3>{{ _('Cookies') }}</h3>
184
+                </noscript>
185
+                <p class="text-muted" style="margin:20px 0;">
186
+                    {{ _('This is the list of cookies and their values searx is storing on your computer.') }}<br />
187
+                    {{ _('With that list, you can assess searx transparency.') }}<br />
188
+                </p>
189
+                <div class="container-fluid">
190
+                    <fieldset>
191
+                        <div class="row">
192
+                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted"><label>{{ _('Cookie name') }}</label></div>
193
+                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted"><label>{{ _('Value') }}</label></div>
194
+                        </div>
195
+
196
+                    {% for cookie in cookies %}
197
+                        <div class="row">
198
+                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted">{{ cookie }}</div>
199
+                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted">{{ cookies[cookie] }}</div>
200
+                        </div>
175 201
                     {% endfor %}
202
+                    </fieldset>
176 203
                 </div>
177
-                </fieldset>
178 204
             </div>
179 205
         </div>
180 206
         <p class="text-muted" style="margin:20px 0;">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}