Merge pull request #1885 from openNAMU/dev

기능 추가 및 버그 수정

lang/en-US.json

@@ -240,6 +240,8 @@
         "user_added_menu" : "User added menu",
         "move_redirect_make" : "Redirect document generation (Only if possible)",
         "user_fix" : "Fix user",
+        "main_user_name" : "Main user name",
+        "change_user_name" : "Change main user name",
         "sub_user_name" : "Sub user name",
         "_comment_" : "BBS",
             "bbs" : "BBS",
@@ -254,6 +256,10 @@
             "reply" : "Reply",
             "post_edit" : "Modify post",
             "post_add" : "Add post",
+            "last_comment_time" : "last comment time",
+            "bbs_comment_tool" : "BBS comment tool(s)",
+            "bbs_comment_edit" : "BBS comment edit",
+            "bbs_post_tool" : "BBS post tool(s)",
             "_comment_" : "BBS ACL",
                 "bbs_view_acl" : "BBS ACL to view posts",
                 "bbs_acl" : "BBS ACL",
@@ -378,6 +384,9 @@
                 "set_history_recording_off" : "Stop recording history",
                 "link_case_insensitive" : "Link case insensitive",
                 "hide_user_name" : "Hide member name",
+                "move_with_redirect" : "Create a redirect when moving a document",
+                "slow_thread" : "Continuous thread upload limit",
+                "edit_timeout" : "render timeout",
             "_comment_" : "Text",
                 "register_text" : "Terms of sign-up",
                 "non_login_alert" : "Non-login alert",
@@ -536,6 +545,7 @@
         "many_delete_help" : "Please write down the documents name one by one on the line.",
         "name_or_ip_or_regex_multiple" : "Please write down the username or IP or Regex one by one on the line.",
         "sqlite_only" : "SQLite only",
+        "linux_only" : "Linux OS only",
         "approval_question_visible_only_when_approval_on" : "Approval questions are visible only when approval requirement is on",
         "msg_whatchlist_lmt": "You can add as many as",
         "enter_html" : "Please enter HTML",

lang/ko-KR.json

@@ -553,6 +553,16 @@
     "footnote_number": "각주 번호 출력",
     "only_number": "숫자만",
     "footnote_real_num_view": "각주 실제 번호 보기",
-    "post_edit" : "게시글 수정",
-    "post_add" : "게시글 추가"
+    "post_edit": "게시글 수정",
+    "post_add": "게시글 추가",
+    "main_user_name": "메인 사용자명",
+    "change_user_name": "메인 사용자명 변경",
+    "last_comment_time": "마지막 댓글 시간",
+    "bbs_comment_tool": "BBS 댓글 도구",
+    "bbs_comment_edit": "BBS 댓글 수정",
+    "move_with_redirect": "문서 이동시 리다이렉트 문서 생성",
+    "slow_thread": "토론 올리기 제한 시간",
+    "edit_timeout": "렌더링 제한 시간",
+    "linux_only": "리눅스 OS 전용",
+    "bbs_post_tool": "BBS 게시글 도구"
 }

route/bbs_w.py

@@ -16,9 +16,9 @@ def bbs_w(bbs_num = ''):
         data += '''
             <table id="main_table_set">
                 <tr id="main_table_top_tr">
-                    <td id="main_table_width">''' + load_lang('order') + '''</td>
                     <td id="main_table_width">''' + load_lang('editor') + '''</td>
                     <td id="main_table_width">''' + load_lang('time') + '''</td>
+                    <td id="main_table_width">''' + load_lang('last_comment_time') + '''</td>
                 </tr>
         '''
         
@@ -35,12 +35,16 @@ def bbs_w(bbs_num = ''):
                     curs.execute(db_change('select count(*) from bbs_data where set_name = "comment_date" and (set_id = ? or set_id like ?) order by set_code + 0 desc'), [bbs_num_str + '-' + temp_dict['code'], bbs_num_str + '-' + temp_dict['code'] + '-%'])
                     db_data = curs.fetchall()
                     comment_count = str(db_data[0][0]) if db_data else '0'
