From bf44d6b00d77ca9bd2891981c7024959d2704748 Mon Sep 17 00:00:00 2001 From: "Surplus_Up (2DU)" Date: Tue, 14 Aug 2018 06:51:40 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=88=EC=97=AD,=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 18 +++++++++--------- language/ko-KR.json | 4 ++-- views/main_css/main.css | 12 +++++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app.py b/app.py index c91fe6af3..c42bb7665 100644 --- a/app.py +++ b/app.py @@ -2163,10 +2163,10 @@ def topic_stop(name = None, sub = None, tool = None): if tool == 'agree': curs.execute("select title from agreedis where title = ? and sub = ?", [name, sub]) if curs.fetchall(): - curs.execute("insert into topic (id, title, sub, data, date, ip, block, top) values (?, ?, ?, '" + load_lang('agreement', 1) + " Fail', ?, ?, '', '1')", [str(int(topic_check[0][0]) + 1), name, sub, time, ip]) + curs.execute("insert into topic (id, title, sub, data, date, ip, block, top) values (?, ?, ?, '" + load_lang('agreement', 1) + " X', ?, ?, '', '1')", [str(int(topic_check[0][0]) + 1), name, sub, time, ip]) curs.execute("delete from agreedis where title = ? and sub = ?", [name, sub]) else: - curs.execute("insert into topic (id, title, sub, data, date, ip, block, top) values (?, ?, ?, '" + load_lang('agreement', 1) + " OK', ?, ?, '', '1')", [str(int(topic_check[0][0]) + 1), name, sub, time, ip]) + curs.execute("insert into topic (id, title, sub, data, date, ip, block, top) values (?, ?, ?, '" + load_lang('agreement', 1) + " O', ?, ?, '', '1')", [str(int(topic_check[0][0]) + 1), name, sub, time, ip]) curs.execute("insert into agreedis (title, sub) values (?, ?)", [name, sub]) else: curs.execute("select title from stop where title = ? and sub = ? and close = ?", [name, sub, set_list[0]]) @@ -2342,7 +2342,7 @@ def topic(name = None, sub = None): start = topic_data[3] if topic_data[4] == 'O': - blind_data = 'style="background: gainsboro;"' + blind_data = 'id="toron_color_grey"' if admin != 1: curs.execute("select who from re_admin where what = ? order by time desc limit 1", ['blind (' + name + ' - ' + sub + '#' + str(number) + ')']) @@ -3406,8 +3406,8 @@ def recent_changes(name = None, tool = 'record'): if hide: hidden = ' (' + load_lang('release') + ')' - style[0] = 'background: gainsboro;' - style[1] = 'background: gainsboro;' + style[0] = 'id="toron_color_grey"' + style[1] = 'id="toron_color_grey"' if send == '
': send = '(' + load_lang('hide') + ')' @@ -3425,16 +3425,16 @@ def recent_changes(name = None, tool = 'record'): send = '(' + load_lang('hide') + ')' - style[0] = 'display: none;' - style[1] = 'background: gainsboro;' + style[0] = 'style="display: none;"' + style[1] = 'id="toron_color_grey"' if tool == 'history': title = '' + data[0] + load_lang('version') + ' (' + load_lang('raw') + ') ' else: title = '' + html.escape(data[1]) + ' (' + data[0] + load_lang('version') + ') ' - div += '' + title + revert + ' ' + leng + '' - div += '' + ip + ban + hidden + '' + date + '' + send_parser(send) + '' + div += '' + title + revert + ' ' + leng + '' + div += '' + ip + ban + hidden + '' + date + '' + send_parser(send) + '' div += '' sub = '' diff --git a/language/ko-KR.json b/language/ko-KR.json index 4624af72a..0b1317538 100644 --- a/language/ko-KR.json +++ b/language/ko-KR.json @@ -21,7 +21,7 @@ "other": "기타", "tool": " 도구", "plus": "추가", - "open": "열린", + "open": "열기", "search": "검색", "user": "사용자", "alarm": "알림", @@ -58,7 +58,7 @@ "time": "시각", "close": "닫기", "stop": "정지", - "restart": "재시작", + "restart": "재개", "agreement": "합의", "backlink": "역링크", "why": "사유", diff --git a/views/main_css/main.css b/views/main_css/main.css index 6c45871e7..7aae1eb3a 100644 --- a/views/main_css/main.css +++ b/views/main_css/main.css @@ -12,15 +12,17 @@ a { text-decoration: none; } input[type="checkbox"] { width: auto; } .popup { position: fixed; bottom: 0; padding: 10px; left: 0; background: lightgray; width: 100%; } ul#list { padding: 10px; } -td#toron_color_green { background: darkseagreen; } -td#toron_color_blue { background: skyblue; } -div#cate { border: 1px solid; padding: 5px; } -td#toron_color_red { background: indianred; } #toron { width: 100%; } +#toron_color { background: khaki; } +#toron_color_green { background: darkseagreen; } +#toron_color_blue { background: skyblue; } +#toron_color_red { background: indianred; } +#toron_color_grey { background: gainsboro; } +div#cate { border: 1px solid; padding: 5px; } blockquote { border: 1px solid; padding: 15px; margin: 0; margin-top: 10px; } img, iframe { max-width: 100%; } pre { border: 1px solid; padding: 10px; white-space: pre-wrap; } #in { margin-left: 20px; } #out { margin-left: 5px; } s, strike, del { color: gray; } -s:hover, strike:hover, del:hover { color: #666; background-color: #eee; text-decoration: none; } \ No newline at end of file +s:hover, strike:hover, del:hover { color: gray; background-color: gainsboro; text-decoration: none; } \ No newline at end of file