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
8e956365
Commit
8e956365
authored
Jan 19, 2019
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'caliblur/master'
parents
9e5fa45d
b1d2b68b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
3 deletions
+28
-3
caliBlur.min.css
cps/static/css/caliBlur.min.css
+1
-1
caliBlur.js
cps/static/js/caliBlur.js
+26
-1
detail.html
cps/templates/detail.html
+1
-1
No files found.
cps/static/css/caliBlur.min.css
View file @
8e956365
This diff is collapsed.
Click to expand it.
cps/static/js/caliBlur.js
View file @
8e956365
...
...
@@ -188,6 +188,7 @@ return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
// Move dropdown lists higher in dom, replace bootstrap toggle with own toggle.
$
(
'ul[aria-labelledby="read-in-browser"]'
).
insertBefore
(
'.blur-wrapper'
).
addClass
(
'readinbrowser-drop'
);
$
(
'ul[aria-labelledby="send-to-kindle"]'
).
insertBefore
(
'.blur-wrapper'
).
addClass
(
'sendtokindle-drop'
);
$
(
'.leramslist'
).
insertBefore
(
'.blur-wrapper'
);
$
(
'ul[aria-labelledby="btnGroupDrop1"]'
).
insertBefore
(
'.blur-wrapper'
).
addClass
(
'leramslist'
);
$
(
'#add-to-shelves'
).
insertBefore
(
'.blur-wrapper'
);
...
...
@@ -199,6 +200,11 @@ return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
$
(
'.downloadBtn'
).
click
(
function
()
{
$
(
'.leramslist'
).
toggle
();
});
$
(
'#sendbtn2'
).
click
(
function
()
{
$
(
'.sendtokindle-drop'
).
toggle
();
});
$
(
'div[aria-label="Add to shelves"]'
).
click
(
function
()
{
$
(
'#add-to-shelves'
).
toggle
();
...
...
@@ -225,6 +231,17 @@ return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
$
(
'.readinbrowser-drop'
).
attr
(
"style"
,
"left: "
+
position
+
"px !important; right: auto; top: "
+
topPos
+
"px"
);
}
}
if
(
$
(
'#sendbtn2'
).
length
>
0
)
{
position
=
$
(
'#sendbtn2'
).
offset
().
left
if
(
position
+
$
(
'.sendtokindle-drop'
).
width
()
>
$
(
window
).
width
()
)
{
positionOff
=
position
+
$
(
'.sendtokindle-drop'
).
width
()
-
$
(
window
).
width
();
ribPosition
=
position
-
positionOff
-
5
$
(
'.sendtokindle-drop'
).
attr
(
"style"
,
"left: "
+
ribPosition
+
"px !important; right: auto; top: "
+
topPos
+
"px"
);
}
else
{
$
(
'.sendtokindle-drop'
).
attr
(
"style"
,
"left: "
+
position
+
"px !important; right: auto; top: "
+
topPos
+
"px"
);
}
}
if
(
$
(
'.downloadBtn'
).
length
>
0
)
{
...
...
@@ -274,6 +291,7 @@ $( '.book-meta > .bookinfo > .rating' ).clone().insertBefore( '.book-meta > .des
$
(
document
).
mouseup
(
function
(
e
)
{
var
container
=
new
Array
();
container
.
push
(
$
(
'ul[aria-labelledby="read-in-browser"]'
));
container
.
push
(
$
(
'.sendtokindle-drop'
));
container
.
push
(
$
(
'.leramslist'
));
container
.
push
(
$
(
'#add-to-shelves'
));
container
.
push
(
$
(
'.navbar-collapse.collapse.in'
));
...
...
@@ -509,7 +527,7 @@ $( '.profileDrop' ).attr({
$
(
'#btn-upload'
).
attr
({
'data-toggle'
:
'tooltip'
,
'title'
:
$
(
'#btn-upload'
).
text
()
,
// 'Upload',
'title'
:
$
(
'#btn-upload'
).
parent
().
text
()
,
// 'Upload',
'data-placement'
:
'bottom'
,
'data-viewport'
:
'#main-nav'
})
.
addClass
(
'upload-btn-tooltip'
);
...
...
@@ -564,6 +582,13 @@ $( '#sendbtn' ).attr({
'data-viewport'
:
'.btn-toolbar'
})
.
addClass
(
'send-btn-tooltip'
);
$
(
'#sendbtn2'
).
attr
({
'data-toggle-two'
:
'tooltip'
,
'title'
:
'Send to Kindle'
,
'data-placement'
:
'bottom'
,
'data-viewport'
:
'.btn-toolbar'
})
.
addClass
(
'send-btn-tooltip'
);
$
(
'#read-in-browser'
).
attr
({
'data-toggle-two'
:
'tooltip'
,
'title'
:
'Read'
,
...
...
cps/templates/detail.html
View file @
8e956365
...
...
@@ -45,7 +45,7 @@
<a
href=
"{{url_for('send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}"
id=
"sendbtn"
class=
"btn btn-primary"
role=
"button"
><span
class=
"glyphicon glyphicon-send"
></span>
{{kindle_list[0]['text']}}
</a>
{% else %}
<div
class=
"btn-group"
role=
"group"
>
<button
id=
"sendbtn"
type=
"button"
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<button
id=
"sendbtn
2
"
type=
"button"
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"glyphicon glyphicon-send"
></span>
{{_('Send to Kindle')}}
<span
class=
"caret"
></span>
</button>
...
...
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