diff --git a/web/static/css/style.css b/web/static/css/style.css index 01ccbc1aa..3043d3789 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -157,36 +157,4 @@ body, .page { .select_logger h5{ padding-right:5px -} - -.select_logger svg{ - cursor: pointer; -} - -.logger-select{ - position: absolute; - top: 43px; - left: 57px; - width:80px; - height:210px; - background:#fff; - border-radius:10px; - box-shadow: 0 0 10px 0 #ccc; - display:none; - overflow-y: scroll; -} - -.logger-select .logger-li{ - width:100%; - height: 30px; - display: flex; - align-items: center; - justify-content: center; - font-size:13px; - color:#333; - cursor: pointer; -} - -.logger-select .logger-li:hover { - background: #f2f2f2; -} +} \ No newline at end of file diff --git a/web/templates/macro/svg.html b/web/templates/macro/svg.html index a281df2d1..18413d30b 100644 --- a/web/templates/macro/svg.html +++ b/web/templates/macro/svg.html @@ -595,6 +595,16 @@ {% endmacro %} + + +{% macro log_select(class) %} + + +{% endmacro %} + {% macro info_square_rounded(class) %} diff --git a/web/templates/navigation.html b/web/templates/navigation.html index 67a338ccc..8b804de6b 100644 --- a/web/templates/navigation.html +++ b/web/templates/navigation.html @@ -273,25 +273,13 @@

@@ -2264,20 +2252,18 @@

$('#modal-logging').modal('show'); } - // 显示日志来源筛选 - $(".logger-btn").bind("click").click(function (e) { - if (e.stopPropagation) e.stopPropagation(); - $('.logger-select').css('display','block') - }); - - // 隐藏日志来源筛选 - $('.modal-content').unbind("click").click(function () { - $('.logger-select').css('display','none') - }); + // 渲染日志来源下拉列表 + function get_logging_source(){ + $("#dropdown-menu-logger").html('') + var menu=['All', 'System', 'Rss', 'Rmt', 'Meta', 'Sync', 'Sites', 'Brush', 'Douban', 'Spider', 'Message', 'Indexer', 'Searcher', 'Subscribe', 'Downloader', 'TorrentRemover'] + for(var i=0;i${menu[i]}`); + } + } // 日志来源筛选 - $('.logger-li').click(function(e){ - logger_source = $(this).text(); + function logger_select(source){ + logger_source = source if (logger_source === "All") logger_source = ""; // 关闭之前的定时刷新日志 @@ -2288,7 +2274,7 @@ // 重新拉取日志 refresh_logging() - }) + } //刷新消息中心 function refresh_message(time_str) {