-
\ No newline at end of file
diff --git a/Bootstrap.Admin/wwwroot/css/site-responsive.css b/Bootstrap.Admin/wwwroot/css/site-responsive.css
index 82dbcdf8..b726c3f5 100644
--- a/Bootstrap.Admin/wwwroot/css/site-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/site-responsive.css
@@ -2,6 +2,17 @@
.notify-row {
display: inline-block;
}
+
+ .cache-item :nth-child(2) {
+ flex: 0 0 auto;
+ }
+
+ .cache-item :nth-child(3) {
+ display: block;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
}
@media (min-width: 736px) {
diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css
index fbdd49b1..96186881 100644
--- a/Bootstrap.Admin/wwwroot/css/site.css
+++ b/Bootstrap.Admin/wwwroot/css/site.css
@@ -444,3 +444,56 @@ label.dropdown-item:first-child {
.btn-xs {
padding: 1px 5px;
}
+
+.cache-title {
+ font-weight: bold;
+ color: #0077de;
+ background-color: #b5f1b6;
+ padding: 10px 15px;
+ border-radius: 4px 4px 0 0;
+}
+
+.cache-item {
+ display: flex;
+ align-items: center;
+ padding: 4px 4px 10px 4px;
+}
+
+ .cache-item:last-child {
+ margin-bottom: 5px;
+ }
+
+ .cache-item :not(:first-child) {
+ margin-left: 10px;
+ display: flex;
+ }
+
+ .cache-item :nth-child(2) {
+ flex: 1 1 auto;
+ }
+
+ .cache-item :nth-child(2) span:not(.badge) {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ display: inline-block;
+ width: 152px;
+ }
+
+ .cache-item :nth-child(3) {
+ flex: 1 1 auto;
+ display: none;
+ }
+
+ .cache-item .badge {
+ display: inline-block;
+ position: relative;
+ top: -12px;
+ margin-left: 4px;
+ line-height: normal;
+ }
+
+ .cache-item .btn {
+ margin-left: 5px;
+ font-size: 0.75rem;
+ }
diff --git a/Bootstrap.Admin/wwwroot/js/Settings.js b/Bootstrap.Admin/wwwroot/js/Settings.js
index e4241530..420c7a2f 100644
--- a/Bootstrap.Admin/wwwroot/js/Settings.js
+++ b/Bootstrap.Admin/wwwroot/js/Settings.js
@@ -70,49 +70,13 @@
swal: false,
callback: function (result) {
if ($.isArray(result)) {
- var html = '
';
+ var html = '
';
var content = result.sort(function (x, y) {
return x.Key > y.Key ? 1 : -1;
}).map(function (ele) {
- var key = ele.Key.split('-')[0];
- var css = 'list-default';
- switch (key) {
- case "MenuHelper":
- css = 'list-primary';
- break;
- case "UserHelper":
- css = 'list-success';
- break;
- case "RoleHelper":
- css = 'list-danger';
- break;
- case "GroupHelper":
- css = 'list-warning';
- break;
- case "LogHelper":
- css = 'list-info';
- break;
- case "DictHelper":
- css = 'list-inverse';
- break;
- case "ExceptionHelper":
- css = 'list-Exception';
- break;
- case "MessageHelper":
- css = 'list-Message';
- break;
- case "TaskHelper":
- css = 'list-Task';
- break;
- case "NotificationHelper":
- css = 'list-Notification';
- break;
- default:
- break;
- }
- return $.format(html, ele.Interval, ele.Key, ele.Desc, ele.Value, css, $.format(item.Url, ele.Key), item.Self, Math.max(0, ele.Interval - Math.round((new Date() - new Date(ele.CreateTime.replace(/-/g, '/'))) / 1000)));
+ return $.format(html, ele.Interval, ele.Key, ele.Desc, ele.Value, '', $.format(item.Url, ele.Key), item.Self, Math.max(0, ele.Interval - Math.round((new Date() - new Date(ele.CreateTime.replace(/-/g, '/'))) / 1000)));
}).join('');
- $sortable.append($.format('
{0}', item.Desc));
+ $sortable.append($.format('
{0}
', item.Desc));
$sortable.append(content);
$sortable.find('[data-toggle="tooltip"]').tooltip();
}
@@ -136,7 +100,7 @@
$('a[data-method]').on('click', function (e) {
e.preventDefault();
e.stopPropagation();
- var $this = $(this);
+ var $this = $(this).tooltip('hide');
var options = {};
switch ($this.attr('data-method')) {
case 'clear':