+
+                    curs.execute(db_change('select set_data from bbs_data where set_name = "comment_date" and (set_id = ? or set_id like ?) order by set_data desc limit 1'), [bbs_num_str + '-' + temp_dict['code'], bbs_num_str + '-' + temp_dict['code'] + '-%'])
+                    db_data = curs.fetchall()
+                    last_comment_date = db_data[0][0] if db_data else '0'
                     
                     data += '''
                         <tr>
-                            <td>''' + temp_dict['code'] + '''</td>
                             <td>''' + ip_pas(temp_dict['user_id']) + '''</td>
                             <td>''' + temp_dict['date'] + '''</td>
+                            <td>''' + last_comment_date + '''</td>
                         </tr>
                         <tr>
                             <td colspan="3">

route/bbs_w_post.py

@@ -338,7 +338,7 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                 bbs_comment_form = ''
                 if bbs_comment_acl == 0:
                     bbs_comment_form += '''
-                        ''' + comment_select + ''' <a href="javascript:opennamu_return_comment();">(R)</a>
+                        ''' + comment_select + ''' <a href="javascript:opennamu_return_comment();">''' + load_lang('return') + '''</a>
                         <hr class="main_hr">
                         
                         ''' + edit_editor(curs, ip, text, 'bbs_comment') + '''

route/edit.py

@@ -53,10 +53,8 @@ def edit_editor(curs, ip, data_main = '', do_type = 'edit'):
     if monaco_on == 'use':
         editor_display = 'style="display: none;"'
         add_get_file = '''
-            <link   rel="stylesheet"
-                    data-name="vs/editor/editor.main" 
-                    href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/editor/editor.main.min.css">
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/loader.min.js"></script>
+            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.41.0/min/vs/editor/editor.main.min.css" integrity="sha512-MFDhxgOYIqLdcYTXw7en/n5BshKoduTitYmX8TkQ+iJOGjrWusRi8+KmfZOrgaDrCjZSotH2d1U1e/Z1KT6nWw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.41.0/min/vs/loader.min.js" integrity="sha512-A+6SvPGkIN9Rf0mUXmW4xh7rDvALXf/f0VtOUiHlDUSPknu2kcfz1KzLpOJyL2pO+nZS13hhIjLqVgiQExLJrw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
         '''
 
         monaco_editor_top = '<a href="javascript:opennamu_edit_turn_off_monaco();">(' + load_lang('turn_off_monaco') + ')</a>'

route/edit_delete.py

@@ -49,7 +49,7 @@ def edit_delete(name):
 
                 curs.execute(db_change("select title, link from back where title = ? and not type = 'cat' and not type = 'no'"), [name])
                 for data in curs.fetchall():
-                    curs.execute(db_change("insert into back (title, link, type) values (?, ?, 'no')"), [data[0], data[1]])
+                    curs.execute(db_change("insert into back (title, link, type, data) values (?, ?, 'no', '')"), [data[0], data[1]])
 
                 curs.execute(db_change("delete from back where link = ?"), [name])
                 curs.execute(db_change("delete from data where title = ?"), [name])

route/main_setting_main.py

@@ -255,12 +255,12 @@ def main_setting_main(db_set):
                         <input type="checkbox" name="move_with_redirect" ''' + check_box_div[13] + '''> ''' + load_lang('move_with_redirect') + ''' (''' + load_lang('not_working') + ''')
                         <hr class="main_hr">
 
-                        <span>''' + load_lang('slow_thread') + ''' (''' + load_lang('second') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''') (''' + load_lang('not_working') + ''')</span>
+                        <span>''' + load_lang('slow_thread') + ''' (''' + load_lang('second') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''')</span>
                         <hr class="main_hr">
                         <input name="slow_thread" value="''' + html.escape(d_list[38]) + '''">
                         <hr class="main_hr">
 
