ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix buttons visibility in super panel when window is too small

merge-requests/198/head
Moe 2020-05-28 20:29:53 -07:00
parent 5436dab375
commit 54576b57a5
6 changed files with 22 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/libs/css/dash2.forms.css
View File

@ -52,3 +52,6 @@ form.modal-body{margin:0}
.form-group-group.grey > h4{background:#777;color:#fff}
.dark .form-group-group{background:#222}
.form-group-group:last-child {margin-bottom: 0}
.btn-group-justified {display: flex}
.btn-group-justified .btn {flex: 1}

2
web/libs/js/super.systemTab.js
View File

@ -5,7 +5,7 @@ $(document).ready(function(){
case'deleteLogs':
var html = 'Do you want to delete these logs? User logs will <b>not</b> be deleted.'
$.confirm.create({
title: `${lang['Delete Logs']} <small>${e.u}</small>`,
title: `${lang['Delete Logs']}`,
body: html,
clickOptions: {
class: 'btn-danger',

14
web/pages/blocks/changeSuperPreferences.ejs
View File

@ -1,17 +1,5 @@
<form>
<nav class="navbar navbar-rounded navbar-expand-lg bg-primary">
<div class="container">
<div class="collapse navbar-collapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link submit">
<p><i class="fa fa-check"></i> <%-lang.Save%></p>
</a>
</li>
</ul>
</div>
</div>
</nav>
<div class="mb-4"><a href="#" class="submit btn btn-block btn-default"><i class="fa fa-check"></i> <%- lang.Save %></a></div>
<div class="form-group">
<label>
<div><span><%-lang.Email%></span></div>

14
web/pages/blocks/superConfigEditor.ejs
View File

@ -1,18 +1,6 @@
<link rel="stylesheet" href="<%-window.libURL%>libs/css/super.configEditor.css" />
<small class="pull-right msg"></small>
<nav class="navbar navbar-rounded navbar-expand-lg bg-success">
<div class="container">
<div class="collapse navbar-collapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link submit">
<p><i class="fa fa-check"></i> <%-lang.Save%></p>
</a>
</li>
</ul>
</div>
</div>
</nav>
<div class="mb-4"><a href="#" class="submit btn btn-block btn-default"><i class="fa fa-check"></i> <%- lang.Save %></a></div>
<form class="form-group-group red" id="conf_json">
<small class="pull-right msg"></small>
<div id="configForHumans" class="better-json-editor pt-2"></div>

43
web/pages/blocks/superSystemTab.ejs
View File

@ -1,32 +1,17 @@
<nav class="navbar navbar-rounded navbar-expand-lg bg-primary">
<div class="container">
<div class="collapse navbar-collapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" system="deleteLogs">
<p><i class="fa fa-trash-o"></i> <%-lang['Delete']%> <%-lang['Logs']%></p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" restart="system">
<p><i class="fa fa-retweet"></i> <%-lang['Restart Core']%></p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" restart="cron">
<p><i class="fa fa-retweet"></i> <%-lang['Restart CRON']%></p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" restart="logs">
<p><i class="fa fa-retweet"></i> <%-lang['Flush PM2 Logs']%></p>
</a>
</li>
</ul>
</div>
</div>
</nav>
<div class="mb-4 btn-group btn-group-justified">
<a href="#" class="btn btn-default" system="deleteLogs">
<i class="fa fa-trash-o"></i> <%-lang['Delete']%> <%-lang['Logs']%>
</a>
<a href="#" class="btn btn-default" restart="system">
<i class="fa fa-retweet"></i> <%- lang['Restart Core'] %>
</a>
<a href="#" class="btn btn-default" restart="cron">
<i class="fa fa-retweet"></i> <%- lang['Restart CRON'] %>
</a>
<a href="#" class="btn btn-white" restart="logs">
<i class="fa fa-retweet"></i> <%- lang['Flush PM2 Logs'] %>
</a>
</div>
<div id="logs" style="height:400px;overflow:auto">
<table class="table table-striped"></table>
</div>

16
web/pages/super.ejs
View File

@ -92,19 +92,7 @@
<!-- Tab panes -->
<div class="tab-content text-center">
<div class="tab-pane active" id="accounts" role="tabpanel">
<nav class="navbar navbar-rounded navbar-expand-lg bg-primary">
<div class="container">
<div class="collapse navbar-collapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link add">
<p><i class="fa fa-plus-square-o"></i> <%-lang['Add']%> <%-lang['Accounts']%></p>
</a>
</li>
</ul>
</div>
</div>
</nav>
<div class="mb-4"><a href="#" class="add btn btn-block btn-default"><i class="fa fa-plus"></i> <%- lang.Add %></a></div>
<table class="table table-striped"></table>
</div>
<div class="tab-pane text-left" id="config" role="tabpanel">
@ -234,7 +222,7 @@ $.ccio.tm=function(x,d,z,k){
case 0://account row
d.detailsJSON=JSON.parse(d.details);
$.ccio.accounts[d.ke]=d;
tmp+='<tr ke="'+d.ke+'"><td><b class="mail">'+d.mail+'</b></td><td>'+d.ke+'</td><td><a tabindex="1" class="permission btn btn-xs btn-primary"><i class="fa fa-lock"></i></a></td><td><a tabindex="1" class="delete btn btn-xs btn-danger"><i class="fa fa-trash-o"></i></a></td></tr>';
tmp+='<tr ke="'+d.ke+'"><td><b class="mail epic-text">'+d.mail+'</b></td><td>'+d.ke+'</td><td><a tabindex="1" class="permission btn btn-sm btn-info"><i class="fa fa-lock"></i></a></td><td><a tabindex="1" class="delete btn btn-sm btn-danger"><i class="fa fa-trash-o"></i></a></td></tr>';
break;
case 4://log row, draw to global and monitor
if(!d.time){d.time=$.ccio.init('t')}