From 8dbfce7e28614b6893c4a8fb3c403add738caca2 Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 23 Oct 2021 17:28:26 -0700 Subject: [PATCH] minor cleanup --- libs/notifications/telegram.js | 2 +- libs/shinobiHub.js | 2 +- web/assets/css/dashboard.css | 3 +++ web/pages/blocks/home/menuSide.ejs | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/notifications/telegram.js b/libs/notifications/telegram.js index ec029b34..6daff45d 100644 --- a/libs/notifications/telegram.js +++ b/libs/notifications/telegram.js @@ -267,7 +267,7 @@ module.exports = function(s,config,lang,getSnapshot){ "default": "", "example": "", "possible": "" - }, + }, { hidden: true, "name": "detail=telegrambot_channel", diff --git a/libs/shinobiHub.js b/libs/shinobiHub.js index f809c939..aed2fc27 100644 --- a/libs/shinobiHub.js +++ b/libs/shinobiHub.js @@ -78,7 +78,7 @@ module.exports = function(s,config,lang,app,io){ // s.userLog({ke:monitorConfig.ke,mid:'$USER'},{type:lang['Websocket Connected'],msg:{for:lang['Superuser'],id:cn.mail,ip:cn.ip}}) }) } - if(s.group[monitorConfig.ke] && s.group[monitorConfig.ke].init.shinobihub === '1'){ + if(s.group[monitorConfig.ke] && s.group[monitorConfig.ke].init && s.group[monitorConfig.ke].init.shinobihub === '1'){ uploadConfiguration(s.group[monitorConfig.ke].init.shinobihub_key,'cam',monitorConfig,() => { // s.userLog({ke:monitorConfig.ke,mid:'$USER'},{type:lang['Websocket Connected'],msg:{for:lang['Superuser'],id:cn.mail,ip:cn.ip}}) }) diff --git a/web/assets/css/dashboard.css b/web/assets/css/dashboard.css index 95a1edb4..85189a1e 100644 --- a/web/assets/css/dashboard.css +++ b/web/assets/css/dashboard.css @@ -230,6 +230,9 @@ body { .text-monospace { font-family: monospace; } +.text-ellipsis { + text-overflow: ellipsis; +} .float{ } diff --git a/web/pages/blocks/home/menuSide.ejs b/web/pages/blocks/home/menuSide.ejs index 58e14d26..73165538 100644 --- a/web/pages/blocks/home/menuSide.ejs +++ b/web/pages/blocks/home/menuSide.ejs @@ -6,12 +6,14 @@
-

<%- $user.mail %>

+

<%- $user.mail %>

<%- lang.Monitors %> :
+ <% if(define.SideMenu.showMonitors){ %>
+ <% } %> <% var drawBlock