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
9b1954f2
Commit
9b1954f2
authored
Sep 29, 2018
by
bodybybuddha
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/janeczku/calibre-web
into 617
parents
29efcf83
c36b1ed5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
15 deletions
+30
-15
config_view_edit.html
cps/templates/config_view_edit.html
+1
-1
layout.html
cps/templates/layout.html
+2
-2
shelf.html
cps/templates/shelf.html
+11
-9
user_edit.html
cps/templates/user_edit.html
+2
-2
web.py
cps/web.py
+14
-1
No files found.
cps/templates/config_view_edit.html
View file @
9b1954f2
...
...
@@ -160,7 +160,7 @@
</div>
</div>
<div
class=
"col-sm-12"
>
<button
type=
"submit"
class=
"btn btn-default"
>
{{_('Submit')}}
</button>
<button
type=
"submit"
name=
"submit"
class=
"btn btn-default"
>
{{_('Submit')}}
</button>
<a
href=
"{{ url_for('admin') }}"
class=
"btn btn-default"
>
{{_('Back')}}
</a>
</div>
</form>
...
...
cps/templates/layout.html
View file @
9b1954f2
...
...
@@ -165,11 +165,11 @@
{% if g.user.is_authenticated or g.user.is_anonymous %}
<li
class=
"nav-head hidden-xs"
>
{{_('Public Shelves')}}
</li>
{% for shelf in g.public_shelfes %}
<li><a
href=
"{{url_for('show_shelf', shelf_id=shelf.id)}}"
><span
class=
"glyphicon glyphicon-list
"
></span>
{{shelf.name
}}
</a></li>
<li><a
href=
"{{url_for('show_shelf', shelf_id=shelf.id)}}"
><span
class=
"glyphicon glyphicon-list
public_shelf"
></span>
{{shelf.name|shortentitle(40)
}}
</a></li>
{% endfor %}
<li
class=
"nav-head hidden-xs"
>
{{_('Your Shelves')}}
</li>
{% for shelf in g.user.shelf %}
<li><a
href=
"{{url_for('show_shelf', shelf_id=shelf.id)}}"
><span
class=
"glyphicon glyphicon-list
"
></span>
{{shelf.name
}}
</a></li>
<li><a
href=
"{{url_for('show_shelf', shelf_id=shelf.id)}}"
><span
class=
"glyphicon glyphicon-list
private_shelf"
></span>
{{shelf.name|shortentitle(40)
}}
</a></li>
{% endfor %}
{% if not g.user.is_anonymous %}
<li
id=
"nav_createshelf"
class=
"create-shelf"
><a
href=
"{{url_for('create_shelf')}}"
>
{{_('Create a Shelf')}}
</a></li>
...
...
cps/templates/shelf.html
View file @
9b1954f2
...
...
@@ -4,9 +4,9 @@
<h2>
{{title}}
</h2>
{% if g.user.is_authenticated %}
{% if (g.user.role_edit_shelfs() and shelf.is_public ) or not shelf.is_public %}
<div
data-toggle=
"modal"
data-target=
"#DeleteShelfDialog"
class=
"btn btn-danger"
>
{{ _('Delete this Shelf') }}
</div>
<a
href=
"{{ url_for('edit_shelf', shelf_id=shelf.id) }}"
class=
"btn btn-primary"
>
{{ _('Edit Shelf') }}
</a>
<a
href=
"{{ url_for('order_shelf', shelf_id=shelf.id) }}"
class=
"btn btn-primary"
>
{{ _('Change order') }}
</a>
<div
id=
"delete_shelf"
data-toggle=
"modal"
data-target=
"#DeleteShelfDialog"
class=
"btn btn-danger"
>
{{ _('Delete this Shelf') }}
</div>
<a
id=
"edit_shelf"
href=
"{{ url_for('edit_shelf', shelf_id=shelf.id) }}"
class=
"btn btn-primary"
>
{{ _('Edit Shelf') }}
</a>
<a
id=
"order_shelf"
href=
"{{ url_for('order_shelf', shelf_id=shelf.id) }}"
class=
"btn btn-primary"
>
{{ _('Change order') }}
</a>
{% endif %}
{% endif %}
<div
class=
"row"
>
...
...
@@ -14,11 +14,13 @@
{% for entry in entries %}
<div
class=
"col-sm-3 col-lg-2 col-xs-6 book"
>
<div
class=
"cover"
>
{% if entry.has_cover is defined %}
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<img
src=
"{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}"
/>
</a>
{% endif %}
<a
href=
"{{ url_for('show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
{% if entry.has_cover %}
<img
src=
"{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}"
alt=
"{{ entry.title }}"
/>
{% else %}
<img
src=
"{{ url_for('static', filename='generic_cover.jpg') }}"
alt=
"{{ entry.title }}"
/>
{% endif %}
</a>
</div>
<div
class=
"meta"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
...
...
@@ -56,7 +58,7 @@
<div
class=
"modal-body text-center"
>
<span>
{{_('Shelf will be lost for everybody and forever!')}}
</span>
<p></p>
<a
href=
"{{ url_for('delete_shelf', shelf_id=shelf.id) }}"
class=
"btn btn-danger"
>
{{_('Ok')}}
</a>
<a
id=
"confirm"
href=
"{{ url_for('delete_shelf', shelf_id=shelf.id) }}"
class=
"btn btn-danger"
>
{{_('Ok')}}
</a>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
{{_('Back')}}
</button>
</div>
</div>
...
...
cps/templates/user_edit.html
View file @
9b1954f2
...
...
@@ -140,7 +140,7 @@
{% if g.user and g.user.role_admin() and not profile and not new_user and not content.role_anonymous() %}
<div
class=
"checkbox"
>
<label>
<input
type=
"checkbox"
name=
"delete"
>
{{_('Delete this user')}}
<input
type=
"checkbox"
id=
"delete"
name=
"delete"
>
{{_('Delete this user')}}
</label>
</div>
{% endif %}
...
...
@@ -149,8 +149,8 @@
<button
type=
"submit"
id=
"submit"
class=
"btn btn-default"
>
{{_('Submit')}}
</button>
{% if not profile %}
<a
href=
"{{ url_for('admin') }}"
id=
"back"
class=
"btn btn-default"
>
{{_('Back')}}
</a>
</div>
{% endif %}
</div>
</form>
{% if downloads %}
...
...
cps/web.py
View file @
9b1954f2
...
...
@@ -2428,18 +2428,22 @@ def add_to_shelf(shelf_id, book_id):
if
shelf
is
None
:
app
.
logger
.
info
(
"Invalid shelf specified"
)
if
not
request
.
is_xhr
:
flash
(
_
(
u"Invalid shelf specified"
),
category
=
"error"
)
return
redirect
(
url_for
(
'index'
))
return
"Invalid shelf specified"
,
400
if
not
shelf
.
is_public
and
not
shelf
.
user_id
==
int
(
current_user
.
id
):
app
.
logger
.
info
(
"Sorry you are not allowed to add a book to the the shelf:
%
s"
%
shelf
.
name
)
if
not
request
.
is_xhr
:
flash
(
_
(
u"Sorry you are not allowed to add a book to the the shelf:
%(shelfname)
s"
,
shelfname
=
shelf
.
name
),
category
=
"error"
)
return
redirect
(
url_for
(
'index'
))
return
"Sorry you are not allowed to add a book to the the shelf:
%
s"
%
shelf
.
name
,
403
if
shelf
.
is_public
and
not
current_user
.
role_edit_shelfs
():
app
.
logger
.
info
(
"User is not allowed to edit public shelves"
)
if
not
request
.
is_xhr
:
flash
(
_
(
u"You are not allowed to edit public shelves"
),
category
=
"error"
)
return
redirect
(
url_for
(
'index'
))
return
"User is not allowed to edit public shelves"
,
403
...
...
@@ -2448,6 +2452,7 @@ def add_to_shelf(shelf_id, book_id):
if
book_in_shelf
:
app
.
logger
.
info
(
"Book is already part of the shelf:
%
s"
%
shelf
.
name
)
if
not
request
.
is_xhr
:
flash
(
_
(
u"Book is already part of the shelf:
%(shelfname)
s"
,
shelfname
=
shelf
.
name
),
category
=
"error"
)
return
redirect
(
url_for
(
'index'
))
return
"Book is already part of the shelf:
%
s"
%
shelf
.
name
,
400
...
...
@@ -2462,7 +2467,10 @@ def add_to_shelf(shelf_id, book_id):
ub
.
session
.
commit
()
if
not
request
.
is_xhr
:
flash
(
_
(
u"Book has been added to shelf:
%(sname)
s"
,
sname
=
shelf
.
name
),
category
=
"success"
)
return
redirect
(
request
.
environ
[
"HTTP_REFERER"
])
if
"HTTP_REFERER"
in
request
.
environ
:
return
redirect
(
request
.
environ
[
"HTTP_REFERER"
])
else
:
return
redirect
(
url_for
(
'index'
))
return
""
,
204
...
...
@@ -3118,6 +3126,11 @@ def new_user():
content
.
sidebar_view
+=
ub
.
SIDEBAR_AUTHOR
if
"show_detail_random"
in
to_save
:
content
.
sidebar_view
+=
ub
.
DETAIL_RANDOM
if
"show_sorted"
in
to_save
:
content
.
sidebar_view
+=
ub
.
SIDEBAR_SORTED
if
"show_recent"
in
to_save
:
content
.
sidebar_view
+=
ub
.
SIDEBAR_RECENT
content
.
role
=
0
if
"admin_role"
in
to_save
:
content
.
role
=
content
.
role
+
ub
.
ROLE_ADMIN
...
...
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