From 2e8ab34d76fa0828199697d1f8fe2b37b4dc29b9 Mon Sep 17 00:00:00 2001
From: Noemi Vanyi <sitbackandwait@gmail.com>
Date: Sun, 17 Jul 2016 18:43:47 +0200
Subject: [PATCH] add advanced settings for logicodev style

---
 .../static/themes/oscar/css/logicodev.min.css | Bin 6985 -> 8770 bytes
 .../themes/oscar/less/logicodev/advanced.less |  70 ++++++++++++++++++
 .../themes/oscar/less/logicodev/oscar.less    |   2 +
 .../themes/oscar/less/logicodev/search.less   |  44 +++++------
 .../oscar/less/logicodev/variables.less       |   2 +
 searx/templates/oscar/advanced.html           |  11 +++
 searx/templates/oscar/categories.html         |  48 +++---------
 searx/templates/oscar/preferences.html        |   2 +-
 searx/templates/oscar/results.html            |   9 ++-
 searx/templates/oscar/search.html             |   4 +-
 searx/templates/oscar/search_full.html        |   9 +--
 searx/templates/oscar/time-range.html         |  11 +++
 12 files changed, 136 insertions(+), 76 deletions(-)
 create mode 100644 searx/static/themes/oscar/less/logicodev/advanced.less
 create mode 100644 searx/templates/oscar/advanced.html
 create mode 100644 searx/templates/oscar/time-range.html

diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css
index aab5fb8415c145611ae4c8e41ebaa4fbc4127f9f..990ee2fe240cafd41f47063af9d593b95d50cfdd 100644
GIT binary patch
delta 2155
zcmcIm%WmT~6vY7TX3$_deW2)~fB~aG2Z<8-5hsz+1?5PN6+ac(iB)t#iL@;1L0O_B
z+i9wQXjc7;0<-A8yZ%)vIZ5p?#w{?d0aL`eyqA|p=U(d1${**y)%G}w=ai!%^rI08
zJ;8*5O`&Tqan*yNW&4~#C?%e7cpPHyA=ul0aquwR`#d?c{a{8pD<rdkg9s7-Aa6p7
zEfU%|%59tPM#QIF#3BoY!y*e-&43u&)|d)qp066vbkcY};!NU_P{@x)qpCqdgxMS+
zlq&@DTtr+ORVOQ$3o~z@__+G$Q>j#{0ZYjCt>@g!>2^;bC4q3bfw*`?R|kAvw2J$5
z=&#=hE{rH=j%^ohoYRE{cGrz5Ip+51*O%<(X>H}*#vwNuV6WnfhhIPX=Cdq=jhs^W
z;|zZI<Q4Zi&lk`MD(8-$$b0+KtFK-pd5CVIZ(_tn7>4GUaqd%S`#8Kqb`-d9A!M{>
z0%3}<d?DrO9a$6@v-j^0m3z!?d#~hiv;SQw8yx;Eltjq?=SulUBG%q*a<GH7o%-3O
zid`9G1^WYC1o-<9qD!0nxbdR@y({w+%rQ0{jP{>pmTbvvSHK9n*razb2$=R#6|S_#
z#n^Cc%5C8uS#E)w{UrIohVp^kqmZn(m{s>kJLXflto4(%J}1mV_d5hB6l@P#_$cr#
zW{q&Ad|(g6jvDiqb&CM@YhU%pQr}9ar|HnGfgXF*)KZ}&ra&Urk*M`00Gjn~?Pxw0
zGrKssl9e_9Vnt!jR)c}vG++%>*oZVXbb>T&#bbk9s+lua%60&r(p32#I4a}rvYA1O
zDUEeAX3=DatyXm~@C~J(&Ovg4B)6^hMwU3Yn&+`t<U4YdS`5jRdV}7OKPh#hUa8gs
zK#G;tFjne*1n@W@H%f!LRCGKO>Eh68H0&N}TCTq=&Fp>L-8Y=$nU5*fTDk%&9c9*-
z-VT>n3Yo@Jae8VYPt%g?)5;OD#&gi0mgmu6sGYe`9NyI8vl4)l@kzZa$;A>aj~sD`
zZ|kxK+D=zZ6I5<g`T9b2hBvC)@!AXhTITg0ShUWiVp9X9rq<vG=hD10=@;0)e7OXR
z&IH7&Je4~c%L86b24h~YGe<3;Mo|rP-vO-&n73^{ZZG&nTkg$U8kx5>61Qqm+?udw
z_e4Fn(g;9D(qM?>_O0%#rQwa@f(ukai{rrX=yF(;WBuy**7UG(GKpd803=t|oU2*S
ztJU7*&ML{bIiGMLW(7s>^I3VaYkAe-->LIW<5MaB{QiFQ>~FZlbnXwI<34^Oq&Mo9
T=}k~wyDT!rzy0OY-(UU(Ey@0R

delta 440
zcmaKp(MrQG6o&CuC|*n$f)|D2m1d+{RZK7EjhDWFaMEO5u+52SoYmqRc-I#Z273VS
zd>&uG)NZiBkidcbf6jl-N4{>quRf;%DZ%DSvzVGXq+!z4)XCZrXF*ppv?a^HC<ldl
zldTEP9~zEUNXs;8nR2X2H3xw&{e6bok;*@1@x;`r0U?ym2}kF!WMeO7SfFJQB;85-
z@f-ir)PBUt9h>7q+KVUyCv&t)R$&2L7QNoABgQwAI1wp_>@m0atOe<fzs(I;sa=;w
z8Dvf^<es?R@IX5dzUlaMw5MsKwNJs|Y{Z==#wt(nx)Z%^wD$ut^;BVng%V*zV{t8#
Xe^-9rqHfl|Lzh2C!-M6=aCP_#k3gXV

diff --git a/searx/static/themes/oscar/less/logicodev/advanced.less b/searx/static/themes/oscar/less/logicodev/advanced.less
new file mode 100644
index 000000000..30e4c9ea5
--- /dev/null
+++ b/searx/static/themes/oscar/less/logicodev/advanced.less
@@ -0,0 +1,70 @@
+#advanced-search-container {
+    display:none;
+    text-align:left;
+    margin-bottom:1rem;
+
+    label, .input-group-addon {
+        font-size: 1.2rem;
+        font-weight:normal;
+        background-color: white;
+        border: @mild-gray 1px solid;
+        border-right: none;
+        color: @dark-gray;
+        padding-bottom: 0.4rem;
+        padding-top: 0.4rem;
+        padding-left: 0.5rem;
+        padding-right: 0.5rem;
+    }
+
+    label:last-child, .input-group-addon:last-child {
+        border-right: @mild-gray 1px solid;
+    }
+
+    input[type="radio"] {
+        display: none;
+    }
+
+    input[type="radio"]:checked + label{
+        color: @black;
+        font-weight:bold;
+        border-bottom: @light-green 5px solid;
+    }
+    select {
+        appearance: none;
+        -webkit-appearance: none;
+        -moz-appearance: none;
+        font-size: 1.2rem;
+        font-weight:normal;
+        background-color: white;
+        border: @mild-gray 1px solid;
+        color: @dark-gray;
+        padding-bottom: 0.4rem;
+        padding-top: 0.4rem;
+        padding-left: 1rem;
+        padding-right: 5rem;
+        margin-right: 0.5rem;
+        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
+cwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGn
+sAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW8
+6/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0
+ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0w
+Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
+7jwaAAAAAElFTkSuQmCC) 96% no-repeat;
+    }
+}
+
+#check-advanced {
+    display: none;
+}
+
+#check-advanced:checked ~ #advanced-search-container {
+    display:block;
+}
+
+.advanced {
+    margin-top:1rem;
+    text-align:right;
+}
+
+
diff --git a/searx/static/themes/oscar/less/logicodev/oscar.less b/searx/static/themes/oscar/less/logicodev/oscar.less
index fba596c07..7d0d0046e 100644
--- a/searx/static/themes/oscar/less/logicodev/oscar.less
+++ b/searx/static/themes/oscar/less/logicodev/oscar.less
@@ -12,6 +12,8 @@
 
 @import "search.less";
 
+@import "advanced.less";
+
 @import "cursor.less";
 
 @import "code.less";
diff --git a/searx/static/themes/oscar/less/logicodev/search.less b/searx/static/themes/oscar/less/logicodev/search.less
index 1bb71a702..f6d6b3dc6 100644
--- a/searx/static/themes/oscar/less/logicodev/search.less
+++ b/searx/static/themes/oscar/less/logicodev/search.less
@@ -1,36 +1,28 @@
 .search_categories, #categories {
-  margin: 10px 0 4px 0;
   text-transform: capitalize;
-  
-  label{
-    border: none;
-    box-shadow: none;
-    font-size: 13px;
-    padding-bottom: 2px;
-    color: @gray;
-    margin-bottom: 5px;
+  margin-bottom: 0.5rem;
 
-    &:hover{
-        color: @black;
-        background-color: transparent;
-    }
-
-      &:active{
-        box-shadow: none;
-      }
+  label, .input-group-addon {
+    font-size: 1.2rem;
+    font-weight:normal;
+    background-color: white;
+    border: @mild-gray 1px solid;
+    border-right: none;
+    color: @dark-gray;
+    padding-bottom: 0.4rem;
+    padding-top: 0.4rem;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+  }
+  label:last-child, .input-group-addon:last-child {
+      border-right: @mild-gray 1px solid;
   }
 
-  .active, .btn-primary{
+  input[type="checkbox"]:checked + label {
     color: @black;
-    font-weight: 700;
-    border-bottom: 5px solid @light-green;
-    background-color: transparent;
+    font-weight:bold;
+    border-bottom: @light-green 5px solid;
   }
-
-}
-
-#categories{
-    margin: 0;
 }
 
 #main-logo{