-                        <span>''' + load_lang('edit_timeout') + ''' (''' + load_lang('second') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''')</span>
+                        <span>''' + load_lang('edit_timeout') + ''' (''' + load_lang('second') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''') (''' + load_lang('linux_only') + ''')</span>
                         <hr class="main_hr">
                         <input name="edit_timeout" value="''' + html.escape(d_list[39]) + '''">
                         <hr class="main_hr">

route/main_setting_skin_set.py

@@ -60,9 +60,14 @@ def main_setting_skin_set():
                             ''' + set_data["main_css_bold"] + '''
                         </select>
                         <h3>''' + load_lang("category") + '''</h3>
+                        <h4>''' + load_lang("position") + '''</h4>
                         <select name="main_css_category_set">
                             ''' + set_data["main_css_category_set"] + '''
                         </select>
+                        <h4>''' + load_lang("category_change_title") + '''</h4>
+                        <select name="main_css_category_change_title">
+                            ''' + set_data["main_css_category_change_title"] + '''
+                        </select>
                         <h3>''' + load_lang("footnote") + ''' (''' + load_lang('beta') + ''')</h3>
                         <h4>''' + load_lang("footnote_render") + '''</h4>
                         <select name="main_css_footnote_set">

route/recent_change.py

@@ -7,7 +7,7 @@ def recent_change_send_render(data):
 
         return '<a href="/w/' + url_pas(data_unescape) + '">' + match + '</a>'
 
-    if data == '&lt;br&gt;' or data == '':
+    if data == '&lt;br&gt;' or data == '' or re.search(r'^ +$', data):
         data = '<br>'
     else:
         data = data.replace('javascript:', '')
@@ -30,7 +30,6 @@ def recent_change(name = None, tool = ''):
             ban = ''
             select = ''
             sub = ''
