zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-15 19:51:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

added shareCss relation and shareHiddenFromTree label

Browse source
This commit is contained in:
zadam 2021-12-22 09:36:38 +01:00
parent 1180be75d1
commit bcef8579ce
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/services/attributes.js
View file

@ -52,6 +52,7 @@ const BUILTIN_ATTRIBUTES = [
{ type: 'label', name: 'sorted' },
{ type: 'label', name: 'top' },
{ type: 'label', name: 'fullContentWidth' },
{ type: 'label', name: 'shareHiddenFromTree' },
// relation names
{ type: 'relation', name: 'runOnNoteCreation', isDangerous: true },
@ -62,7 +63,8 @@ const BUILTIN_ATTRIBUTES = [
{ type: 'relation', name: 'runOnAttributeChange', isDangerous: true },
{ type: 'relation', name: 'template' },
{ type: 'relation', name: 'widget', isDangerous: true },
{ type: 'relation', name: 'renderNote', isDangerous: true }
{ type: 'relation', name: 'renderNote', isDangerous: true },
{ type: 'relation', name: 'shareCss', isDangerous: false },
];
/** @returns {Note[]} */

8
src/share/routes.js
View file

@ -45,10 +45,10 @@ function register(router) {
const image = shaca.getNote(req.params.noteId);
if (!image) {
return res.sendStatus(404);
return res.status(404).send("Not found");
}
else if (image.type !== 'image') {
return res.sendStatus(400);
return res.status(400).send("Requested note is not an image");
}
res.set('Content-Type', image.mime);
@ -56,12 +56,12 @@ function register(router) {
res.send(image.getContent());
});
router.get('/share/api/notes/:noteId/:download', (req, res, next) => {
router.get('/share/api/notes/:noteId/download', (req, res, next) => {
const {noteId} = req.params;
const note = shaca.getNote(noteId);
if (!note) {
return res.status(404).send(`Note ${noteId} doesn't exist.`);
return res.status(404).send(`Not found`);
}
const utils = require("../services/utils");

3
src/views/share/page.ejs
View file

@ -8,6 +8,9 @@
<% if (note.type === 'text' || note.type === 'book') { %>
<link href="../libraries/ckeditor/ckeditor-content.css" rel="stylesheet">
<% } %>
<% for (const cssRelation of note.getRelations("shareCss")) { %>
<link href="api/notes/<%= cssRelation.value %>/download" rel="stylesheet">
<% } %>
<title><%= note.title %></title>
</head>
<body>

2
src/views/share/tree_item.ejs
View file

@ -9,9 +9,11 @@
<% if (note.hasChildren()) { %>
<ul>
<% note.getChildNotes().forEach(function (childNote) { %>
<% if (!childNote.hasLabel("shareHiddenFromTree")) { %>
<li>
<%- include('tree_item', {note: childNote}) %>
</li>
<% } %>
<% }) %>
</ul>
<% } %>