Merge remote-tracking branch 'epub_theme/Develop' into Develop
This commit is contained in:
commit
60cc0c9395
|
@ -13,10 +13,9 @@ var reader;
|
||||||
bookmarks: calibre.bookmark ? [calibre.bookmark] : []
|
bookmarks: calibre.bookmark ? [calibre.bookmark] : []
|
||||||
});
|
});
|
||||||
|
|
||||||
reader.rendition.themes.register("lightTheme", "/static/css/epub_themes.css");
|
Object.keys(themes).forEach(function (theme) {
|
||||||
reader.rendition.themes.register("darkTheme", "/static/css/epub_themes.css");
|
reader.rendition.themes.register(theme, themes[theme].css_path);
|
||||||
reader.rendition.themes.register("sepiaTheme", "/static/css/epub_themes.css");
|
});
|
||||||
reader.rendition.themes.register("blackTheme", "/static/css/epub_themes.css");
|
|
||||||
|
|
||||||
if (calibre.useBookmarks) {
|
if (calibre.useBookmarks) {
|
||||||
reader.on("reader:bookmarked", updateBookmark.bind(reader, "add"));
|
reader.on("reader:bookmarked", updateBookmark.bind(reader, "add"));
|
||||||
|
@ -78,6 +77,10 @@ var reader;
|
||||||
alert(error);
|
alert(error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Default settings load
|
||||||
|
const theme = localStorage.getItem("calibre.reader.theme") ?? Object.keys(themes)[0];
|
||||||
|
selectTheme(theme);
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html class="no-js">
|
<html class="no-js">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||||
|
@ -18,6 +19,7 @@
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/popup.css') }}">
|
<link rel="stylesheet" href="{{ url_for('static', filename='css/popup.css') }}">
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/reader.css') }}">
|
<link rel="stylesheet" href="{{ url_for('static', filename='css/reader.css') }}">
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div id="sidebar">
|
<div id="sidebar">
|
||||||
<div id="panels">
|
<div id="panels">
|
||||||
|
@ -74,21 +76,26 @@
|
||||||
<div class="modal md-effect-1" id="settings-modal">
|
<div class="modal md-effect-1" id="settings-modal">
|
||||||
<div class="md-content">
|
<div class="md-content">
|
||||||
<h3>{{_('Settings')}}</h3>
|
<h3>{{_('Settings')}}</h3>
|
||||||
<div class="themes" id="themes">
|
<div class="form-group themes" id="themes">
|
||||||
Choose a theme below: <br />
|
Choose a theme below: <br />
|
||||||
|
|
||||||
<!-- Hardcoded a tick in the light theme button because it is the "default" theme. Need to find a way to do this dynamically on startup-->
|
<!-- Hardcoded a tick in the light theme button because it is the "default" theme. Need to find a way to do this dynamically on startup-->
|
||||||
<button type="button" id="lightTheme" class="lightTheme" onclick="selectTheme(this.id)"><span id="lightSelected">✓</span>{{_('Light')}}</button>
|
<button type="button" id="lightTheme" class="lightTheme" onclick="selectTheme(this.id)"><span
|
||||||
<button type="button" id="darkTheme" class="darkTheme" onclick="selectTheme(this.id)"><span id="darkSelected"> </span>{{_('Dark')}}</button>
|
id="lightSelected">✓</span>{{_('Light')}}</button>
|
||||||
<button type="button" id="sepiaTheme" class="sepiaTheme" onclick="selectTheme(this.id)"><span id="sepiaSelected"> </span>{{_('Sepia')}}</button>
|
<button type="button" id="darkTheme" class="darkTheme" onclick="selectTheme(this.id)"><span
|
||||||
<button type="button" id="blackTheme" class="blackTheme" onclick="selectTheme(this.id)"><span id="blackSelected"> </span>{{_('Black')}}</button>
|
id="darkSelected"> </span>{{_('Dark')}}</button>
|
||||||
|
<button type="button" id="sepiaTheme" class="sepiaTheme" onclick="selectTheme(this.id)"><span
|
||||||
|
id="sepiaSelected"> </span>{{_('Sepia')}}</button>
|
||||||
|
<button type="button" id="blackTheme" class="blackTheme" onclick="selectTheme(this.id)"><span
|
||||||
|
id="blackSelected"> </span>{{_('Black')}}</button>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div class="form-group">
|
||||||
<p>
|
<p>
|
||||||
<input type="checkbox" id="sidebarReflow" name="sidebarReflow">{{_('Reflow text when sidebars are open.')}}
|
<input type="checkbox" id="sidebarReflow"
|
||||||
|
name="sidebarReflow">{{_('Reflow text when sidebars are open.')}}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="fontSizeWrapper">
|
<div class="form-group fontSizeWrapper">
|
||||||
<div class="slider">
|
<div class="slider">
|
||||||
<label for="fader">{{ _('Font Sizes') }}</label>
|
<label for="fader">{{ _('Font Sizes') }}</label>
|
||||||
<input type="range" min="75" max="200" value="100" id="fontSizeFader" step="25">
|
<input type="range" min="75" max="200" value="100" id="fontSizeFader" step="25">
|
||||||
|
@ -100,7 +107,8 @@
|
||||||
<div class="overlay"></div>
|
<div class="overlay"></div>
|
||||||
<script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
|
||||||
<script src="{{ url_for('static', filename='js/compress/jszip_epub.min.js') }}">
|
<script src="{{ url_for('static', filename='js/compress/jszip_epub.min.js') }}">
|
||||||
</script> <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
|
</script>
|
||||||
|
<script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
window.calibre = {
|
window.calibre = {
|
||||||
filePath: "{{ url_for('static', filename='js/libs/') }}",
|
filePath: "{{ url_for('static', filename='js/libs/') }}",
|
||||||
|
@ -111,44 +119,55 @@
|
||||||
useBookmarks: "{{ current_user.is_authenticated | tojson }}"
|
useBookmarks: "{{ current_user.is_authenticated | tojson }}"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
window.themes = {
|
||||||
|
"darkTheme": {
|
||||||
|
"bgColor": "#202124",
|
||||||
|
"css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
|
||||||
|
},
|
||||||
|
"lightTheme": {
|
||||||
|
"bgColor": "white",
|
||||||
|
"css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
|
||||||
|
},
|
||||||
|
"sepiaTheme": {
|
||||||
|
"bgColor": "#ece1ca",
|
||||||
|
"css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
|
||||||
|
},
|
||||||
|
"blackTheme": {
|
||||||
|
"bgColor": "black",
|
||||||
|
"css_path": "{{ url_for('static', filename='css/epub_themes.css') }}"
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
function selectTheme (id) {
|
function selectTheme (id) {
|
||||||
tickSpans = document.getElementById("themes").querySelectorAll("span");
|
var tickSpans = document.getElementById("themes").querySelectorAll("span");
|
||||||
|
|
||||||
// Remove tick mark from all theme buttons
|
// Remove tick mark from all theme buttons
|
||||||
for(var i = 0; i < tickSpans.length; i++) {
|
tickSpans.forEach(function (tickSpan) {
|
||||||
document.getElementById(tickSpans[i].id).textContent = "";
|
document.getElementById(tickSpan.id).textContent = "";
|
||||||
}
|
});
|
||||||
|
|
||||||
// Add tick mark to the button corresponding to the currently selected theme
|
// Add tick mark to the button corresponding to the currently selected theme
|
||||||
document.getElementById(id).querySelector("span").textContent = "✓";
|
document.getElementById(id).querySelector("span").textContent = "✓";
|
||||||
|
|
||||||
|
// Saving theme to local storage
|
||||||
|
localStorage.setItem("calibre.reader.theme", id);
|
||||||
|
|
||||||
// Apply theme to epubjs iframe
|
// Apply theme to epubjs iframe
|
||||||
reader.rendition.themes.select(id);
|
reader.rendition.themes.select(id);
|
||||||
|
|
||||||
// Apply theme to rest of the page. TODO - Do this smarter
|
// Apply theme to rest of the page.
|
||||||
if (id == "darkTheme") {
|
document.getElementById("main").style.backgroundColor = themes[id]["bgColor"];
|
||||||
document.getElementById("main").style.backgroundColor = "#202124";
|
|
||||||
}
|
|
||||||
else if (id == "lightTheme") {
|
|
||||||
document.getElementById("main").style.backgroundColor = "white";
|
|
||||||
}
|
|
||||||
else if (id == "sepiaTheme") {
|
|
||||||
document.getElementById("main").style.backgroundColor = "#ece1ca";
|
|
||||||
}
|
|
||||||
else if (id == "blackTheme") {
|
|
||||||
document.getElementById("main").style.backgroundColor = "black";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// font size settings logic
|
// font size settings logic
|
||||||
let fontSizeFader = document.getElementById('fontSizeFader');
|
let fontSizeFader = document.getElementById('fontSizeFader');
|
||||||
fontSizeFader.addEventListener("change", function () {
|
fontSizeFader.addEventListener("change", function () {
|
||||||
reader.rendition.themes.fontSize(`${this.value}%`)
|
reader.rendition.themes.fontSize(`${this.value}%`);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
|
||||||
<script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>
|
||||||
<script src="{{ url_for('static', filename='js/reading/epub.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/reading/epub.js') }}"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user