gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

added shareOmitDefaultCss label

Browse Source
This commit is contained in:
zadam 2021-12-22 11:43:21 +01:00
parent c0964a4f12
commit f9709c9c39
5 changed files with 18 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/app/widgets/attribute_widgets/attribute_detail.js
View File

@ -213,6 +213,7 @@ const ATTR_HELP = {
"bookmarkFolder": "note with this label will appear in bookmarks as folder (allowing access to its children)", "bookmarkFolder": "note with this label will appear in bookmarks as folder (allowing access to its children)",
"shareHiddenFromTree": "this note is hidden from left navigation tree, but still accessible with its URL", "shareHiddenFromTree": "this note is hidden from left navigation tree, but still accessible with its URL",
"shareAlias": "define an alias using which the note will be available under https://your_trilium_host/share/[your_alias]", "shareAlias": "define an alias using which the note will be available under https://your_trilium_host/share/[your_alias]",
"shareOmitDefaultCss": "default share page CSS will be omitted. Use when you make extensive styling changes.",
}, },
"relation": { "relation": {
"runOnNoteCreation": "executes when note is created on backend", "runOnNoteCreation": "executes when note is created on backend",
@ -224,7 +225,7 @@ const ATTR_HELP = {
"template": "attached note's attributes will be inherited even without parent-child relationship. See template for details.", "template": "attached note's attributes will be inherited even without parent-child relationship. See template for details.",
"renderNote": 'notes of type "render HTML note" will be rendered using a code note (HTML or script) and it is necessary to point using this relation to which note should be rendered', "renderNote": 'notes of type "render HTML note" will be rendered using a code note (HTML or script) and it is necessary to point using this relation to which note should be rendered',
"widget": "target of this relation will be executed and rendered as a widget in the sidebar", "widget": "target of this relation will be executed and rendered as a widget in the sidebar",
"shareCss": "CSS note which will be injected into the share page. CSS note must be in the shared sub-tree as well. Consider using 'shareHiddenFromTree' label to hide it.", "shareCss": "CSS note which will be injected into the share page. CSS note must be in the shared sub-tree as well. Consider using 'shareHiddenFromTree' and 'shareOmitDefaultCss' as well.",
} }
}; };

6
src/public/stylesheets/share.css
View File

@ -74,7 +74,7 @@ pre {
} }
@media (max-width: 48em) { @media (max-width: 48em) {
#layout.active #menu { #layout.navMenu #menu {
display: block; display: block;
margin-top: 40px; margin-top: 40px;
} }
@ -83,7 +83,7 @@ pre {
display: block; display: block;
} }
#layout.active #main { #layout.navMenu #main {
display: none; display: none;
} }
@ -91,7 +91,7 @@ pre {
padding-left: 60px; padding-left: 60px;
} }
#layout.active #menuButton::after { #layout.navMenu #menuButton::after {
content: "«"; content: "«";
} }

1
src/services/attributes.js
View File

@ -54,6 +54,7 @@ const BUILTIN_ATTRIBUTES = [
{ type: 'label', name: 'fullContentWidth' }, { type: 'label', name: 'fullContentWidth' },
{ type: 'label', name: 'shareHiddenFromTree' }, { type: 'label', name: 'shareHiddenFromTree' },
{ type: 'label', name: 'shareAlias' }, { type: 'label', name: 'shareAlias' },
{ type: 'label', name: 'shareOmitDefaultCss' },
// relation names // relation names
{ type: 'relation', name: 'runOnNoteCreation', isDangerous: true }, { type: 'relation', name: 'runOnNoteCreation', isDangerous: true },

2
src/share/shaca/shaca_loader.js
View File

@ -48,7 +48,7 @@ function load() {
WHERE isDeleted = 0 WHERE isDeleted = 0
AND noteId IN (${noteIdStr}) AND noteId IN (${noteIdStr})
AND ( AND (
(type = 'label' AND name IN ('archived', 'shareHiddenFromTree', 'shareAlias')) (type = 'label' AND name IN ('archived', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss'))
OR (type = 'relation' AND name IN ('imageLink', 'template', 'shareCss')) OR (type = 'relation' AND name IN ('imageLink', 'template', 'shareCss'))
)`, []); )`, []);

68
src/views/share/page.ejs
View File

@ -3,8 +3,10 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="shortcut icon" href="../favicon.ico"> <link rel="shortcut icon" href="../favicon.ico">
<% if (!note.hasLabel("shareOmitDefaultCss")) { %>
<link href="../libraries/normalize.min.css" rel="stylesheet"> <link href="../libraries/normalize.min.css" rel="stylesheet">
<link href="../stylesheets/share.css" rel="stylesheet"> <link href="../stylesheets/share.css" rel="stylesheet">
<% } %>
<% if (note.type === 'text' || note.type === 'book') { %> <% if (note.type === 'text' || note.type === 'book') { %>
<link href="../libraries/ckeditor/ckeditor-content.css" rel="stylesheet"> <link href="../libraries/ckeditor/ckeditor-content.css" rel="stylesheet">
<% } %> <% } %>
@ -24,69 +26,21 @@
</div> </div>
<% if (subRoot.hasChildren()) { %> <% if (subRoot.hasChildren()) { %>
<button id="menuButton"></button> <button id="menuButton"></button>
<div id="menu"> <nav id="menu">
<%- include('tree_item', {note: subRoot, activeNote: note}) %> <%- include('tree_item', {note: subRoot, activeNote: note}) %>
</div> </nav>
<% } %> <% } %>
</div> </div>
<script> <script>
(function (window, document) { (function () {
const menuButton = document.getElementById('menuButton');
const layout = document.getElementById('layout');
// we fetch the elements each time because docusaurus removes the previous menuButton.addEventListener('click', () => layout.classList.toggle('navMenu'));
// element references on page navigation }());
function getElements() {
return {
layout: document.getElementById('layout'),
menu: document.getElementById('menu'),
menuButton: document.getElementById('menuButton')
};
}
function toggleClass(element, className) {
var classes = element.className.split(/\s+/);
var length = classes.length;
var i = 0;
for (; i < length; i++) {
if (classes[i] === className) {
classes.splice(i, 1);
break;
}
}
// The className is not found
if (length === classes.length) {
classes.push(className);
}
element.className = classes.join(' ');
}
function toggleAll() {
var active = 'active';
var elements = getElements();
toggleClass(elements.layout, active);
toggleClass(elements.menu, active);
toggleClass(elements.menuButton, active);
}
function handleEvent(e) {
var elements = getElements();
if (e.target.id === elements.menuButton.id) {
toggleAll();
e.preventDefault();
} else if (elements.menu.className.indexOf('active') !== -1) {
toggleAll();
}
}
document.addEventListener('click', handleEvent);
}(this, this.document));
</script> </script>
</body> </body>
</html> </html>