From 0b4a44a403621b208282cc189d5e96e3f49f9cce Mon Sep 17 00:00:00 2001 From: azivner Date: Sat, 29 Dec 2018 09:13:52 +0100 Subject: [PATCH] layout tweaks etc. --- src/public/javascripts/services/mobile.js | 25 +++++---------- src/public/stylesheets/mobile.css | 3 +- src/routes/mobile.js | 37 ----------------------- src/routes/routes.js | 3 -- src/views/login.ejs | 12 ++++++-- src/views/mobile.ejs | 29 ++++++++++++------ 6 files changed, 37 insertions(+), 72 deletions(-) delete mode 100644 src/routes/mobile.js diff --git a/src/public/javascripts/services/mobile.js b/src/public/javascripts/services/mobile.js index d645aa597..c35cffcb7 100644 --- a/src/public/javascripts/services/mobile.js +++ b/src/public/javascripts/services/mobile.js @@ -90,7 +90,7 @@ $("#note-menu-button").click(async e => { ]); itemsContainer.enableItem("delete", isNotRoot && parentNote.type !== 'search'); - + alert("A"); contextMenuWidget.initContextMenu(e, itemsContainer, (event, cmd) => { if (cmd === "delete") { treeChangesService.deleteNodes([node]); @@ -104,25 +104,14 @@ $("#note-menu-button").click(async e => { }); }); -$("#global-actions-button").click(async e => { - const itemsContainer = new ContextMenuItemsContainer([ - {title: "Switch to desktop version", cmd: "switch-to-desktop", uiIcon: "computer"}, - {title: "Logout", cmd: "log-out", uiIcon: "log-out"} - ]); +$("#switch-to-desktop-button").click(() => { + utils.setCookie('trilium-device', 'desktop'); - contextMenuWidget.initContextMenu(e, itemsContainer, (event, cmd) => { - if (cmd === "switch-to-desktop") { - utils.setCookie('trilium-device', 'desktop'); + utils.reloadApp(); +}); - utils.reloadApp(); - } - else if (cmd === 'log-out') { - $("#logout-form").submit(); - } - else { - throw new Error("Unrecognized command " + cmd); - } - }); +$("#log-out-button").click(() => { + $("#logout-form").submit(); }); showTree(); \ No newline at end of file diff --git a/src/public/stylesheets/mobile.css b/src/public/stylesheets/mobile.css index 04ffe2902..f0cd078b8 100644 --- a/src/public/stylesheets/mobile.css +++ b/src/public/stylesheets/mobile.css @@ -35,7 +35,7 @@ html, body { } #detail { - padding: 20px 20px 10px 35px; + padding: 5px 20px 10px 0px; height: 100%; flex-direction: column; } @@ -45,6 +45,7 @@ html, body { overflow: auto; flex-direction: column; height: 100%; + padding-left: 10px; } #note-title-row { diff --git a/src/routes/mobile.js b/src/routes/mobile.js deleted file mode 100644 index 078572bf8..000000000 --- a/src/routes/mobile.js +++ /dev/null @@ -1,37 +0,0 @@ -"use strict"; - -const sourceIdService = require('../services/source_id'); -const sql = require('../services/sql'); -const attributeService = require('../services/attributes'); -const config = require('../services/config'); -const optionService = require('../services/options'); - -async function index(req, res) { - const options = await optionService.getOptionsMap(); - - res.render('mobile', { - theme: options.theme, - sourceId: await sourceIdService.generateSourceId(), - maxSyncIdAtLoad: await sql.getValue("SELECT MAX(id) FROM sync"), - instanceName: config.General ? config.General.instanceName : null, - appCss: await getAppCss() - }); -} - -async function getAppCss() { - let css = ''; - const notes = attributeService.getNotesWithLabel('appCss'); - - for (const note of await notes) { - css += `/* ${note.noteId} */ -${note.content} - -`; - } - - return css; -} - -module.exports = { - index -}; diff --git a/src/routes/routes.js b/src/routes/routes.js index ad4eb4a55..a34da2047 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -1,7 +1,6 @@ const setupRoute = require('./setup'); const loginRoute = require('./login'); const indexRoute = require('./index'); -const mobileRoute = require('./mobile'); const multer = require('multer')(); // API routes @@ -97,8 +96,6 @@ const uploadMiddleware = multer.single('upload'); function register(app) { route(GET, '/', [auth.checkAuth], indexRoute.index); - route(GET, '/mobile', [auth.checkAuth], mobileRoute.index); - route(GET, '/login', [auth.checkAppInitialized], loginRoute.loginPage); route(POST, '/login', [], loginRoute.login); route(POST, '/logout', [auth.checkAuth], loginRoute.logout); diff --git a/src/views/login.ejs b/src/views/login.ejs index 8286c7899..c0d9edee8 100644 --- a/src/views/login.ejs +++ b/src/views/login.ejs @@ -46,12 +46,18 @@ // Required for correct loading of scripts in Electron if (typeof module === 'object') {window.module = module; module = undefined;} - let device = "desktop"; + let device; - // mobile device detection based on https://stackoverflow.com/a/24600597/944162 - if (/Mobi/.test(navigator.userAgent) || window.location.search === '?mobile') { + if (window.location.search === '?desktop') { + device = "desktop"; + } + else if (window.location.search === '?mobile') { device = "mobile"; } + else { + // mobile device detection based on https://stackoverflow.com/a/24600597/944162 + device = /Mobi/.test(navigator.userAgent) ? "mobile" : "desktop"; + } setCookie("trilium-device", device); diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs index d58f2c3e6..bf438bc85 100644 --- a/src/views/mobile.ejs +++ b/src/views/mobile.ejs @@ -15,7 +15,14 @@ - +
+ + +
+ Switch to desktop version + Logout +
+
@@ -32,24 +39,26 @@ -
+
-
+
+
-
+
- <% include details/search.ejs %> + <% include details/search.ejs %> - <% include details/render.ejs %> + <% include details/render.ejs %> - <% include details/file.ejs %> + <% include details/file.ejs %> - <% include details/image.ejs %> + <% include details/image.ejs %> - <% include details/relation_map.ejs %> + <% include details/relation_map.ejs %> - <% include details/protected_session_password.ejs %> + <% include details/protected_session_password.ejs %> +