Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
8d6d28eb
Commit
8d6d28eb
authored
Nov 03, 2018
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'titlelink/titles-links'
Fix for #694
parents
89bddead
13883db5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
9 deletions
+22
-9
helper.py
cps/helper.py
+3
-2
author.html
cps/templates/author.html
+3
-1
discover.html
cps/templates/discover.html
+3
-1
index.html
cps/templates/index.html
+6
-2
search.html
cps/templates/search.html
+4
-2
shelf.html
cps/templates/shelf.html
+3
-1
No files found.
cps/helper.py
View file @
8d6d28eb
...
...
@@ -109,7 +109,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
text
+=
"Sincerely
\r\n\r\n
"
text
+=
"Your Calibre-Web team"
global_WorkerThread
.
add_email
(
_
(
u'Get Started with Calibre-Web'
),
None
,
None
,
ub
.
get_mail_settings
(),
e_mail
,
user_name
,
_
(
u"Registration e-mail for user:
%(name)
s"
,
name
=
user_name
),
text
)
e_mail
,
user_name
,
_
(
u"Registration e-mail for user:
%(name)
s"
,
name
=
user_name
),
text
)
return
...
...
@@ -145,7 +145,8 @@ def send_mail(book_id, kindle_mail, calibrepath, user_id):
return
_
(
u"Could not find any formats suitable for sending by e-mail"
)
if
result
:
global_WorkerThread
.
add_email
(
_
(
u"Send to Kindle"
),
book
.
path
,
result
,
ub
.
get_mail_settings
(),
kindle_mail
,
user_id
,
_
(
u"E-mail:
%(book)
s"
,
book
=
book
.
title
))
kindle_mail
,
user_id
,
_
(
u"E-mail:
%(book)
s"
,
book
=
book
.
title
),
_
(
u'This e-mail has been sent via Calibre-Web.'
))
else
:
return
_
(
u"The requested file could not be read. Maybe wrong permissions?"
)
...
...
cps/templates/author.html
View file @
8d6d28eb
...
...
@@ -36,7 +36,9 @@
</a>
</div>
<div
class=
"meta"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
</a>
<p
class=
"author"
>
{% for author in entry.authors %}
<a
href=
"{{url_for('author', book_id=author.id) }}"
>
{{author.name.replace('|',',')}}
</a>
...
...
cps/templates/discover.html
View file @
8d6d28eb
...
...
@@ -14,7 +14,9 @@
{% endif %}
</div>
<div
class=
"meta"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
</a>
<p
class=
"author"
>
{% for author in entry.authors %}
<a
href=
"{{url_for('author', book_id=author.id) }}"
>
{{author.name.replace('|',',')|shortentitle(30)}}
</a>
...
...
cps/templates/index.html
View file @
8d6d28eb
...
...
@@ -17,7 +17,9 @@
</a>
</div>
<div
class=
"meta"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
</a>
<p
class=
"author"
>
{% for author in entry.authors %}
<a
href=
"{{url_for('author', book_id=author.id) }}"
>
{{author.name.replace('|',',')|shortentitle(30)}}
</a>
...
...
@@ -60,7 +62,9 @@
</a>
</div>
<div
class=
"meta"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
</a>
<p
class=
"author"
>
{% for author in entry.authors %}
<a
href=
"{{url_for('author', book_id=author.id) }}"
>
{{author.name.replace('|',',')|shortentitle(30)}}
</a>
...
...
cps/templates/search.html
View file @
8d6d28eb
...
...
@@ -5,7 +5,7 @@
<
h2
>
{{_('No Results for:')}} {{searchterm}}
</h2>
<p>
{{_('Please try a different search')}}
</p>
{% else %}
<h2>
{{entries|length}} {{_('Results for:')}} {{searchterm}}
</h2>
<h2>
{{entries|length}} {{_('Results for:')}} {{searchterm}}
</h2>
{% if g.user.is_authenticated %}
{% if g.user.shelf.all() or g.public_shelfes %}
<div
id=
"shelf-actions"
class=
"btn-toolbar"
role=
"toolbar"
>
...
...
@@ -41,7 +41,9 @@
{% endif %}
</div>
<div
class=
"meta"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
</a>
<p
class=
"author"
>
{% for author in entry.authors %}
<a
href=
"{{url_for('author', book_id=author.id ) }}"
>
{{author.name.replace('|',',')}}
</a>
...
...
cps/templates/shelf.html
View file @
8d6d28eb
...
...
@@ -23,7 +23,9 @@
</a>
</div>
<div
class=
"meta"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
</a>
<p
class=
"author"
>
{% for author in entry.authors %}
<a
href=
"{{url_for('author', book_id=author.id) }}"
>
{{author.name.replace('|',',')}}
</a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment