mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-02-26 08:28:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ckeditor

Browse Source
This commit is contained in:
azivner
2017-12-09 11:56:36 -05:00
parent 502e5cbbdf 4187ff36fb
commit 7ca043ebc6
34 changed files with 504 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
views/index.ejs
View File

@@ -33,22 +33,24 @@
</div>
</div>
<div class="hide-toggle" style="grid-area: tree-actions">
<a onclick="noteTree.createNewTopLevelNote()" title="Create new top level note" class="icon-action">
<img src="images/icons/file-plus.png" alt="Create new top level note"/>
</a>
<div class="hide-toggle" style="grid-area: tree-actions;">
<div style="display: flex; justify-content: space-evenly; padding: 10px 0 10px 0; margin: 0 20px 0 20px; border: 1px solid #ccc;">
<a onclick="noteTree.createNewTopLevelNote()" title="Create new top level note" class="icon-action">
<img src="images/icons/file-plus.png" alt="Create new top level note"/>
</a>
<a onclick="noteTree.collapseTree()" title="Collapse tree" class="icon-action">
<img src="images/icons/list.png" alt="Collapse tree"/>
</a>
<a onclick="noteTree.collapseTree()" title="Collapse tree" class="icon-action">
<img src="images/icons/list.png" alt="Collapse tree"/>
</a>
<a onclick="noteTree.scrollToCurrentNote()" title="Scroll to current note" class="icon-action">
<img src="images/icons/crosshair.png" alt="Collapse tree"/>
</a>
<a onclick="noteTree.scrollToCurrentNote()" title="Scroll to current note" class="icon-action">
<img src="images/icons/crosshair.png" alt="Collapse tree"/>
</a>
<a onclick="searchTree.toggleSearch()" title="Search in notes" class="icon-action">
<img src="images/icons/search.png" alt="Search in notes"/>
</a>
<a onclick="searchTree.toggleSearch()" title="Search in notes" class="icon-action">
<img src="images/icons/search.png" alt="Search in notes"/>
</a>
</div>
<div id="search-box" style="display: none; padding: 10px; margin-top: 10px;">
<p>
@@ -63,7 +65,7 @@
<div id="tree" class="hide-toggle" style="grid-area: tree; overflow: auto;">
</div>
<div id="parent-list" style="display: none;">
<div id="parent-list">
</div>
<div class="hide-toggle" style="grid-area: title;">

48
views/setup.ejs Normal file
View File

@@ -0,0 +1,48 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Setup</title>
</head>
<body>
<div style="width: 500px; margin: auto;">
<h1>Trilium setup</h1>
<div class="alert alert-warning" id="alert" style="display: none;">
</div>
<form id="setup-form">
<div class="form-group">
<label for="username">Username</label>
<input type="text" class="form-control" id="username" placeholder="Arbitrary string">
</div>
<div class="form-group">
<label for="password1">Password</label>
<input type="password" class="form-control" id="password1" placeholder="Password">
</div>
<div class="form-group">
<label for="password2">Repeat password</label>
<input type="password" class="form-control" id="password2" placeholder="Password">
</div>
<button type="submit" class="btn btn-default">Save</button>
</form>
</div>
<script type="text/javascript">
const baseApiUrl = 'api/';
</script>
<!-- Required for correct loading of scripts in Electron -->
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<script src="libraries/jquery.min.js"></script>
<link href="libraries/bootstrap/css/bootstrap.css" rel="stylesheet">
<script src="libraries/bootstrap/js/bootstrap.js"></script>
<script src="javascripts/setup.js"></script>
<script src="javascripts/utils.js"></script>
<script src="javascripts/server.js"></script>
</body>
</html>