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
979bcdff
Commit
979bcdff
authored
Jul 09, 2017
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix non working download links
Bugfix missing divider in detail page
parent
31e00250
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
17 deletions
+21
-17
style.css
cps/static/css/style.css
+1
-1
detail.html
cps/templates/detail.html
+20
-16
No files found.
cps/static/css/style.css
View file @
979bcdff
...
@@ -44,7 +44,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
...
@@ -44,7 +44,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
.btn-file
input
[
type
=
file
]
{
position
:
absolute
;
top
:
0
;
right
:
0
;
min-width
:
100%
;
min-height
:
100%
;
font-size
:
100px
;
text-align
:
right
;
filter
:
alpha
(
opacity
=
0
);
opacity
:
0
;
outline
:
none
;
background
:
white
;
cursor
:
inherit
;
display
:
block
;}
.btn-file
input
[
type
=
file
]
{
position
:
absolute
;
top
:
0
;
right
:
0
;
min-width
:
100%
;
min-height
:
100%
;
font-size
:
100px
;
text-align
:
right
;
filter
:
alpha
(
opacity
=
0
);
opacity
:
0
;
outline
:
none
;
background
:
white
;
cursor
:
inherit
;
display
:
block
;}
.btn-toolbar
.btn
,
.discover
.btn
{
margin-bottom
:
5px
;
}
.btn-toolbar
.btn
,
.discover
.btn
{
margin-bottom
:
5px
;
}
.button-link
{
color
:
#fff
;}
.btn-primary
:hover
,
.btn-primary
:focus
,
.btn-primary
:active
,
.btn-primary.active
,
.open
.dropdown-toggle.btn-primary
{
background-color
:
#1C5484
;
}
.btn-primary
:hover
,
.btn-primary
:focus
,
.btn-primary
:active
,
.btn-primary.active
,
.open
.dropdown-toggle.btn-primary
{
background-color
:
#1C5484
;
}
.btn-primary.disabled
,
.btn-primary
[
disabled
],
fieldset
[
disabled
]
.btn-primary
,
.btn-primary.disabled
:hover
,
.btn-primary
[
disabled
]
:hover
,
fieldset
[
disabled
]
.btn-primary
:hover
,
.btn-primary.disabled
:focus
,
.btn-primary
[
disabled
]
:focus
,
fieldset
[
disabled
]
.btn-primary
:focus
,
.btn-primary.disabled
:active
,
.btn-primary
[
disabled
]
:active
,
fieldset
[
disabled
]
.btn-primary
:active
,
.btn-primary.disabled.active
,
.btn-primary
[
disabled
]
.active
,
fieldset
[
disabled
]
.btn-primary.active
{
background-color
:
#89B9E2
;
}
.btn-primary.disabled
,
.btn-primary
[
disabled
],
fieldset
[
disabled
]
.btn-primary
,
.btn-primary.disabled
:hover
,
.btn-primary
[
disabled
]
:hover
,
fieldset
[
disabled
]
.btn-primary
:hover
,
.btn-primary.disabled
:focus
,
.btn-primary
[
disabled
]
:focus
,
fieldset
[
disabled
]
.btn-primary
:focus
,
.btn-primary.disabled
:active
,
.btn-primary
[
disabled
]
:active
,
fieldset
[
disabled
]
.btn-primary
:active
,
.btn-primary.disabled.active
,
.btn-primary
[
disabled
]
.active
,
fieldset
[
disabled
]
.btn-primary.active
{
background-color
:
#89B9E2
;
}
.btn-toolbar
>
.btn
+
.btn
,
.btn-toolbar
>
.btn-group
+
.btn
,
.btn-toolbar
>
.btn
+
.btn-group
,
.btn-toolbar
>
.btn-group
+
.btn-group
{
margin-left
:
0px
;
}
.btn-toolbar
>
.btn
+
.btn
,
.btn-toolbar
>
.btn-group
+
.btn
,
.btn-toolbar
>
.btn
+
.btn-group
,
.btn-toolbar
>
.btn-group
+
.btn-group
{
margin-left
:
0px
;
}
...
...
cps/templates/detail.html
View file @
979bcdff
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
</div>
</div>
</div>
</div>
<div
class=
"col-sm-9 col-lg-9 book-meta"
>
<div
class=
"col-sm-9 col-lg-9 book-meta"
>
<div
class=
"more-stuff"
>
<div
class=
"btn-toolbar"
role=
"toolbar"
>
<div
class=
"btn-toolbar"
role=
"toolbar"
>
<div
class=
"btn-group"
role=
"group"
aria-label=
"Download, send to Kindle, reading"
>
<div
class=
"btn-group"
role=
"group"
aria-label=
"Download, send to Kindle, reading"
>
{% if g.user.role_download() %}
{% if g.user.role_download() %}
...
@@ -22,12 +21,9 @@
...
@@ -22,12 +21,9 @@
{{_('Download')}} :
{{_('Download')}} :
</button>
</button>
{% for format in entry.data %}
{% for format in entry.data %}
<button
id=
"btnGroupDrop1{{format.format|lower}}"
type=
"button"
class=
"btn btn-primary"
>
<a
href=
"{{ url_for('get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format) }}"
id=
"btnGroupDrop1{{format.format|lower}}"
class=
"btn btn-primary"
role=
"button"
>
<a
class=
"button-link"
href=
"{{ url_for('get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format) }}"
>
<span
class=
"glyphicon glyphicon-download"
></span>
{{format.format}}
<span
class=
"glyphicon glyphicon-download"
></span>
</a>
{{format.format}}
</a>
</button>
{% endfor %}
{% endfor %}
{% else %}
{% else %}
<button
id=
"btnGroupDrop1"
type=
"button"
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<button
id=
"btnGroupDrop1"
type=
"button"
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
...
@@ -63,6 +59,7 @@
...
@@ -63,6 +59,7 @@
{% endif %}
{% endif %}
</div>
</div>
</div>
</div>
<h2>
{{entry.title}}
</h2>
<h2>
{{entry.title}}
</h2>
<p
class=
"author"
>
<p
class=
"author"
>
{% for author in entry.authors %}
{% for author in entry.authors %}
...
@@ -106,20 +103,22 @@
...
@@ -106,20 +103,22 @@
{% for identifier in entry.identifiers %}
{% for identifier in entry.identifiers %}
<a
href=
"{{identifier}}"
target=
"_blank"
class=
"btn btn-xs btn-success"
role=
"button"
>
{{identifier.formatType()}}
</a>
<a
href=
"{{identifier}}"
target=
"_blank"
class=
"btn btn-xs btn-success"
role=
"button"
>
{{identifier.formatType()}}
</a>
{%endfor%}
{%endfor%}
</div>
</p>
</p>
</div>
{% endif %}
{% endif %}
{% if entry.tags|length > 0 %}
{% if entry.tags|length > 0 %}
<p>
<div
class=
"tags"
>
<div
class=
"tags"
>
<p>
<span
class=
"glyphicon glyphicon-tags"
></span>
<span
class=
"glyphicon glyphicon-tags"
></span>
{% for tag in entry.tags %}
{% for tag in entry.tags %}
<a
href=
"{{ url_for('category', book_id=tag.id) }}"
class=
"btn btn-xs btn-info"
role=
"button"
>
{{tag.name}}
</a>
<a
href=
"{{ url_for('category', book_id=tag.id) }}"
class=
"btn btn-xs btn-info"
role=
"button"
>
{{tag.name}}
</a>
{%endfor%}
{%endfor%}
</div>
</p>
</p>
</div>
{% endif %}
{% endif %}
{% if entry.publishers|length > 0 %}
{% if entry.publishers|length > 0 %}
<div
class=
"publishers"
>
<div
class=
"publishers"
>
...
@@ -132,8 +131,9 @@
...
@@ -132,8 +131,9 @@
<p>
{{_('Publishing date')}}: {{entry.pubdate|formatdate}}
</p>
<p>
{{_('Publishing date')}}: {{entry.pubdate|formatdate}}
</p>
{% endif %}
{% endif %}
{% if cc|length > 0 %}
{% if cc|length > 0 %}
<p>
<div
class=
"custom_columns"
>
<div
class=
"custom_columns"
>
<p>
{% for c in cc %}
{% for c in cc %}
{% if entry['custom_column_' ~ c.id]|length > 0 %}
{% if entry['custom_column_' ~ c.id]|length > 0 %}
{{ c.name }}:
{{ c.name }}:
...
@@ -155,20 +155,21 @@
...
@@ -155,20 +155,21 @@
<br
/>
<br
/>
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
</div>
</p>
</p>
</div>
{% endif %}
{% endif %}
{% if not g.user.is_anonymous() %}
{% if not g.user.is_anonymous() %}
<p>
<div
class=
"custom_columns"
>
<div
class=
"custom_columns"
>
<p>
<form
id=
"have_read_form"
action=
"{{ url_for('toggle_read', book_id=entry.id)}}"
method=
"POST"
>
<form
id=
"have_read_form"
action=
"{{ url_for('toggle_read', book_id=entry.id)}}"
method=
"POST"
>
<label
class=
"block-label"
>
<label
class=
"block-label"
>
<input
id=
"have_read_cb"
type=
"checkbox"
{%
if
have_read
%}
checked
{%
endif
%}
>
<input
id=
"have_read_cb"
type=
"checkbox"
{%
if
have_read
%}
checked
{%
endif
%}
>
<span>
{{_('Read')}}
</span>
<span>
{{_('Read')}}
</span>
</label>
</label>
</form>
</form>
</p>
</div>
</div>
</p>
{% endif %}
{% endif %}
...
@@ -178,7 +179,8 @@
...
@@ -178,7 +179,8 @@
{% endif %}
{% endif %}
</br>
<div
class=
"more-stuff"
>
{% if g.user.is_authenticated %}
{% if g.user.is_authenticated %}
{% if g.user.shelf.all() or g.public_shelfes %}
{% if g.user.shelf.all() or g.public_shelfes %}
<div
class=
"btn-toolbar"
role=
"toolbar"
>
<div
class=
"btn-toolbar"
role=
"toolbar"
>
...
@@ -220,18 +222,20 @@
...
@@ -220,18 +222,20 @@
</div>
</div>
</div>
</div>
{% endif %}
{% endif %}
{% endif %}
{% endif %}
{% if g.user.role_edit() %}
{% if g.user.role_edit() %}
<div
class=
"btn-toolbar"
role=
"toolbar"
>
<div
class=
"btn-toolbar"
role=
"toolbar"
>
<div
class=
"btn-group"
role=
"group"
aria-label=
"Edit/Delete book"
>
<div
class=
"btn-group"
role=
"group"
aria-label=
"Edit/Delete book"
>
<a
href=
"{{ url_for('edit_book', book_id=entry.id) }}"
class=
"btn btn-sm btn-warning"
role=
"button"
><span
class=
"glyphicon glyphicon-edit"
></span>
{{_('Edit metadata')}}
</a>
<a
href=
"{{ url_for('edit_book', book_id=entry.id) }}"
class=
"btn btn-sm btn-warning"
role=
"button"
><span
class=
"glyphicon glyphicon-edit"
></span>
{{_('Edit metadata')}}
</a>
</div>
</div>
</div>
{% endif %}
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
{% endblock %}
{% block js %}
{% block js %}
...
...
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