git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c7f2a4
)
weblib: do not allow click on last image
author
Niki Roo
<niki@nikiroo.be>
Thu, 21 May 2020 08:35:14 +0000
(10:35 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Thu, 21 May 2020 08:35:14 +0000
(10:35 +0200)
src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html
[new file with mode: 0644]
patch
|
blob
diff --git
a/src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
b/src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
index 5310c7c104953fdf90ed9ee97b2c4a6cd8c222a6..524fea36182ed1874c3f7946e6d86fd3578e9801 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
+++ b/
src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
@@
-648,8
+648,10
@@
abstract class WebLibraryServerHtml implements Runnable {
}
viewerItem = templates.viewerImage(WebLibraryUrls
}
viewerItem = templates.viewerImage(WebLibraryUrls
- .getStoryUrl(luid, chapter, paragraph), next,
- zoomStyle);
+ .getStoryUrl(luid, chapter, paragraph), //
+ disabledRight ? null : next, //
+ zoomStyle //
+ );
} else {
viewerItem = templates.viewerText(null,
new TextOutput(false).convert(para));
} else {
viewerItem = templates.viewerText(null,
new TextOutput(false).convert(para));
diff --git
a/src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java
b/src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java
index 59e7020c62fa6254ff3c20da3e0a4aa939031b22..cdc936ab6ce72a921233b9061d3579235795a1cf 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java
+++ b/
src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java
@@
-137,11
+137,13
@@
public class WebLibraryServerTemplates {
;
}
;
}
+ // href NULL means no forward link
public Template viewerImage(String src, String href, String zoomStyle) {
public Template viewerImage(String src, String href, String zoomStyle) {
- return new Template(getClass(), "viewer.image.html") //
- .set("src", src) //
- .set("href", href) //
- .set("zoomStyle", zoomStyle) //
+ return new Template(getClass(),
+ href == null ? "viewer.image.nolink.html" : "viewer.image.html") //
+ .set("src", src) //
+ .set("href", href) //
+ .set("zoomStyle", zoomStyle) //
;
}
;
}
diff --git a/src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html
b/src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html
new file mode 100644
(file)
index 0000000..
64483c9
--- /dev/null
+++ b/
src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html
@@ -0,0
+1,5
@@
+ <div
+ class='viewer'
+ oncontextmenu='document.getElementById("previous").click(); return false;'>
+ <img class='viewer img' style='${zoomStyle}' src='${src}'/>
+ </div>