diff --git a/searx/static/themes/oscar/less/logicodev/variables.less b/searx/static/themes/oscar/less/logicodev/variables.less
index 3ca05e76e..2b0e1a39b 100644
--- a/searx/static/themes/oscar/less/logicodev/variables.less
+++ b/searx/static/themes/oscar/less/logicodev/variables.less
@@ -2,6 +2,8 @@
 @gray: #A4A4A4;
 @dim-gray: #F6F9FA;
 @dark-gray: #666;
+@middle-gray: #F5F5F5;
+@mild-gray: #DDD;
 @blue: #0088CC; 
 @red: #F35E77;
 @violet: #684898;
diff --git a/searx/templates/oscar/advanced.html b/searx/templates/oscar/advanced.html
new file mode 100644
index 000000000..f2e5de513
--- /dev/null
+++ b/searx/templates/oscar/advanced.html
@@ -0,0 +1,11 @@
+<div class="input-group col-sm-12 advanced">
+    <input type="checkbox" id="check-advanced">
+    <label for="check-advanced">
+        <span class="glyphicon glyphicon-cog"></span>
+        Advanced settings
+    </label>
+    <div id="advanced-search-container">
+        {% include 'oscar/categories.html' %}
+        {% include 'oscar/time-range.html' %}
+    </div>
+</div>
diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html
index 834cffcce..d850bb744 100644
--- a/searx/templates/oscar/categories.html
+++ b/searx/templates/oscar/categories.html
@@ -1,42 +1,14 @@
-<!-- used if scripts are disabled -->
-<noscript>
-<div id="categories" class="btn-group btn-toggle">
+<div id="categories">
 {% if rtl %}
-{% for category in categories | reverse %}
-    <!--<div class="checkbox">-->
-        <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_nojs" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
-        <label class="btn btn-sm btn-primary active label_hide_if_not_checked" for="checkbox_{{ category|replace(' ', '_') }}_nojs">{{ _(category) }}</label>
-        <label class="btn btn-sm btn-default label_hide_if_checked" for="checkbox_{{ category|replace(' ', '_') }}_nojs">{{ _(category) }}</label>
-    <!--</div>-->
-    {% if category in selected_categories %}<input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_dis_activation" name="category_{{ category }}" value="off" checked="checked"/>{% endif %}
-{% endfor %}
+    {% for category in categories | reverse %}
+        <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
+        <label class="input-group-addon" for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
+        </label>
+    {% endfor %}
 {% else %}
-{% for category in categories %}
-    <!--<div class="checkbox">-->
-        <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_nojs" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
-        <label class="btn btn-sm btn-primary active label_hide_if_not_checked" for="checkbox_{{ category|replace(' ', '_') }}_nojs">{{ _(category) }}</label>
-        <label class="btn btn-sm btn-default label_hide_if_checked" for="checkbox_{{ category|replace(' ', '_') }}_nojs">{{ _(category) }}</label>
-    <!--</div>-->
-    {% if category in selected_categories %}<input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_dis_activation" name="category_{{ category }}" value="off" checked="checked"/>{% endif %}
-{% endfor %}
+    {% for category in categories %}
+        <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
+        <label class="input-group-addon" for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
+    {% endfor %}
 {% endif %}
 </div>
-</noscript>
-
-<div id="categories" class="btn-group btn-toggle hide_if_nojs" data-toggle="buttons">
-{% if rtl %}
-{% for category in categories | reverse %}
-	<label class="btn btn-sm {% if category in selected_categories %}btn-primary active{% else %}btn-default{% endif %}" data-btn-class="primary">
-        <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />{{ _(category) }}
-    </label>
-{% endfor %}
-{% else %}
-{% for category in categories %}
-    <label class="btn btn-sm {% if category in selected_categories %}btn-primary active{% else %}btn-default{% endif %}" data-btn-class="primary">
-        <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />{{ _(category) }}
-    </label>
-{% endfor %}
-{% endif %}
-</div>
-
-
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 18308bd23..89e4f499a 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -36,7 +36,7 @@
                         <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
                         {% else %}
                         <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
-                        <div class="col-sm-11 col-md-10">
+                        <div class="col-sm-11 col-md-10 search-categories">
                             {% include 'oscar/categories.html' %}
                         </div>
                         {% endif %}
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 39cdff494..e71be325a 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -1,6 +1,6 @@
 {% extends "oscar/base.html" %}
 {% block title %}{{ q }} - {% endblock %}