-            admin_6 = admin_check(6)
             admin = admin_check()
             div = '''
                 <table id="main_table_set">
@@ -93,9 +92,9 @@ def recent_change(name = None, tool = ''):
                 set_type = '' if set_type == 'edit' else set_type
 
                 data_list = []
-                curs.execute(db_change('select id, title from rc where type = ? order by date desc'), [set_type])
+                curs.execute(db_change('select title, id from rc where type = ? order by date desc'), [set_type])
                 for i in curs.fetchall():
-                    curs.execute(db_change('select id, title, date, ip, send, leng, hide from history where id = ? and title = ?'), i)
+                    curs.execute(db_change('select id, title, date, ip, send, leng, hide from history where title = ? and id = ?'), i)
                     data_list += curs.fetchall()
 
             div += '</tr>'

route/tool/func.py

@@ -95,8 +95,6 @@ global_wiki_set = {}
 
 global_db_set = ''
 
-conn = ''
-
 # Func
 # Func-main
 def do_db_set(db_set):
@@ -138,18 +136,9 @@ def get_init_set_list(need = 'all'):
         return init_set_list[need]
 
 class get_db_connect:
-    # 임시 DB 커넥션 동작 구조
-    # Init 파트
-    # DB 커넥트(get_db_connect_old) -> func.py로 conn 넘겨줌
-    # route 파트
-    # DB 새로 커넥트 -> func.py에서 쓰던 conn은 conn_sub로 보관 ->
-    # func.py로 conn 넘겨줌 -> 모든 라우터 과정이 끝나면 conn_sub를 다시 func.py에 conn으로 넘겨줌 ->
-    # DB 커넥트 종료
     def __init__(self):
         global global_db_set
-        global conn
-        
-        self.conn_sub = conn
+
         self.db_set = global_db_set
         
     def __enter__(self):
@@ -320,7 +309,7 @@ def get_db_table_list():
     create_data['acl'] = ['title', 'data', 'type']
 
     # 개편 예정 (data_link로 변경)
-    create_data['back'] = ['title', 'link', 'type']
+    create_data['back'] = ['title', 'link', 'type', 'data']
 
     # 폐지 예정 (topic_set으로 통합) [가장 시급]
     create_data['topic_set'] = ['thread_code', 'set_name', 'set_id', 'set_data']
@@ -644,9 +633,7 @@ def update(ver_num, set_data):
                 if db_data_2:
                     curs.execute(db_change("insert into data_set (doc_name, doc_rev, set_name, set_data) values (?, '', 'last_edit', ?)"), [for_a[0], db_data_2[0][0]])
 
-            curs.execute(db_change(
-                'delete from acl where title like "file:%" and data = "admin" and type like "decu%"'
-            ))
+            curs.execute(db_change('delete from acl where title like "file:%" and data = "admin" and type like "decu%"'))
 
             print("Update 3500360 complete")
 
@@ -659,8 +646,11 @@ def update(ver_num, set_data):
                         'delete from user_set where id = ? and name = "email"'
                     ), [db_data[0]])
 
-    #    if ver_num < 3500361:
-
+        # create_data['history'] = ['id', 'title', 'data', 'date', 'ip', 'send', 'leng', 'hide', 'type']
+        # create_data['rc'] = ['id', 'title', 'date', 'type']
+        if ver_num == 3500362:
+            curs.execute(db_change("drop index history_index"))
+            curs.execute(db_change("create index history_index on history (title, ip)"))
 
         conn.commit()
 
@@ -1096,7 +1086,7 @@ def wiki_css(data):
     data += ['' for _ in range(0, 3 - len(data))]
     
     data_css = ''
-    data_css_ver = '179'
+    data_css_ver = '180'
     
     # Func JS + Defer
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
@@ -1969,7 +1959,7 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
                 else:
                     acl_data = [['normal']]
 
-            except_ban_tool_list = ['render', 'topic_view']
+            except_ban_tool_list = ['render', 'topic_view', 'bbs_view']
             if acl_data[0][0] != 'normal':
                 if not acl_data[0][0] in ['ban', 'ban_admin'] and not tool in except_ban_tool_list:
                     if get_ban == 1:
@@ -2673,8 +2663,7 @@ def re_error(data):
             elif num == 17:
                 curs.execute(db_change('select data from other where name = "upload"'))
                 db_data = curs.fetchall()
-                file_max = int(number_check(db_data[0][0])) if db_data and db_data[0][0] != '' else '2'
-
+                file_max = number_check(db_data[0][0]) if db_data and db_data[0][0] != '' else '2'
                 data = load_lang('file_capacity_error') + file_max
             elif num == 18:
                 data = load_lang('email_send_error')
@@ -2728,11 +2717,7 @@ def re_error(data):
             elif num == 40:
                 curs.execute(db_change("select data from other where name = 'password_min_length'"))
                 db_data = curs.fetchall()
-                if db_data and db_data[0][0] != '':
-                    password_min_length = db_data[0][0]
-                else:
-                    password_min_length = ''
-                    
+                password_min_length = '' if not db_data else db_data[0][0]
                 data = load_lang('error_password_length_too_short') + password_min_length
             elif num == 41:
                 curs.execute(db_change("select data from other where name = 'edit_timeout'"))

route/tool/func_render.py

@@ -91,7 +91,7 @@ class class_do_render:
                 backlink = []
 
             if backlink != []:
-                curs.executemany(db_change("insert into back (link, title, type) values (?, ?, ?)"), data_end[2]['backlink'])
+                curs.executemany(db_change("insert into back (link, title, type, data) values (?, ?, ?, ?)"), data_end[2]['backlink'])
                 curs.execute(db_change("delete from back where title = ? and type = 'no'"), [doc_name])
 
             self.conn.commit()

route/tool/func_render_namumark.py

@@ -796,11 +796,11 @@ class class_do_render_namumark:
                         db_data = self.curs.fetchall()
                         if db_data:
                             link_exist = ''
-                            self.data_backlink += [[self.doc_name, 'file:' + link_main, 'file']]
+                            self.data_backlink += [[self.doc_name, 'file:' + link_main, 'file', '']]
                         else:
                             link_exist = 'opennamu_not_exist_link'
-                            self.data_backlink += [[self.doc_name, 'file:' + link_main, 'no']]
-                            self.data_backlink += [[self.doc_name, 'file:' + link_main, 'file']]
+                            self.data_backlink += [[self.doc_name, 'file:' + link_main, 'no', '']]
+                            self.data_backlink += [[self.doc_name, 'file:' + link_main, 'file', '']]
                         
                         link_extension_regex = r'\.([^.]+)$'
                         link_extension = re.search(link_extension_regex, link_main)
@@ -884,9 +884,6 @@ class class_do_render_namumark:
                 elif re.search(r'^(분류|category):', link_main, flags = re.I):
                     link_main = re.sub(r'^(분류|category):', '', link_main, flags = re.I)
 
-                    if link_data[1]:
-                        link_main += link_data[1]
-
                     category_blur = ''
                     if re.search(r'#blur$', link_main, flags = re.I):
                         link_main = re.sub(r'#blur$', '', link_main, flags = re.I)
@@ -894,6 +891,9 @@ class class_do_render_namumark:
                         category_blur = 'opennamu_category_blur'
                     
                     link_sub = link_main
+                    link_view = ''
+                    if len(link_data) > 1:
+                        link_view = link_data[1]
 
                     link_main = self.get_tool_data_restore(link_main, do_type = 'slash')
                     link_main = html.unescape(link_main)
@@ -905,11 +905,12 @@ class class_do_render_namumark:
                         db_data = self.curs.fetchall()
                         if db_data:
                             link_exist = ''
-                            self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat']]
                         else:
                             link_exist = 'opennamu_not_exist_link'
-                            self.data_backlink += [[self.doc_name, 'category:' + link_main, 'no']]
-                            self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat']]
+                            self.data_backlink += [[self.doc_name, 'category:' + link_main, 'no', '']]
+
+                        self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat', '']]
+                        self.data_backlink += [[self.doc_name, 'category:' + link_main, 'cat_view', link_view]]
 
                         link_main = url_pas(link_main)
 
@@ -1033,15 +1034,15 @@ class class_do_render_namumark:
                         self.curs.execute(db_change("select title from data where title = ?" + self.link_case_insensitive), [link_main])
                         db_data = self.curs.fetchall()
                         if not db_data:
-                            self.data_backlink += [[self.doc_name, link_main, 'no']]
-                            self.data_backlink += [[self.doc_name, link_main, '']]
+                            self.data_backlink += [[self.doc_name, link_main, 'no', '']]
+                            self.data_backlink += [[self.doc_name, link_main, '', '']]
                             link_exist = 'opennamu_not_exist_link'
                         else:
                             link_main = db_data[0][0]
-                            self.data_backlink += [[self.doc_name, link_main, '']]
+                            self.data_backlink += [[self.doc_name, link_main, '', '']]
 
                     link_same = ''
-                    if link_main == self.doc_name and self.doc_include == '':
+                    if link_main == self.doc_name:
                         link_same = 'opennamu_same_link'
 
                     link_main = url_pas(link_main)
@@ -1174,7 +1175,7 @@ class class_do_render_namumark:
                     self.curs.execute(db_change("select data from data where title = ?"), [include_name])
                     db_data = self.curs.fetchall()
                     if db_data:
-                        self.data_backlink += [[self.doc_name, include_name, 'include']]
+                        self.data_backlink += [[self.doc_name, include_name, 'include', '']]
                         include_data = db_data[0][0].replace('\r', '')
 
                         # include link func
@@ -1189,14 +1190,14 @@ class class_do_render_namumark:
                         # remove end br
                         include_data = re.sub('^\n+', '', include_data)
 
-                        self.data_include += [[self.doc_include + 'opennamu_include_' + str(include_num), include_name, include_data, 'style="display: inline;"']]
+                        self.data_include += [[self.doc_include + 'opennamu_include_' + str(include_num), self.doc_name, include_data, 'style="display: inline;"']]
 
                         data_name = self.get_tool_data_storage('' + \
                             include_link + \
                             '<div id="' + self.doc_include + 'opennamu_include_' + str(include_num) + '"></div>' + \
                         '', '', match_org)
                     else:
-                        self.data_backlink += [[self.doc_name, include_name, 'no']]
+                        self.data_backlink += [[self.doc_name, include_name, 'no', '']]
 
                         include_link = '<div><a class="opennamu_not_exist_link" href="/w/' + url_pas(include_name) + '">(' + include_name_org + ')</a></div>'
 
@@ -1354,7 +1355,7 @@ class class_do_render_namumark:
             link_main = self.get_tool_data_restore(link_main, do_type = 'slash')
             link_main = html.unescape(link_main)
 
-            self.data_backlink += [[self.doc_name, link_main, 'redirect']]
+            self.data_backlink += [[self.doc_name, link_main, 'redirect', '']]
 
             link_main = url_pas(link_main)
 
@@ -2200,8 +2201,9 @@ class class_do_render_namumark:
             self.do_render_link()
             self.do_render_text()
             self.do_render_hr()
-            self.do_render_heading()
+
             self.do_redner_footnote()
+            self.do_render_heading()
             
         self.do_render_last()
 

route/user_setting_skin_set_main.py

@@ -68,6 +68,10 @@ def user_setting_skin_set_main_set_list():
             ['default', load_lang('default')],
             ['off', load_lang('off')],
             ['on', load_lang('use')]
+        ], 'main_css_category_change_title' : [
+            ['default', load_lang('default')],
+            ['off', load_lang('off')],
+            ['on', load_lang('use')]
         ]
     }
 
@@ -152,10 +156,16 @@ def user_setting_skin_set_main():
                             ''' + set_data["main_css_bold"] + '''
                         </select>
                         <h3>''' + load_lang("category") + '''</h3>
+                        <h4>''' + load_lang("position") + '''</h4>
                         ''' + set_data_main["main_css_category_set"] + '''
                         <select name="main_css_category_set">
                             ''' + set_data["main_css_category_set"] + '''
                         </select>
+                        <h4>''' + load_lang("category_change_title") + '''</h4>
+                        ''' + set_data_main["main_css_category_change_title"] + '''
+                        <select name="main_css_category_change_title">
+                            ''' + set_data["main_css_category_change_title"] + '''
+                        </select>
                         <h3>''' + load_lang("footnote") + ''' (''' + load_lang('beta') + ''')</h3>
                         <h4>''' + load_lang("footnote_render") + '''</h4>
                         ''' + set_data_main["main_css_footnote_set"] + '''
@@ -224,5 +234,5 @@ def user_setting_skin_set_main():
                         <button type="submit">''' + load_lang('save') + '''</button>
                     </form>
                 '''),
