From 5fbdb066650da80264ee219b74034db7961895df Mon Sep 17 00:00:00 2001 From: nberting Date: Sat, 9 Jun 2018 18:13:18 +0200 Subject: [PATCH] updated styling potential pdfs --- app/static/css/style.css | 5 +++++ app/templates/potential_pdf.html | 27 ++++++++++----------------- app/templates/red_link.html | 3 ++- app/templates/results.html | 8 ++++---- app/templates/show_books.html | 4 ++-- app/views.py | 4 +++- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/app/static/css/style.css b/app/static/css/style.css index ec32671..fc8faab 100755 --- a/app/static/css/style.css +++ b/app/static/css/style.css @@ -15,6 +15,11 @@ a{ text-decoration: none; color: black; } +a:hover{ + + text-decoration: underline; + color: #0000FF; +} .navigation ul{ list-style-type: none; diff --git a/app/templates/potential_pdf.html b/app/templates/potential_pdf.html index 4450325..1800cf6 100644 --- a/app/templates/potential_pdf.html +++ b/app/templates/potential_pdf.html @@ -13,27 +13,17 @@ XPPL - - - - -
-

A Potential Collection

-

Every book ever requested by XPPL librarians:

-
-

{% for pbook in pbooks %}{{ pbook.ptitle }} requested on: {{ pbook.time }} +

+

Potential Books

+ +

Archiving the gaps in the XPPL library:

+
+

{% for pbook in pbooks %}"{{ pbook.ptitle }}" requested on: {{ pbook.time|string|truncate(17,true," ")}}

{% endfor %}
- - - -
-
+
    ,   ,
   /////|
@@ -46,5 +36,8 @@
 |===|/
 '---'
+ + +
diff --git a/app/templates/red_link.html b/app/templates/red_link.html index a4d6c5c..c15e812 100755 --- a/app/templates/red_link.html +++ b/app/templates/red_link.html @@ -70,6 +70,7 @@ {{ form.upload }} {{ form.wish }} -

go back home?

+
+

Cover Title Author - Filetype + Year Category Stack Add to stack @@ -53,7 +53,7 @@

  • {{ author.author_name }}
    • {% endfor %} - {{ book.fileformat }} + {{ book.year_published }} {{ book.category}} {% for stack in book.stacks %} @@ -78,7 +78,7 @@ Cover Title Author - Filetype + Year Category Stack Add to stack @@ -94,7 +94,7 @@
  • {{ author.author_name }}
    • {% endfor %} - {{ book.fileformat }} + {{ book.year_published }} {{ book.category}} {% for stack in book.stacks %} diff --git a/app/templates/show_books.html b/app/templates/show_books.html index 1b8a369..ac9a819 100755 --- a/app/templates/show_books.html +++ b/app/templates/show_books.html @@ -32,7 +32,7 @@ Cover Title Author - Filetype + Year Category Stack Add to a stack @@ -56,7 +56,7 @@
  • {{ author.author_name }}
    • {% endfor %} - {{ book.fileformat }} + {{ book.year_published }} {{ book.category}} {% for stack in book.stacks %} diff --git a/app/views.py b/app/views.py index 565f123..ec86fd7 100755 --- a/app/views.py +++ b/app/views.py @@ -430,8 +430,10 @@ def search_results(searchtype, query, viewby): # results=Book.query.whoosh_search(query) results=Book.query.filter(Book.title.contains(query)) results=results.union(Book.query.filter(Book.category.contains(query))) + results=results.union(Book.query.filter(Book.year_published.contains(query))) results=results.union(db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query))) - results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))).order_by(Book.title) + results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))) + results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_description.contains(query))).order_by(Book.title) if results.count() == 0: upload_form = UploadForm(title= query, author='')