-{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}">{% endblock %}
+{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}&amp;time_range={{ time_range }}">{% endblock %}
 {% block content %}
     <div class="row">
         <div class="col-sm-8" id="main_results">
@@ -41,6 +41,7 @@
                         {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
                         <input type="hidden" name="q" value="{{ q }}" />
                         <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
+                        <input type="hidden" name="time_range" value="{{ time_range }}" />
                         <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-backward"></span> {{ _('next page') }}</button>
                     </form>
                 </div>
@@ -48,6 +49,7 @@
                     <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"  class="pull-left">
                         {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
                         <input type="hidden" name="pageno" value="{{ pageno-1 }}" />
+                        <input type="hidden" name="time_range" value="{{ time_range }}" />
                         <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-forward"></span> {{ _('previous page') }}</button>
                     </form>
                 </div>
@@ -60,6 +62,7 @@
                         <input type="hidden" name="q" value="{{ q }}" />
                         {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
                         <input type="hidden" name="pageno" value="{{ pageno-1 }}" />
+                        <input type="hidden" name="time_range" value="{{ time_range }}" />
                         <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-backward"></span> {{ _('previous page') }}</button>
                     </form>
                 </div>
@@ -68,6 +71,7 @@
                         {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
                         <input type="hidden" name="q" value="{{ q }}" />
                         <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
+                        <input type="hidden" name="time_range" value="{{ time_range }}" />
                         <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-forward"></span> {{ _('next page') }}</button>
                     </form>
                 </div>
@@ -118,7 +122,7 @@
                     <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="{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&amp;pageno={{ pageno }}{% endif %}" readonly>
+                            <input id="search_url" type="url" class="form-control select-all-on-click cursor-text" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&amp;pageno={{ pageno }}{% endif %}{% if time_range %}&amp;time_range={{ time_range }}{% endif %}" readonly>
                         </div>
                     </form>
 
@@ -130,6 +134,7 @@
                         <input type="hidden" name="format" value="{{ output_type }}">
                         {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1">{% endfor %}
                         <input type="hidden" name="pageno" value="{{ pageno }}">
+                        <input type="hidden" name="time_range" value="{{ time_range }}" />
                         <button type="submit" class="btn btn-default">{{ output_type }}</button>
                     </form>
                     {% endfor %}
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index e48c80fd5..6e0650a7c 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -6,7 +6,5 @@
             <button type="submit" class="btn btn-default"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
         </span>
     </div>
-    <div class="search_categories">
-            {% include 'oscar/categories.html' %}
-    </div><!-- / #search_categories -->
+    {% include 'oscar/advanced.html' %}
 </form><!-- / #search_form_full -->
diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html
index 26dae418c..4d16ef2dc 100644
--- a/searx/templates/oscar/search_full.html
+++ b/searx/templates/oscar/search_full.html
@@ -11,11 +11,8 @@
             <button type="submit" class="btn btn-default input-lg"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
         </span>
     </div>
+    <div class="input-group col-md-8 col-md-offset-2">
+        {% include 'oscar/advanced.html' %}
+    </div>
 
-    <button type="button" class="btn btn-link btn-collapse center-block collapsed hide_if_nojs" data-toggle="collapse" data-target="#search_categories" data-btn-text-collapsed="{{ _('Show search filters') }}" data-btn-text-not-collapsed="{{ _('Hide search filters') }}">{{ _('Show search filters') }}</button>
-    <div class="row collapse active_if_nojs margin_top_if_nojs" id="search_categories">
-        <div class="col-md-12 text-center">
-            {% include 'oscar/categories.html' %}
-        </div>
-    </div><!-- / #search_categories -->
 </form><!-- / #search_form_full -->
diff --git a/searx/templates/oscar/time-range.html b/searx/templates/oscar/time-range.html
new file mode 100644
index 000000000..652107817
--- /dev/null
+++ b/searx/templates/oscar/time-range.html
@@ -0,0 +1,11 @@
+<!-- Time range -->
+<div class="input-group">
+    <input type="radio" id="time-range-anytime" name="time_range" value="" {{ "checked" if time_range=="" or not time_range  else ""}}>
+    <label for="time-range-anytime" class="input-group-addon">Anytime</label>
+    <input type="radio" id="time-range-day" name="time_range" value="day" {{ "checked" if time_range=="day" else ""}}>
+    <label for="time-range-day" class="input-group-addon">Last day</label>
+    <input type="radio" id="time-range-week" name="time_range" value="week" {{ "checked" if time_range=="week" else ""}}>
+    <label for="time-range-week" class="input-group-addon">Last week</label>
+    <input type="radio" id="time-range-month" name="time_range" value="month" {{ "checked" if time_range=="month" else ""}}>
+    <label for="time-range-month" class="input-group-addon">Last month</label>
+</div>