Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master

This commit is contained in:
Ozzieisaacs 2020-10-10 12:29:30 +02:00
commit e1d5c2c578
3 changed files with 12 additions and 7 deletions

View File

@ -2174,7 +2174,7 @@ body.langlist > div.container-fluid > div > div.col-sm-10:before {
content: "\e034"
}
body.advsearch > div.container-fluid > div > div.col-sm-10:before, body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
top: 60px;
font-size: 24px;
color: #eee;
@ -2244,10 +2244,14 @@ body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before
content: "Languages"
}
body.advsearch > div.container-fluid > div > div.col-sm-10:before {
content: "Advanced Search";
margin-left: 20%;
left: 0
body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
padding: 15px 10px 15px 40px;
}
@media screen and (max-width: 992px) {
body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
padding-left: 20px;
}
}
body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before {

View File

@ -1,5 +1,6 @@
{% extends "layout.html" %}
{% block body %}
<h1 class="{{page}}">{{title}}</h1>
<div class="col-md-10 col-lg-6">
<form role="form" id="search" action="{{ url_for('web.advanced_search_form') }}" method="POST">
<div class="form-group">

View File

@ -951,7 +951,7 @@ def render_prepare_search_form(cc):
else:
languages = None
return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
series=series, title=_(u"search"), cc=cc, page="advsearch")
series=series, title=_(u"Advanced Search"), cc=cc, page="advsearch")
def render_search_results(term, offset=None, order=None, limit=None):
@ -1392,7 +1392,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
pagination=pagination,
entries=q[offset:limit_all],
result_count=result_count,
title=_(u"search"), page="advsearch")
title=_(u"Advanced Search"), page="advsearch")