-                menu = [['change', load_lang('user_setting')], ['change/skin_set', load_lang('skin_set')]]
+                menu = [['change', load_lang('user_setting')], ['change/skin_set', load_lang('skin_set')], ['setting/skin_set', load_lang('main_skin_set_default')]]
             ))

route/view_acl.py

@@ -183,7 +183,7 @@ def view_acl(name):
                     </form>
                 ''',
                 menu = [
-                    ['w/' + url_pas(name), load_lang('document')], 
+                    ['w/' + url_pas(name), load_lang('return')], 
                     ['manager', load_lang('admin')], 
                     ['list/admin/auth_use/' + url_pas('acl (' + name + ')') + '/1', load_lang('acl_record')]
                 ]

route/view_read.py

@@ -35,14 +35,21 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
             curs.execute(db_change("select link from back where title = ? and type = 'cat' order by link asc"), [name])
             category_sql = curs.fetchall()
             for data in category_sql:
+                link_view = data[0]
+                if get_main_skin_set(curs, flask.session, 'main_css_category_change_title', ip) != 'off':
+                    curs.execute(db_change("select data from back where title = ? and link = ? and type = 'cat_view' limit 1"), [name, data[0]])
+                    db_data = curs.fetchall()
+                    if db_data and db_data[0][0] != '':
+                        link_view = db_data[0][0]
+
                 if data[0].startswith('category:'):
-                    category_sub += '<li><a href="/w/' + url_pas(data[0]) + '">' + html.escape(data[0]) + '</a></li>'
+                    category_sub += '<li><a href="/w/' + url_pas(data[0]) + '">' + html.escape(link_view) + '</a></li>'
 
                     count_sub_category += 1
                 else:
                     category_doc += '' + \
                         '<li>' + \
-                            '<a href="/w/' + url_pas(data[0]) + '">' + html.escape(data[0]) + '</a> ' + \
+                            '<a href="/w/' + url_pas(data[0]) + '">' + html.escape(link_view) + '</a> ' + \
                             '<a class="opennamu_link_inter" href="/xref/' + url_pas(data[0]) + '">(' + load_lang('backlink') + ')</a>' + \
                         '</li>' + \
                     ''
@@ -188,7 +195,7 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
             response_data = 200
 
         if num != '':
-            menu += [['history/' + url_pas(name), load_lang('history')]]
+            menu += [['history/' + url_pas(name), load_lang('return')]]
             sub = ' (r' + str(num) + ')'
             acl = 0
             r_date = 0

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev219",
-        "c_ver" : "3500361",
+        "r_ver" : "v3.4.6-RC3-dev227",
+        "c_ver" : "3500364",
         "s_ver" : "3500111"
     }
 }

views/main_css/css/main.css

@@ -381,4 +381,8 @@ s:hover, strike:hover, del:hover {
 
 .opennamu_list_none {
     list-style: none;
+}
+
+#topic_color {
+    background: #bbeabb;
 }

views/main_css/css/sub/dark.css

@@ -64,4 +64,8 @@ blockquote {
 
 .opennamu_popup_footnote {
     background-color: #313236;
+}
+
+#topic_color {
+    background: #325a56;
 }

views/main_css/js/route/bbs_w_post.js

@@ -1,7 +1,7 @@
 function opennamu_change_comment(get_id) {
     var _a;
     var input = document.querySelector('#opennamu_comment_select');
-    if (input != null) {
+    if (input !== null) {
         input.value = get_id;
         (_a = document.getElementById('opennamu_edit_textarea')) === null || _a === void 0 ? void 0 : _a.focus();
     }
@@ -9,7 +9,7 @@ function opennamu_change_comment(get_id) {
 function opennamu_return_comment() {
     var _a;
     var input = document.querySelector('#opennamu_comment_select');
-    if (input != null) {
+    if (input !== null) {
         (_a = document.getElementById(input.value)) === null || _a === void 0 ? void 0 : _a.focus();
     }
 }

views/main_css/js/route/bbs_w_post.ts

@@ -1,6 +1,6 @@
 function opennamu_change_comment(get_id : string): void {
     const input = document.querySelector('#opennamu_comment_select') as HTMLInputElement | null;
-    if(input != null) {
+    if(input !== null) {
         input.value = get_id;
         document.getElementById('opennamu_edit_textarea')?.focus();
     }
@@ -8,7 +8,7 @@ function opennamu_change_comment(get_id : string): void {
 
 function opennamu_return_comment(): void {
     const input = document.querySelector('#opennamu_comment_select') as HTMLInputElement | null;
-    if(input != null) {
+    if(input !== null) {
         document.getElementById(input.value)?.focus();
     }
 }