Skip to content

Commit

Permalink
번역, 디자인 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
surplus-dev committed Aug 13, 2018
1 parent 6d894fd commit bf44d6b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
18 changes: 9 additions & 9 deletions app.py
Expand Up @@ -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]])
Expand Down Expand Up @@ -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) + ')'])
Expand Down Expand Up @@ -3406,8 +3406,8 @@ def recent_changes(name = None, tool = 'record'):
if hide:
hidden = ' <a href="/hidden/' + url_pas(data[1]) + '?num=' + data[0] + '">(' + 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 == '<br>':
send = '(' + load_lang('hide') + ')'
Expand All @@ -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 = '<a href="/w/' + url_pas(name) + '?num=' + data[0] + '">' + data[0] + load_lang('version') + '</a> <a href="/raw/' + url_pas(name) + '?num=' + data[0] + '">(' + load_lang('raw') + ')</a> '
else:
title = '<a href="/w/' + url_pas(data[1]) + '">' + html.escape(data[1]) + '</a> <a href="/history/' + url_pas(data[1]) + '">(' + data[0] + load_lang('version') + ')</a> '

div += '<tr style="' + style[0] + '"><td>' + title + revert + ' ' + leng + '</td>'
div += '<td>' + ip + ban + hidden + '</td><td>' + date + '</td></tr><tr style="' + style[1] + '"><td colspan="3">' + send_parser(send) + '</td></tr>'
div += '<tr ' + style[0] + '><td>' + title + revert + ' ' + leng + '</td>'
div += '<td>' + ip + ban + hidden + '</td><td>' + date + '</td></tr><tr ' + style[1] + '><td colspan="3">' + send_parser(send) + '</td></tr>'

div += '</tbody></table>'
sub = ''
Expand Down
4 changes: 2 additions & 2 deletions language/ko-KR.json
Expand Up @@ -21,7 +21,7 @@
"other": "기타",
"tool": " 도구",
"plus": "추가",
"open": "열린",
"open": "열기",
"search": "검색",
"user": "사용자",
"alarm": "알림",
Expand Down Expand Up @@ -58,7 +58,7 @@
"time": "시각",
"close": "닫기",
"stop": "정지",
"restart": "재시작",
"restart": "재개",
"agreement": "합의",
"backlink": "역링크",
"why": "사유",
Expand Down
12 changes: 7 additions & 5 deletions views/main_css/main.css
Expand Up @@ -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; }
s:hover, strike:hover, del:hover { color: gray; background-color: gainsboro; text-decoration: none; }

0 comments on commit bf44d6b

Please sign in to comment.