Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-11 05:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cps/static/css/caliBlur.css
View File

@ -2174,7 +2174,7 @@ body.langlist > div.container-fluid > div > div.col-sm-10:before {
content: "\e034" 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; top: 60px;
font-size: 24px; font-size: 24px;
color: #eee; color: #eee;
@ -2244,10 +2244,14 @@ body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before
content: "Languages" content: "Languages"
} }
body.advsearch > div.container-fluid > div > div.col-sm-10:before { body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
content: "Advanced Search"; padding: 15px 10px 15px 40px;
margin-left: 20%; }
left: 0
@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 { body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before {

1
cps/templates/search_form.html
View File

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

4
cps/web.py
View File

@ -951,7 +951,7 @@ def render_prepare_search_form(cc):
else: else:
languages = None languages = None
return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions, 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): 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, pagination=pagination,
entries=q[offset:limit_all], entries=q[offset:limit_all],
result_count=result_count, result_count=result_count,
title=_(u"search"), page="advsearch") title=_(u"Advanced Search"), page="advsearch")