gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved search behind tree action button

Browse Source
This commit is contained in:
azivner 2017-10-01 08:47:26 -04:00
parent 566008baae
commit 2e8787ff91
6 changed files with 61 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
TODO
View File

@ -1,8 +1,27 @@
- deleting cloned nodes ends with 500 (probably only on folders) - pick new name for the project
New features:
- what links here - what links here
- link between encrypted notes could be done by encrypting note_ids of both sides of relations. Encryption must be
deterministic to allow lookup by cipher text
- recent changes - link to note should lead to the revision - recent changes - link to note should lead to the revision
- db upgrade / migration - db upgrade / migration
- dates should be stored in UTC to work correctly with time zones
- we should also record timezone info so that we display the date correctly with respect to the local date at the time of recording it Refactorings:
- modularize frontend - modularize frontend
- unify handling of global variables - unify handling of global variables
- unify handling of dialogs and their forms - they all follow the same pattern - e.g. have one main dialog window/el
UI:
- need to represent global actions somehow - e.g. recent changes, settings
- better way how to represent per-note actions - what links here, encryption
Encryption:
- we don't have IV or encryption specific counter
Bugs:
- deleting cloned nodes ends with 500 (probably only on folders)
Others:
- dates should be stored in UTC to work correctly with time zones
- we should also record timezone info so that we display the date correctly with respect to the local date at the time of recording it

28
src/templates/app.html
View File

@ -6,16 +6,8 @@
</head> </head>
<body> <body>
<div id="container"> <div id="container">
<div class="hide-toggle" style="grid-area: search"> <div style="grid-area: tree">
<p> <div class="hide-toggle">
<label>Search:</label>
<input name="search" autocomplete="off">
<button id="btnResetSearch">&times;</button>
<span id="matches"></span>
</p>
</div>
<div class="hide-toggle" style="grid-area: tree-buttons;">
<a onclick="createNewTopLevelNote()" title="Create new top level note" class="icon-action"> <a onclick="createNewTopLevelNote()" title="Create new top level note" class="icon-action">
<img src="stat/icons/file-plus.png" alt="Create new top level note"/> <img src="stat/icons/file-plus.png" alt="Create new top level note"/>
</a> </a>
@ -27,9 +19,23 @@
<a onclick="scrollToCurrentNote()" title="Scroll to current note" class="icon-action"> <a onclick="scrollToCurrentNote()" title="Scroll to current note" class="icon-action">
<img src="stat/icons/crosshair.png" alt="Collapse tree"/> <img src="stat/icons/crosshair.png" alt="Collapse tree"/>
</a> </a>
<a onclick="toggleSearch()" title="Search in notes" class="icon-action">
<img src="stat/icons/search.png" alt="Search in notes"/>
</a>
<div id="search-box" style="display: none; padding: 10px; margin-top: 10px;">
<p>
<label>Search:</label>
<input name="search" autocomplete="off">
<button id="btnResetSearch">&times;</button>
<span id="matches"></span>
</p>
</div>
</div> </div>
<div id="tree" class="hide-toggle" style="overflow: auto; grid-area: tree"> <div id="tree" class="hide-toggle" style="overflow: auto;">
</div>
</div> </div>
<div class="hide-toggle" style="grid-area: title;"> <div class="hide-toggle" style="grid-area: title;">

BIN
static/icons/search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 419 B

4
static/js/init.js
View File

@ -11,10 +11,6 @@ $(document).bind('keydown', 'alt+m', function() {
$("#noteDetailWrapper").css("width", hidden ? "750px" : "100%"); $("#noteDetailWrapper").css("width", hidden ? "750px" : "100%");
}); });
$(document).bind('keydown', 'alt+s', function() {
$("input[name=search]").focus();
});
// hide (toggle) everything except for the note content for distraction free writing // hide (toggle) everything except for the note content for distraction free writing
$(document).bind('keydown', 'alt+t', function() { $(document).bind('keydown', 'alt+t', function() {
const date = new Date(); const date = new Date();

10
static/js/tree.js
View File

@ -215,4 +215,14 @@ function scrollToCurrentNote() {
} }
} }
$(document).bind('keydown', 'alt+s', function() {
$("#search-box").show();
$("input[name=search]").focus();
});
function toggleSearch() {
$("#search-box").toggle();
}
$(document).bind('keydown', 'alt+c', collapseTree); $(document).bind('keydown', 'alt+c', collapseTree);

4
static/style.css
View File

@ -4,8 +4,8 @@
height: 100vh; height: 100vh;
display: grid; display: grid;
grid-template-areas: "search title" grid-template-areas: "tree title"
"tree-buttons note-content" "tree note-content"
"tree note-content"; "tree note-content";
grid-template-columns: 2fr 5fr; grid-template-columns: 2fr 5fr;
grid-template-rows: auto grid-template-rows: auto