working protected session in mobile

This commit is contained in:
azivner 2018-12-25 10:58:40 +01:00
parent 246dfbdcb4
commit 1dad919de9
6 changed files with 36 additions and 11 deletions

View File

@ -46,6 +46,24 @@ async function showTree() {
}, },
clones: { clones: {
highlightActiveClones: true highlightActiveClones: true
},
renderNode: function (event, data) {
const node = data.node;
const $nodeSpan = $(node.span);
// check if span of node already rendered
if (!$nodeSpan.data('rendered')) {
const addNoteButton = $('<button class="action-button" title="Add new sub-note" type="button" class="btn">+</button>');
addNoteButton.click(() => {
alert("Add new note");
});
$nodeSpan.append(addNoteButton);
// span rendered
$nodeSpan.data('rendered', true);
}
} }
}); });

View File

@ -16,6 +16,12 @@ html, body {
overflow: auto; overflow: auto;
} }
#tree .action-button {
position: relative;
top: -5px;
margin-left: 10px;
}
#detail { #detail {
padding: 20px 20px 10px 35px; padding: 20px 20px 10px 35px;
height: 100%; height: 100%;

View File

@ -619,13 +619,12 @@ table.promoted-attributes-in-tooltip td, table.promoted-attributes-in-tooltip th
cursor: pointer; cursor: pointer;
} }
.modalless { /*.modalless {*/
top: 15%; /*top: 15%;*/
left: 40%; /*left: 40%;*/
bottom: auto; /*bottom: auto;*/
right: auto; /*right: auto;*/
margin-left: -300px !important; /*}*/
}
.multiplicity { .multiplicity {
font-size: 1.3em; font-size: 1.3em;

View File

@ -1,5 +1,5 @@
<div id="protected-session-password-dialog" class="modal mx-auto" data-backdrop="false" tabindex="-1" role="dialog"> <div id="protected-session-password-dialog" class="modal mx-auto" data-backdrop="false" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog modal-sm" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title mr-auto">Protected session</h5> <h5 class="modal-title mr-auto">Protected session</h5>
@ -13,7 +13,7 @@
<form id="protected-session-password-form"> <form id="protected-session-password-form">
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="protected-session-password">To proceed with requested action you need to start protected session by entering password:</label> <label for="protected-session-password">Enter password to start protected session:</label>
<input id="protected-session-password" class="form-control" type="password"> <input id="protected-session-password" class="form-control" type="password">
</div> </div>
</div> </div>

View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Trilium Notes</title> <title>Trilium Notes</title>
</head> </head>
<body> <body class="desktop">
<div id="container" style="display:none; grid-template-columns: minmax(<%= leftPaneMinWidth %>px, <%= leftPaneWidthPercent %>fr) <%= rightPaneWidthPercent %>fr"> <div id="container" style="display:none; grid-template-columns: minmax(<%= leftPaneMinWidth %>px, <%= leftPaneWidthPercent %>fr) <%= rightPaneWidthPercent %>fr">
<div id="header" class="hide-toggle"> <div id="header" class="hide-toggle">
<div id="history-navigation" style="display: none;"> <div id="history-navigation" style="display: none;">

View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Trilium Notes</title> <title>Trilium Notes</title>
</head> </head>
<body> <body class="mobile">
<div class="row" id="container-row"> <div class="row" id="container-row">
<div id="tree" class="d-sm-block d-md-block d-lg-block d-xl-block col-12 col-sm-4 col-md-4 col-lg-4 col-xl-4"></div> <div id="tree" class="d-sm-block d-md-block d-lg-block d-xl-block col-12 col-sm-4 col-md-4 col-lg-4 col-xl-4"></div>
@ -37,6 +37,8 @@
<% include details/relation_map.ejs %> <% include details/relation_map.ejs %>
</div> </div>
</div> </div>
<% include dialogs/protected_session_password.ejs %>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">