From fdffaf9ed20e319c1e04ce198b225d31714bdda6 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Fri, 1 Sep 2017 19:29:03 -0400
Subject: [PATCH] re-organized ip blacklist page
---
public/less/blacklist.less | 2 +-
src/views/admin/manage/ip-blacklist.tpl | 38 +++++++++++--------------
2 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/public/less/blacklist.less b/public/less/blacklist.less
index 30add959d5..d3724d85c2 100644
--- a/public/less/blacklist.less
+++ b/public/less/blacklist.less
@@ -1,6 +1,6 @@
#blacklist-rules {
width: 100%;
- height: 450px;
+ height: 357px;
display: block;
border: 1px solid #eee;
padding: 5px 10px;
diff --git a/src/views/admin/manage/ip-blacklist.tpl b/src/views/admin/manage/ip-blacklist.tpl
index e2378e5e5c..62d0446ec4 100644
--- a/src/views/admin/manage/ip-blacklist.tpl
+++ b/src/views/admin/manage/ip-blacklist.tpl
@@ -8,32 +8,11 @@
</p>
<div class="row">
- <div class="col-sm-6">
- <div class="panel panel-default">
- <div class="panel-body">
- <div><canvas id="blacklist:hourly" height="250"></canvas></div>
- </div>
- <div class="panel-footer"><small>[[admin/manage/ip-blacklist:analytics.blacklist-hourly]]</small></div>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="panel panel-default">
- <div class="panel-body">
- <div><canvas id="blacklist:daily" height="250"></canvas></div>
- </div>
- <div class="panel-footer"><small>[[admin/manage/ip-blacklist:analytics.blacklist-daily]]</small></div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-sm-6">
- <textarea id="blacklist-rules">{rules}</textarea>
- </div>
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">[[admin/manage/ip-blacklist:active-rules]]</div>
<div class="panel-body">
+ <textarea id="blacklist-rules">{rules}</textarea><br />
<button type="button" class="btn btn-warning" data-action="test">
<i class="fa fa-bomb"></i> [[admin/manage/ip-blacklist:validate]]
</button>
@@ -54,6 +33,21 @@
</div>
</div>
</div>
+ <div class="col-sm-6">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div><canvas id="blacklist:hourly" height="250"></canvas></div>
+ </div>
+ <div class="panel-footer"><small>[[admin/manage/ip-blacklist:analytics.blacklist-hourly]]</small></div>
+ </div>
+
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div><canvas id="blacklist:daily" height="250"></canvas></div>
+ </div>
+ <div class="panel-footer"><small>[[admin/manage/ip-blacklist:analytics.blacklist-daily]]</small></div>
+ </div>
+ </div>
</div>
</div>