EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #590 from Gluejar/author-search 

add link to author name [#25583953]
pull/1/head
Raymond Yee 2016-06-15 09:17:26 -10:00 committed by GitHub
parent 5d6cbaf472 a189b0a8c2
commit bc5c7a383b
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/templates/search.html
View File

@ -106,7 +106,7 @@ $j(document).ready(function() {
loader: '<img src="/static/images/loading.gif" alt="loading..." />',
callback: function(p) {
page += 1;
var url = "?q={{ q }}&gbo={{ gbo }}&page=" + page;
var url = "?q={{ q }}&gbo={{ gbo }}&ty={{ ty }}&page=" + page;
$j.get(url, function(html) {
var view = $j(".listview").length > 0 ? "list" : "panel";
var results = $j(html).find(".book");

6
frontend/templates/work.html
View File

@ -96,9 +96,9 @@
<div>
<div class="pubinfo">
<h3 class="book-author">
<span itemprop="author">{{ work.relators.0.name }}</span>{% ifequal work.authors.count 2 %}
and <span itemprop="author">{{ work.relators.1.name }}</span>
{% endifequal %}{% if work.relators.count > 2 %}{% for author in work.relators %}{% if not forloop.first %}, <span itemprop="author">{{ author.name }}</span>{% endif %}{% endfor %}
<span itemprop="author"><a href="{% url 'search' %}?q={{ work.relators.0.author.name|urlencode }}&amp;ty=au" />{{ work.relators.0.name }}</a></span>{% ifequal work.authors.count 2 %}
and <span itemprop="author"><a href="{% url 'search' %}?q={{ work.relators.1.author.name|urlencode }}&amp;ty=au" />{{ work.relators.1.name }}</a></span>
{% endifequal %}{% if work.relators.count > 2 %}{% for author in work.relators %}{% if not forloop.first %}, <span itemprop="author"><a href="{% url 'search' %}?q={{ author.author.name|urlencode }}&amp;ty=au" />{{ author.name }}</a></span>{% endif %}{% endfor %}
{% endif %}
</h3>
<h3 class="book-year">

4
frontend/views.py
View File

@ -2218,6 +2218,7 @@ class ManageAccount(FormView):
def search(request):
q = request.GET.get('q', '')
ty = request.GET.get('q', 'g') # ge= 'general, au= 'author'
request.session['q']=q
page = int(request.GET.get('page', 1))
gbo = request.GET.get('gbo', 'n') # gbo is flag for google books only
@ -2226,6 +2227,8 @@ def search(request):
isbnq = ISBN(q)
if isbnq.valid:
work_query = Q(identifiers__value=str(isbnq), identifiers__type="isbn")
elif ty=='au':
work_query = Q(editions__authors__name=q)
else:
work_query = Q(title__icontains=q) | Q(editions__authors__name__icontains=q) | Q(subjects__name__iexact=q)
campaign_works = models.Work.objects.filter(our_stuff).filter(work_query).distinct()
@ -2252,6 +2255,7 @@ def search(request):
context = {
"q": q,
"gbo": gbo,
"ty": ty,
"results": works,
"campaign_works": campaign_works
}

2
static/css/campaign2.css
View File

File diff suppressed because one or more lines are too long

2
static/css/manage_campaign.css
View File

File diff suppressed because one or more lines are too long

6
static/less/book_detail.less
View File

@ -41,6 +41,12 @@
font-weight:normal;
color:@text-blue;
}
h3.book-author span a, h3.book-year span a{
font-size: @font-size-default;
font-weight:normal;
color:@link-color;
}
> div {
width:100%;