템플릿을 Go와 통일

route/bbs_delete.py

@@ -26,14 +26,15 @@ async def bbs_delete(bbs_num = ''):
             
             return redirect(conn, '/bbs/main')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('bbs_delete'), await wiki_set(), await wiki_custom(), wiki_css(['(' + bbs_name + ')', 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('bbs_delete'),
+                await render_simple_set('''
                     <form method="post">
                         <span>''' + await get_lang('delete_warning') + '''</span>
                         <hr class="main_hr">
                         <button type="submit">''' + await get_lang('delete') + '''</button>
                     </form>
                 '''),
-                menu = [['bbs/set/' + bbs_num_str, await get_lang('return')]]
-            ))
+                '(' + bbs_name + ')',
+                [['bbs/set/' + bbs_num_str, await get_lang('return')]]
+            )

route/bbs_make.py

@@ -21,9 +21,9 @@ async def bbs_make():
 
             return redirect(conn, '/bbs/main')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('bbs_make'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('bbs_make'),
+                '''
                     <form method="post">
                         <input class="__ON_INPUT__" placeholder="''' + await get_lang('bbs_name') + '''" name="bbs_name">
                         <hr class="main_hr">
@@ -37,5 +37,6 @@ async def bbs_make():
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['bbs/main', await get_lang('return')]]
-            ))
+                0,
+                [['bbs/main', await get_lang('return')]]
+            )

route/bbs_w.py

@@ -188,8 +188,9 @@ async def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
                 
         data += '</table>'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [title_name, await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-            data = data,
-            menu = menu
-        ))
+        return await render_template(
+            title_name,
+            data,
+            sub,
+            menu
+        )

route/bbs_w_comment_tool.py

@@ -23,8 +23,9 @@ async def bbs_w_comment_tool(bbs_num = '', post_num = '', comment_num = ''):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('bbs_comment_tool'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = data,
-            menu = [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '#' + url_pas(comment_num), await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('bbs_comment_tool'),
+            data,
+            0,
+            [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '#' + url_pas(comment_num), await get_lang('return')]]
+        )

route/bbs_w_delete.py

@@ -53,14 +53,15 @@ async def bbs_w_delete(bbs_num = '', post_num = '', comment_num = ''):
             else:
                 sub += ' (' + comment_num + ')'
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                name,
+                await render_simple_set('''
                     <form method="post">
                         <span>''' + await get_lang('delete_warning') + '''</span>
                         <hr class="main_hr">
                         <button type="submit">''' + await get_lang('delete') + '''</button>
                     </form>
                 '''),
-                menu = [['bbs/w/' + bbs_num_str + '/' + post_num_str, await get_lang('return')]]
-            ))
+                sub,
+                [['bbs/w/' + bbs_num_str + '/' + post_num_str, await get_lang('return')]]
+            )

route/bbs_w_edit.py

@@ -124,9 +124,9 @@ async def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
             else:
                 bbs_title = await get_lang('post_edit')
     
-            return easy_minify(flask.render_template(await skin_check(), 
-                imp = [bbs_title, await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data =  editor_top_text + '''
+            return await render_template(
+                bbs_title,
+                editor_top_text + '''
                     <form method="post">                        
                         <input class="__ON_INPUT__" style="''' + option_display + '''" placeholder="''' + await get_lang('title') + '''" name="title" value="''' + html.escape(title) + '''">
                         <hr style="''' + option_display + '''" class="main_hr">
@@ -152,5 +152,6 @@ async def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
                         -->
                     </form>
                 ''',
-                menu = [['bbs/in/' + bbs_num_str, await get_lang('return')]]
-            ))
+                0,
+                [['bbs/in/' + bbs_num_str, await get_lang('return')]]
+            )

route/bbs_w_hide.py

@@ -20,12 +20,13 @@ async def bbs_w_hide(bbs_num = '', post_num = ''):
         if flask.request.method == 'POST':
             pass
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('bbs_post_hide'), await wiki_set(), await wiki_custom(), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('bbs_post_hide'),
+                await render_simple_set('''
                     <form method="post">
                         <button type="submit">''' + await get_lang('hide') + '''</button>
                     </form>
                 '''),
-                menu = [['bbs/w/' + bbs_num_str + '/' + post_num_str, await get_lang('return')]]
-            ))
+                '(' + bbs_name + ')' + ' (' + post_num_str + ')',
+                [['bbs/w/' + bbs_num_str + '/' + post_num_str, await get_lang('return')]]
+            )

route/bbs_w_pinned.py

@@ -35,12 +35,13 @@ async def bbs_w_pinned(bbs_num = '', post_num = ''):
             curs.execute(db_change('select set_data from bbs_data where set_code = ? and set_id = ? and set_name = "pinned"'), [post_num_str, bbs_num_str])
             pinned = await get_lang('pinned') if not curs.fetchall() else await get_lang('pinned_release')
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('bbs_post_pinned'), await wiki_set(), await wiki_custom(), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('bbs_post_pinned'),
+                await render_simple_set('''
                     <form method="post">
                         <button type="submit">''' + pinned + '''</button>
                     </form>
                 '''),
-                menu = [['bbs/w/' + bbs_num_str + '/' + post_num_str, await get_lang('return')]]
-            ))
+                '(' + bbs_name + ')' + ' (' + post_num_str + ')',
+                [['bbs/w/' + bbs_num_str + '/' + post_num_str, await get_lang('return')]]
+            )

route/bbs_w_post.py

@@ -209,8 +209,9 @@ async def bbs_w_post(bbs_num = '', post_num = ''):
                     </form>
                 '''
 
-                return easy_minify(flask.render_template(await skin_check(),
-                    imp = [bbs_name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('bbs') + ')', 0])],
-                    data = data,
-                    menu = [['bbs/in/' + bbs_num_str, await get_lang('return')], ['bbs/edit/' + bbs_num_str + '/' + post_num_str, await get_lang('edit')], ['bbs/tool/' + bbs_num_str + '/' + post_num_str, await get_lang('tool')]]
-                ))
+                return await render_template(
+                    bbs_name,
+                    data,
+                    '(' + await get_lang('bbs') + ')',
+                    [['bbs/in/' + bbs_num_str, await get_lang('return')], ['bbs/edit/' + bbs_num_str + '/' + post_num_str, await get_lang('edit')], ['bbs/tool/' + bbs_num_str + '/' + post_num_str, await get_lang('tool')]]
+                )

route/bbs_w_tool.py

@@ -35,8 +35,9 @@ async def bbs_w_tool(bbs_num = '', post_num = ''):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('bbs_post_tool'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = data,
-            menu = [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str), await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('bbs_post_tool'),
+            data,
+            0,
+            [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str), await get_lang('return')]]
+        )

route/edit.py

@@ -354,9 +354,9 @@ async def edit(name = 'Test', section = 0, do_type = ''):
             sub_menu = ' (' + str(section) + ')' if section != '' else ''
             sub_title = '(' + await get_lang('edit_request') + ')' if edit_req_mode == 1 else '(' + await get_lang('edit') + ')'
 
-            return easy_minify(flask.render_template(await skin_check(), 
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css([sub_title + sub_menu, 0])],
-                data = editor_top_text + '''
+            return await render_template(
+                name,
+                editor_top_text + '''
                     <form method="post">
                         <textarea style="display: none;" name="doc_section_data_where">''' + data_section_where + '''</textarea>
                         <input class="__ON_INPUT__" style="display: none;" name="doc_section_edit_apply" value="''' + doc_section_edit_apply + '''">
@@ -370,10 +370,11 @@ async def edit(name = 'Test', section = 0, do_type = ''):
                         ''' + await edit_editor(conn, ip, data_section, addon = get_edit_text_bottom_check_box(conn) + get_edit_text_bottom(conn, 'edit') , name = name) + '''
                     </form>
                 ''',
-                menu = [
+                sub_title + sub_menu,
+                [
                     ['w/' + url_pas(name), await get_lang('return')],
                     ['delete/' + url_pas(name), await get_lang('delete')], 
                     ['move/' + url_pas(name), await get_lang('move')], 
                     ['upload', await get_lang('upload')]
                 ]
-            ))
+            )

route/edit_delete.py

@@ -53,9 +53,9 @@ async def edit_delete(name):
 
             return redirect(conn, '/w/' + url_pas(name))
         else:            
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('delete') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         <input class="__ON_INPUT__" placeholder="''' + await get_lang('why') + '''" name="send">
                         <hr class="main_hr">
@@ -63,5 +63,6 @@ async def edit_delete(name):
                         <button type="submit">''' + await get_lang('delete') + '''</button>
                     </form>
                 ''',
-                menu = [['w/' + url_pas(name), await get_lang('return')]]
-            ))
+                '(' + await get_lang('delete') + ')',
+                [['w/' + url_pas(name), await get_lang('return')]]
+            )

route/edit_delete_file.py

@@ -30,9 +30,9 @@ async def edit_delete_file(name = 'test.jpg'):
 
             return redirect(conn, '/w/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('file_delete') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         <img src="/image/''' + url_pas(file_all_name) + '''">
                         <hr class="main_hr">
@@ -43,5 +43,6 @@ async def edit_delete_file(name = 'test.jpg'):
                         <button type="submit">''' + await get_lang('file_delete') + '''</button>
                     </form>
                 ''',
-                menu = [['w/' + url_pas(name), await get_lang('return')]]
-            ))
+                '(' + await get_lang('file_delete') + ')',
+                [['w/' + url_pas(name), await get_lang('return')]]
+            )

route/edit_delete_multiple.py

@@ -23,9 +23,9 @@ async def edit_delete_multiple():
 
             return redirect(conn, '/recent_change')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('many_delete'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('many_delete'),
+                '''
                     <form method="post">
                         <textarea class="opennamu_textarea_500" placeholder="''' + await get_lang('many_delete_help') + '''" name="content"></textarea>
                         <hr class="main_hr">
@@ -35,5 +35,6 @@ async def edit_delete_multiple():
                         <button type="submit">''' + await get_lang('delete') + '''</button>
                     </form>
                 ''',
-                menu = [['manager/1', await get_lang('return')]]
-            ))
+                0,
+                [['manager/1', await get_lang('return')]]
+            )

route/edit_move.py

@@ -213,9 +213,9 @@ async def edit_move(name):
             owner_auth = await acl_check(tool = 'owner_auth')
             owner_auth = 1 if owner_auth == 0 else 0
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('move') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         <span>''' + await get_lang('document_name') + '''</span>
                         <hr class="main_hr">
@@ -261,5 +261,6 @@ async def edit_move(name):
                         <button type="submit">''' + await get_lang('move') + '''</button>
                     </form>
                 ''',
-                menu = [['w/' + url_pas(name), await get_lang('return')], ['move_all', await get_lang('multiple_move')]]
-            ))
+                '(' + await get_lang('move') + ')',
+                [['w/' + url_pas(name), await get_lang('return')], ['move_all', await get_lang('multiple_move')]]
+            )

route/edit_request.py

@@ -90,9 +90,9 @@ async def edit_request(name = 'Test', do_type = ''):
 
             result = view_diff_do(old_data, edit_request_data, 'r' + doc_ver, await get_lang('edit_request'))
 
-            return easy_minify(flask.render_template(await skin_check(), 
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('edit_request_check') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <div id="opennamu_get_user_info">''' + html.escape(edit_request_user) + '''</div>
                     <hr class="main_hr">
                     ''' + edit_request_date + '''
@@ -108,5 +108,6 @@ async def edit_request(name = 'Test', do_type = ''):
                         <textarea readonly class="opennamu_textarea_500">''' + html.escape(edit_request_data) + '''</textarea>
                     </form>
                 ''',
-                menu = 0
-            ))
+                '(' + await get_lang('edit_request_check') + ')',
+                0
+            )

route/edit_revert.py

@@ -74,9 +74,9 @@ async def edit_revert(name, num):
             else:
                 preview = ''
             
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(r' + str(num) + ') (' + await get_lang('revert') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         <input class="__ON_INPUT__" placeholder="''' + await get_lang('why') + '''" name="send" type="text">
                         <hr class="main_hr">
@@ -84,5 +84,6 @@ async def edit_revert(name, num):
                         <button type="submit">''' + await get_lang('revert') + '''</button>
                     </form>
                 ''' + preview,
-                menu = [['history/' + url_pas(name), await get_lang('history')], ['recent_changes', await get_lang('recent_change')]]
-            ))
+                '(r' + str(num) + ') (' + await get_lang('revert') + ')',
+                [['history/' + url_pas(name), await get_lang('history')], ['recent_changes', await get_lang('recent_change')]]
+            )

route/edit_upload.py

@@ -135,9 +135,9 @@ async def edit_upload():
             db_data = curs.fetchall()
             upload_default = html.escape(db_data[0][0]) if db_data and db_data[0][0] != '' else ''
             
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('upload'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('upload'),
+                '''
                     <a href="/filter/file_filter">(''' + await get_lang('file_filter_list') + ''')</a> <a href="/filter/extension_filter">(''' + await get_lang('extension_filter_list') + ''')</a>
                     ''' + upload_help + '''
                     <hr class="main_hr">
@@ -162,5 +162,6 @@ async def edit_upload():
                     <script defer src="/views/main_css/js/func/file_preview.js''' + cache_v() + '''"></script>
                     <script>window.addEventListener("DOMContentLoaded", function() { opennamu_file_preview(); });</script>
                 ''',
-                menu = [['other', await get_lang('return')]]
-            ))
+                0,
+                [['other', await get_lang('return')]]
+            )

route/filter_all.py

@@ -87,8 +87,9 @@ async def filter_all(tool):
             div += '<hr class="main_hr">'
             div += '<a href="/filter/' + tool + '/add">(' + await get_lang('add') + ')</a>'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [title, await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['manager/1', await get_lang('return')]]
-        ))
+        return await render_template(
+            title,
+            div,
+            0,
+            [['manager/1', await get_lang('return')]]
+        )

route/filter_all_add.py

@@ -268,14 +268,15 @@ async def filter_all_add(tool, name = None):
                     <input class="__ON_INPUT__" value="''' + html.escape(value) + '''" type="text" name="markup">
                 '''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [title, await wiki_set(), await wiki_custom(), wiki_css([get_sub, 0])],
-                data =  '''
+            return await render_template(
+                title,
+                '''
                         <form method="post">
                             ''' + form_data + '''
                             <hr class="main_hr">
                             <button ''' + stat + ''' type="submit">''' + await get_lang('add') + '''</button>
                         </form>
                         ''',
-                menu = [['filter/' + tool, await get_lang('return')]]
-            ))
+                get_sub,
+                [['filter/' + tool, await get_lang('return')]]
+            )

route/give_admin_groups.py

@@ -108,14 +108,15 @@ async def give_admin_groups(name = 'test'):
 
             data += '</ul>'
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('admin_group') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         ''' + data + '''
                         <hr class="main_hr">
                         <button ''' + state +  ''' type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['auth/list', await get_lang('return')]]
-            ))
+                '(' + await get_lang('admin_group') + ')',
+                [['auth/list', await get_lang('return')]]
+            )

route/give_delete_admin_group.py

@@ -21,12 +21,13 @@ async def give_delete_admin_group(name = 'test'):
             else:
                 return await re_error(conn, 47)
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang("delete_admin_group"), await wiki_set(), await wiki_custom(), wiki_css(['(' + name + ')', 0])],
-                data = '' + \
+            return await render_template(
+                await get_lang("delete_admin_group"),
+                '' + \
                     '<form method="post">' + \
                         '<button type="submit">' + await get_lang('delete') + '</button>' + \
                     '</form>' + \
                 '',
-                menu = [['auth/list', await get_lang('return')]]
-            ))
+                '(' + name + ')',
+                [['auth/list', await get_lang('return')]]
+            )

route/give_user_ban.py

@@ -131,9 +131,9 @@ async def give_user_ban(name = None, ban_type = ''):
             if await acl_check(tool = 'owner_auth', ip = ip) != 1:
                 owner_option = '<option value="private" ' + ('selected' if ban_type == 'private' else '') + '>' + await get_lang('private') + '</option>'
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [main_name, await wiki_set(), await wiki_custom(), wiki_css([now, 0])],
-                data = info_data + '''
+            return await render_template(
+                main_name,
+                info_data + '''
                     <form method="post" ''' + action + '''>
                         <h2>''' + await get_lang('method') + '''</h2>
                         ''' + n_name + '''
@@ -179,5 +179,6 @@ async def give_user_ban(name = None, ban_type = ''):
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['manager', await get_lang('return')]]
-            ))   
+                now,
+                [['manager', await get_lang('return')]]
+            )

route/give_user_fix.py

@@ -47,9 +47,9 @@ async def give_user_fix(user_name = ''):
 
             return redirect(conn, '/user/' + url_pas(user_name))
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('user_fix'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('user_fix'),
+                '''
                     <form method="post">
                         <div id="opennamu_get_user_info">''' + html.escape(user_name) + '''</div>
                         <hr class="main_hr">
@@ -70,5 +70,6 @@ async def give_user_fix(user_name = ''):
                         <button type="submit">''' + await get_lang('go') + '''</button>
                     </form>
                 ''',
-                menu = [['manager', await get_lang('return')]]
-            ))
+                0,
+                [['manager', await get_lang('return')]]
+            )

route/go_main_func_easter_egg.py

@@ -12,8 +12,9 @@ async def main_func_easter_egg():
     
         data = ''
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = ['Easter Egg', await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = data,
-            menu = 0
-        ))
+        return await render_template(
+            'Easter Egg',
+            data,
+            0,
+            0
+        )

route/list_acl.py

@@ -32,8 +32,9 @@ async def list_acl(arg_num = 1):
         div += '</ul>'
         div += await get_next_page_bottom('/list/document/acl/{}', arg_num, list_data)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('acl_document_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('acl_document_list'),
+            div,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_admin.py

@@ -19,8 +19,9 @@ async def list_admin():
 
         div += '</ul>'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('admin_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('admin_list'),
+            div,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_admin_auth_use.py

@@ -39,14 +39,15 @@ async def list_admin_auth_use(arg_num = 1, arg_search = 'normal'):
 
             arg_search = html.escape(arg_search) if arg_search != 'normal' else ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('authority_use_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('authority_use_list'),
+                '''
                     <form method="post">
                         <input class="opennamu_width_200 __ON_INPUT__" name="search" placeholder="''' + await get_lang('start_with_search') + '''" value="''' + arg_search + '''">
                         <button type="submit">''' + await get_lang('search') + '''</button>
                     </form>
                     <hr class="main_hr">
                 ''' + list_data,
-                menu = [['other', await get_lang('return')]]
-            ))
+                0,
+                [['other', await get_lang('return')]]
+            )

route/list_admin_group.py

@@ -27,8 +27,9 @@ async def list_admin_group():
             '<a href="/manager/8">(' + await get_lang('add') + ')</a>' + \
         ''
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('admin_group_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = list_data,
-            menu = [['manager', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('admin_group_list'),
+            list_data,
+            0,
+            [['manager', await get_lang('return')]]
+        )

route/list_image_file.py

@@ -58,8 +58,9 @@ async def list_image_file(arg_num = 1, do_type = 0):
         else:
             list_data += await get_next_page_bottom('/list/image/{}', arg_num, data_list)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('image_file_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = list_data,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('image_file_list'),
+            list_data,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_long_page.py

@@ -25,8 +25,9 @@ async def list_long_page(tool = 'long_page', arg_num = 1):
 
         div += '</ul>' + await get_next_page_bottom('/list/document/' + ('long' if title == 'long_page' else 'short') + '/{}', arg_num, n_list)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang(title), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang(title),
+            div,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_no_link.py

@@ -23,8 +23,9 @@ async def list_no_link(num = 1):
         
         div += '</ul>' + await get_next_page_bottom('/list/document/no_link/{}', num, n_list)
         
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('no_link_document_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('no_link_document_list'),
+            div,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_old_page.py

@@ -25,8 +25,9 @@ async def list_old_page(num = 1, set_type = 'old'):
 
         data_html += await get_next_page_bottom(f'/list/document/{set_type}/{{}}', int(num), data)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [title, await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = data_html,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            title,
+            data_html,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_please.py

@@ -19,8 +19,9 @@ async def list_please(arg_num = 1):
 
         div += '</ul>' + await get_next_page_bottom('/list/document/need/{}', arg_num, data_list)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('need_document'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('need_document'),
+            div,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_title_index.py

@@ -58,8 +58,9 @@ async def list_title_index(num = 1):
         data += '</ul>' + await get_next_page_bottom('/list/document/all/{}', num, title_list)
         sub = ' (' + str(num) + ')'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('all_document_list'), await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-            data = data,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('all_document_list'),
+            data,
+            sub,
+            [['other', await get_lang('return')]]
+        )

route/list_user.py

@@ -18,8 +18,9 @@ async def list_user(arg_num = 1):
 
         list_data += '</ul>' + await get_next_page_bottom('/list/user/{}', arg_num, user_list)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('member_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = list_data,
-            menu = [['other', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('member_list'),
+            list_data,
+            0,
+            [['other', await get_lang('return')]]
+        )

route/list_user_check.py

@@ -155,11 +155,12 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
             if plus_id:
                 name += ', ' + plus_id
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('check') + ')', 0])],
-                data = div,
-                menu = [['manager', await get_lang('return')]]
-            ))
+            return await render_template(
+                name,
+                div,
+                '(' + await get_lang('check') + ')',
+                [['manager', await get_lang('return')]]
+            )
         else:
             curs.execute(db_change("" + \
                 "select distinct " + ('name' if ip_or_user(name) == 1 else 'ip') + " from ua_d " + \
@@ -184,8 +185,9 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
                 '<a href="/list/user/check/' + url_pas(name) + '/normal">(' + await get_lang('check') + ')</a>' + \
             '' + div
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('simple_check') + ')', 0])],
-                data = div,
-                menu = [['check/' + url_pas(name), await get_lang('return')]]
-            ))
+            return await render_template(
+                name,
+                div,
+                '(' + await get_lang('simple_check') + ')',
+                [['check/' + url_pas(name), await get_lang('return')]]
+            )

route/list_user_check_delete.py

@@ -17,9 +17,9 @@ async def list_user_check_delete(name = None, ip = None, time = None, do_type =
 
                 return redirect(conn, '/list/user/check/' + url_pas(user_id if return_type == '0' else user_ip))
             else:
-                return easy_minify(flask.render_template(await skin_check(),
-                    imp = [await get_lang('check'), await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('delete') + ')', 0])],
-                    data = '''
+                return await render_template(
+                    await get_lang('check'),
+                    '''
                         ''' + await get_lang('name') + ''' : ''' + user_id + '''
                         <hr class="main_hr">
                         ''' + await get_lang('ip') + ''' : ''' + user_ip + '''
@@ -30,7 +30,8 @@ async def list_user_check_delete(name = None, ip = None, time = None, do_type =
                             <button type="submit">''' + await get_lang('delete') + '''</button>
                         </form>
                     ''',
-                    menu = [['check/' + url_pas(user_id if return_type == '0' else user_ip), await get_lang('return')]]
-                ))
+                    '(' + await get_lang('delete') + ')',
+                    [['check/' + url_pas(user_id if return_type == '0' else user_ip), await get_lang('return')]]
+                )
         else:
-            return redirect(conn)
+            return redirect(conn)

route/login_find.py

@@ -1,13 +1,14 @@
 from .tool.func import *
 
 async def login_find():
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [await get_lang('password_search'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-        data = '''
+    return await render_template(
+        await get_lang('password_search'),
+        '''
             <ul>
                 <li><a href="/login/find/email">''' + await get_lang('email') + '''</a></li>
                 <li><a href="/login/find/key">''' + await get_lang('key') + '''</a></li>
             </ul>
         ''',
-        menu = [['user', await get_lang('return')]]
-    ))
+        0,
+        [['user', await get_lang('return')]]
+    )

route/login_find_email.py

@@ -79,9 +79,9 @@ async def login_find_email(tool):
                 sql_d = curs.fetchall()
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-                return easy_minify(flask.render_template(await skin_check(),
-                    imp = [await get_lang('password_search'), await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('email') + ')', 0])],
-                    data = b_text + '''
+                return await render_template(
+                    await get_lang('password_search'),
+                    b_text + '''
                         <form method="post">
                             <input class="__ON_INPUT__" placeholder="''' + await get_lang('id') + '''" name="id" type="text">
                             <hr class="main_hr">
@@ -90,8 +90,9 @@ async def login_find_email(tool):
                             <button type="submit">''' + await get_lang('save') + '''</button>
                         </form>
                     ''',
-                    menu = [['user', await get_lang('return')]]
-                ))
+                    '(' + await get_lang('email') + ')',
+                    [['user', await get_lang('return')]]
+                )
             else:
                 if tool == 'need_email' and not 'c_type' in flask.session:
                     return redirect(conn, '/register')
@@ -100,9 +101,9 @@ async def login_find_email(tool):
                 sql_d = curs.fetchall()
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-                return easy_minify(flask.render_template(await skin_check(),
-                    imp = [await get_lang('email'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                    data = '''
+                return await render_template(
+                    await get_lang('email'),
+                    '''
                         <a href="/filter/email_filter">(''' + await get_lang('email_filter_list') + ''')</a>
                         <hr class="main_hr">
                         ''' + b_text + '''
@@ -112,5 +113,6 @@ async def login_find_email(tool):
                             <button type="submit">''' + await get_lang('save') + '''</button>
                         </form>
                     ''',
-                    menu = [['user', await get_lang('return')]]
-                ))
+                    0,
+                    [['user', await get_lang('return')]]
+                )

route/login_find_email_check.py

@@ -30,16 +30,17 @@ async def login_find_email_check(tool):
                 sql_d = curs.fetchall()
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-                return easy_minify(flask.render_template(await skin_check(),
-                    imp = [await get_lang('reset_user_ok'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                    data = '' + \
+                return await render_template(
+                    await get_lang('reset_user_ok'),
+                    '' + \
                         b_text + \
                         await get_lang('id') + ' : ' + user_id + \
                         '<hr class="main_hr">' + \
                         await get_lang('password') + ' : ' + user_pw + \
                     '',
-                    menu = [['user', await get_lang('return')]]
-                ))
+                    0,
+                    [['user', await get_lang('return')]]
+                )
             elif 'c_type' in flask.session and (flask.session['c_key'] == input_key or flask.session['c_key'] == 'email_pass'):
                 curs.execute(db_change('select data from other where name = "encode"'))
                 db_data = curs.fetchall()
@@ -121,9 +122,9 @@ async def login_find_email_check(tool):
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('check_key'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('check_key'),
+                '''
                     <form method="post">
                         ''' + b_text + '''
                         <input class="__ON_INPUT__" placeholder="''' + await get_lang('key') + '''" name="key" type="password">
@@ -131,5 +132,6 @@ async def login_find_email_check(tool):
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_find_key.py

@@ -29,20 +29,21 @@ async def login_find_key():
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
             
-            return easy_minify(flask.render_template(await skin_check(),
-                    imp = [await get_lang('reset_user_ok'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                    data = '' + \
+            return await render_template(
+                    await get_lang('reset_user_ok'),
+                    '' + \
                         b_text + \
                         await get_lang('id') + ' : ' + user_id + \
                         '<hr class="main_hr">' + \
                         await get_lang('password') + ' : ' + key + \
                     '',
-                    menu = [['user', await get_lang('return')]]
-                ))
+                    0,
+                    [['user', await get_lang('return')]]
+            )
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('password_search'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('password_search'),
+                '''
                     <form method="post">
                         <input class="__ON_INPUT__" placeholder="''' + await get_lang('key') + '''" name="key" type="password">
                         <hr class="main_hr">
@@ -50,5 +51,6 @@ async def login_find_key():
                         <button type="submit">''' + await get_lang('send') + '''</button>
                     </form>
                 ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_login.py

@@ -49,9 +49,9 @@ async def login_login():
 
                 return redirect(conn, '/user')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('login'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data =  '''
+            return await render_template(
+                await get_lang('login'),
+                '''
                         <form method="post">
                             <input class="__ON_INPUT__" placeholder="''' + await get_lang('id') + '''" name="id" type="text">
                             <hr class="main_hr">
@@ -64,5 +64,6 @@ async def login_login():
                             ''' + await http_warning() + '''
                         </form>
                         ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_login_2fa.py

@@ -49,9 +49,9 @@ async def login_login_2fa():
 
             return redirect(conn, '/user')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('login'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data =  '''
+            return await render_template(
+                await get_lang('login'),
+                '''
                         <form method="post">
                             <input class="__ON_INPUT__" placeholder="''' + await get_lang('2fa_password') + '''" name="pw" type="password">
                             <hr class="main_hr">
@@ -60,5 +60,6 @@ async def login_login_2fa():
                             ''' + await http_warning() + '''
                         </form>
                         ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_login_2fa_email.py

@@ -44,9 +44,9 @@ async def login_login_2fa_email():
 
             return redirect(conn, '/user')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('login'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data =  '''
+            return await render_template(
+                await get_lang('login'),
+                '''
                         <form method="post">
                             <input class="__ON_INPUT__" placeholder="''' + await get_lang('2fa_password') + '''" name="pw" type="password">
                             <hr class=\"main_hr\">
@@ -55,5 +55,6 @@ async def login_login_2fa_email():
                             ''' + await http_warning() + '''
                         </form>
                         ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_register.py

@@ -87,9 +87,9 @@ async def login_register():
             else:
                 password_min_length = ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('register'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('register'),
+                '''
                     <form method="post">
                         ''' + contract + '''
 
@@ -109,5 +109,6 @@ async def login_register():
                         ''' + await http_warning() + '''
                     </form>
                 ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_register_email.py

@@ -50,9 +50,9 @@ async def login_register_email():
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('email'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('email'),
+                '''
                     <a href="/filter/email_filter">(''' + await get_lang('email_filter_list') + ''')</a>
                     <hr class="main_hr">
                     ''' + b_text + '''
@@ -62,5 +62,6 @@ async def login_register_email():
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_register_email_check.py

@@ -34,9 +34,9 @@ async def login_register_email_check():
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('check_key'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('check_key'),
+                '''
                     <form method="post">
                         ''' + b_text + '''
                         <input class="__ON_INPUT__" placeholder="''' + await get_lang('key') + '''" name="key" type="text">
@@ -44,5 +44,6 @@ async def login_register_email_check():
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/login_register_submit.py

@@ -52,9 +52,9 @@ async def login_register_submit():
 
             return await re_error(conn, 43)
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('approval_question'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('approval_question'),
+                '''
                     <form method="post">
                         ''' + await get_lang('approval_question') + ' : ' + data_que + '''
                         <hr class="main_hr">
@@ -63,5 +63,6 @@ async def login_register_submit():
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )

route/main_func_error_404.py

@@ -23,10 +23,11 @@ async def main_func_error_404(e = ''):
                 db_data = db_data[0][0] if db_data and db_data[0][0] != '' else ''
 
                 if db_data != '':
-                    return easy_minify(flask.render_template(await skin_check(),
-                        imp = ['404', await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                        data = db_data,
-                        menu = 0
-                    )), 404
+                    return await render_template(
+                        '404',
+                        db_data,
+                        0,
+                        0
+                    ), 404
                 else:
-                    return await re_error(conn, 46)
+                    return await re_error(conn, 46)

route/main_search_deep.py

@@ -62,8 +62,9 @@ async def main_search_deep(name = 'Test', search_type = 'title', num = 1):
             else:
                 div += await get_next_page_bottom('/search_data_page/{}/' + url_pas(name), num, all_list)
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('search') + ')', 0])],
-                data = div,
-                menu = 0
-            ))
+            return await render_template(
+                name,
+                div,
+                '(' + await get_lang('search') + ')',
+                0
+            )

route/main_setting.py

@@ -18,8 +18,9 @@ async def main_setting():
 
         li_data = ''.join(['<li><a href="/setting/' + str(li[0]) + '">' + li[1] + '</a></li>' for li in li_list])
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('setting'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = '<h2>' + await get_lang('list') + '</h2><ul>' + li_data + '</ul>',
-            menu = [['manager', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('setting'),
+            '<h2>' + await get_lang('list') + '</h2><ul>' + li_data + '</ul>',
+            0,
+            [['manager', await get_lang('return')]]
+        )

route/main_setting_404_page.py

@@ -53,8 +53,9 @@ async def main_setting_404_page():
                 '</form>'
             )
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('404_page_setting'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = data_html,
-                menu = [['setting', await get_lang('return')]]
-            ))
+            return await render_template(
+                await get_lang('404_page_setting'),
+                data_html,
+                0,
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_email_test.py

@@ -14,15 +14,16 @@ async def main_setting_email_test():
             else:
                 data = await get_lang("error")
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang("email_test"), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = data,
-                menu = [["setting/external", await get_lang('return')]]
-            ))
+            return await render_template(
+                await get_lang("email_test"),
+                data,
+                0,
+                [["setting/external", await get_lang('return')]]
+            )
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang("email_test"), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang("email_test"),
+                '''
                     <form method="post">
                         <input class="__ON_INPUT__" name="title" placeholder="''' + await get_lang("title") + '''">
                         <hr class="main_hr">
@@ -33,5 +34,6 @@ async def main_setting_email_test():
                         <button type="submit">''' + await get_lang("send") + '''</button>
                     </form>
                 ''',
-                menu = [["setting/external", await get_lang('return')]]
-            ))
+                0,
+                [["setting/external", await get_lang('return')]]
+            )

route/main_setting_external.py

@@ -65,9 +65,9 @@ async def main_setting_external():
                 else:
                     re_ver += '<option value="' + i + '">' + re_ver_list[i] + '</option>'
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('ext_api_req_set'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('ext_api_req_set'),
+                await render_simple_set('''
                     <form method="post">
                         <h2>''' + await get_lang('captcha') + '''</h2>
                         <a href="https://www.google.com/recaptcha/">(''' + await get_lang('recaptcha') + ''')</a> <a href="https://www.hcaptcha.com/">(''' + await get_lang('hcaptcha') + ''')</a>
@@ -140,5 +140,6 @@ async def main_setting_external():
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 '''),
-                menu = [['setting', await get_lang('return')]]
-            ))
+                0,
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_head.py

@@ -97,9 +97,9 @@ async def main_setting_head(num, skin_name = '', set_preview = 0):
             else:
                 sub_plus = ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang(data = 'main' + title, safe = 1), await wiki_set(), await wiki_custom(), wiki_css(['(HTML)' + sub_plus, 0])],
-                data = '''
+            return await render_template(
+                await get_lang(data = 'main' + title, safe = 1),
+                '''
                     <form method="post">
                         ''' + start + '''
                         <textarea class="opennamu_textarea_500" placeholder="''' + await get_lang('enter_html') + '''" name="content" id="content">''' + html.escape(data) + '''</textarea>
@@ -109,5 +109,6 @@ async def main_setting_head(num, skin_name = '', set_preview = 0):
                         ''' + plus + '''
                     </form>
                 ''',
-                menu = [['setting', await get_lang('return')]]
-            ))
+                '(HTML)' + sub_plus,
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_main.py

@@ -199,9 +199,9 @@ async def main_setting_main():
                 <hr class="main_hr">
             '''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('main_setting'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('main_setting'),
+                await render_simple_set('''
                     <form method="post">
                         ''' + basic_set + '''
                         <h2>''' + await get_lang('design_set') + '''</h2>
@@ -329,5 +329,6 @@ async def main_setting_main():
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 '''),
-                menu = [['setting', await get_lang('return')]]
-            ))
+                0,
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_main_logo.py

@@ -44,13 +44,14 @@ async def main_setting_main_logo():
                     '<hr class="main_hr">' + \
                 ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('wiki_logo'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('wiki_logo'),
+                '''
                     <form method="post">
                         ''' + end_data + '''
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['setting/main', await get_lang('return')]]
-            ))
+                0,
+                [['setting/main', await get_lang('return')]]
+            )

route/main_setting_phrase.py

@@ -60,9 +60,9 @@ async def main_setting_phrase():
                     curs.execute(db_change('insert into other (name, data, coverage) values (?, ?, "")'), [i, ''])
                     d_list += ['']
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('text_setting'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('text_setting'),
+                await render_simple_set('''
                     <form method="post">
                         <h2>''' + await get_lang('register_text') + ''' (HTML)</h2>
                         <textarea class="opennamu_textarea_100" name="''' + i_list[0] + '''">''' + html.escape(d_list[0]) + '''</textarea>
@@ -176,5 +176,6 @@ async def main_setting_phrase():
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 '''),
-                menu = [['setting', await get_lang('return')]]
-            ))
+                0,
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_robot.py

@@ -36,9 +36,9 @@ async def main_setting_robot():
 
             return redirect(conn, '/setting/robot')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = ['robots.txt', await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                'robots.txt',
+                '''
                     <a href="/robots.txt">(''' + await get_lang('view') + ''')</a>
                     <hr class="main_hr">
                     <form method="post">
@@ -49,5 +49,6 @@ async def main_setting_robot():
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['setting', await get_lang('return')]]
-            ))
+                0,
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_sitemap.py

@@ -94,12 +94,13 @@ async def main_setting_sitemap(do_type = 0):
             else:
                 return ''
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('sitemap_manual_create'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('sitemap_manual_create'),
+                '''
                     <form method="post">
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('create') + '''</button>
                     </form>
                 ''',
-                menu = [['setting/sitemap_set', await get_lang('return')]]
-            ))
+                0,
+                [['setting/sitemap_set', await get_lang('return')]]
+            )

route/main_setting_sitemap_set.py

@@ -56,9 +56,9 @@ async def main_setting_sitemap_set():
 
                     for_a += 1
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('sitemap_management'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('sitemap_management'),
+                '''
                     ''' + sitemap_list + '''
                     <hr class="main_hr">
                     <form method="post">
@@ -83,5 +83,6 @@ async def main_setting_sitemap_set():
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['setting', await get_lang('return')]]
-            ))
+                0,
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_skin_set.py

@@ -39,9 +39,9 @@ async def main_setting_skin_set():
 
             set_data_main = { for_b : '' for for_b in set_list }
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('main_skin_set_default'), await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('beta') + ')', 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('main_skin_set_default'),
+                await render_simple_set('''
                     <form method="post">
                         <h2>''' + await get_lang("render") + '''</h2>
                         <h3>''' + await get_lang("strike") + '''</h3>
@@ -157,5 +157,6 @@ async def main_setting_skin_set():
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 '''),
-                menu = [['setting', await get_lang('return')]]
-            ))
+                '(' + await get_lang('beta') + ')',
+                [['setting', await get_lang('return')]]
+            )

route/main_setting_top_menu.py

@@ -22,9 +22,9 @@ async def main_setting_top_menu():
             db_data = curs.fetchall()
             db_data = db_data[0][0] if db_data else ''
             
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('top_menu_setting'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('top_menu_setting'),
+                '''
                     <span>
                         EX)
                         <br>
@@ -45,5 +45,6 @@ async def main_setting_top_menu():
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['setting', await get_lang('return')]]
-            ))
+                0,
+                [['setting', await get_lang('return')]]
+            )

route/main_sys_restart.py

@@ -47,12 +47,13 @@ async def main_sys_restart(golang_process):
             threading.Thread(target = main_sys_restart_do).start()
             return flask.Response(await get_lang("warning_restart"), status = 200)
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('wiki_restart'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('wiki_restart'),
+                '''
                     <form method="post">
                         <button type="submit">''' + await get_lang('restart') + '''</button>
                     </form>
                 ''',
-                menu = [['manager', await get_lang('return')]]
-            ))
+                0,
+                [['manager', await get_lang('return')]]
+            )

route/main_sys_shutdown.py

@@ -12,12 +12,13 @@ async def main_sys_shutdown():
 
             sys.exit()
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('wiki_shutdown'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('wiki_shutdown'),
+                '''
                     <form method="post">
                         <button type="submit">''' + await get_lang('shutdown') + '''</button>
                     </form>
                 ''',
-                menu = [['manager', await get_lang('return')]]
-            ))
+                0,
+                [['manager', await get_lang('return')]]
+            )

route/main_sys_update.py

@@ -67,9 +67,9 @@ async def main_sys_update(golang_process):
 
             return await re_error(conn, 34)
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('update'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = await get_lang('update_warning') + '''
+            return await render_template(
+                await get_lang('update'),
+                await get_lang('update_warning') + '''
                     <hr class="main_hr">
                     <ul>
                         <li id="ver_send_2">''' + await get_lang('version') + ''' : </li>
@@ -82,6 +82,7 @@ async def main_sys_update(golang_process):
                     </form>
                     <!-- JS : opennamu_do_insert_version -->
                 ''',
-                menu = [['manager', await get_lang('return')]]
-            ))
+                0,
+                [['manager', await get_lang('return')]]
+            )
 

route/main_tool_admin.py

@@ -1,9 +1,9 @@
 from .tool.func import *
 
 async def main_tool_admin():
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [await get_lang('admin_tool'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-        data = await render_simple_set('''
+    return await render_template(
+        await get_lang('admin_tool'),
+        await render_simple_set('''
             <h2>''' + await get_lang('admin') + '''</h2>
             <ul>
                 <li><a href="/manager/2">''' + await get_lang('document_setting') + '''</a></li>
@@ -57,5 +57,6 @@ async def main_tool_admin():
             <!-- JS : opennamu_do_insert_version -->
             <!-- JS : opennamu_do_insert_version_skin -->
         '''),
-        menu = [['other', await get_lang('return')]]
-    ))
+        0,
+        [['other', await get_lang('return')]]
+    )

route/main_tool_other.py

@@ -1,9 +1,9 @@
 from .tool.func import *
 
 async def main_tool_other():
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [await get_lang('other_tool'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-        data = await render_simple_set('''
+    return await render_template(
+        await get_lang('other_tool'),
+        await render_simple_set('''
             <h2>''' + await get_lang('user_tool') + '''</h2>
             <ul>
                 <li><a href="/manager/6">''' + await get_lang('user_tool') + '''</a></li>
@@ -51,5 +51,6 @@ async def main_tool_other():
                 <li><a href="/manager/1">''' + await get_lang('admin_tool') + '''</a></li>
             </ul>
         '''),
-        menu = 0
-    ))
+        0,
+        0
+    )

route/main_tool_redirect.py

@@ -57,9 +57,9 @@ async def main_tool_redirect(num = 1, add_2 = ''):
                         '<hr class="main_hr">' + \
                     ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [title_list[num][2], await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                title_list[num][2],
+                '''
                     <form method="post">
                         ''' + top_plus + '''
                         <input class="__ON_INPUT__" placeholder="''' + placeholder + '''" id="data_field" name="name" type="text">
@@ -67,5 +67,6 @@ async def main_tool_redirect(num = 1, add_2 = ''):
                         <button type="submit">''' + await get_lang('go') + '''</button>
                     </form>
                 ''',
-                menu = [['manager', await get_lang('return')]]
-            ))
+                0,
+                [['manager', await get_lang('return')]]
+            )

route/n_bbs_in.py

@@ -15,15 +15,16 @@ async def bbs_in(bbs_num = 1, page = 1):
     
         bbs_name = db_data[0][0]
 
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [bbs_name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('bbs') + ') (' + str(page) + ')', 0])],
-        data = '' + \
+    return await render_template(
+        bbs_name,
+        '' + \
             '<div id="opennamu_bbs_in"></div>' + \
             '<script defer src="/views/main_css/js/route/bbs_in.js' + cache_v() + '"></script>' + \
             '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_in(); });</script>' + \
         '',
-        menu = [['bbs/main', await get_lang('return')], ['bbs/edit/' + bbs_num_str, await get_lang('add')], ['bbs/set/' + bbs_num_str, await get_lang('bbs_set')]]
-    ))
+        '(' + await get_lang('bbs') + ') (' + str(page) + ')',
+        [['bbs/main', await get_lang('return')], ['bbs/edit/' + bbs_num_str, await get_lang('add')], ['bbs/set/' + bbs_num_str, await get_lang('bbs_set')]]
+    )
 
 '''
 async def bbs_in(bbs_num = 1, page = 1):
@@ -61,4 +62,4 @@ async def bbs_in(bbs_num = 1, page = 1):
             data_html += '<hr class="main_hr">'
 
         get_next_page_bottom()
-'''
+'''

route/n_bbs_w_set.py

@@ -13,12 +13,13 @@ async def bbs_w_set(bbs_num = ''):
 
         bbs_num_str = str(bbs_num)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('bbs_set'), await wiki_set(), await wiki_custom(), wiki_css(['(' + bbs_name + ')', 0])],
-            data = '' + \
+        return await render_template(
+            await get_lang('bbs_set'),
+            '' + \
                 '<div id="opennamu_bbs_w_set"></div>' + \
                 '<script defer src="/views/main_css/js/route/bbs_w_set.js' + cache_v() + '"></script>' + \
                 '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_w_set(); });</script>' + \
             '',
-            menu = [['bbs/in/' + bbs_num_str, await get_lang('return')]]
-        ))
+            '(' + bbs_name + ')',
+            [['bbs/in/' + bbs_num_str, await get_lang('return')]]
+        )

route/n_edit_move_all.py

@@ -1,12 +1,13 @@
 from .tool.func import *
 
 async def edit_move_all():
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [await get_lang('multiple_move'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-        data = '' + \
+    return await render_template(
+        await get_lang('multiple_move'),
+        '' + \
             '<div id="opennamu_edit_move_all"></div>' + \
             '<script defer src="/views/main_css/js/route/edit_move_all.js' + cache_v() + '"></script>' + \
             '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_edit_move_all(); });</script>' + \
         '',
-        menu = [['other', await get_lang('return')]]
-    ))
+        0,
+        [['other', await get_lang('return')]]
+    )

route/n_give_auth.py

@@ -7,12 +7,13 @@ async def give_auth(user_name = ''):
     else:
         sub = '(' + await get_lang('authorize') + ')'
 
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [user_name, await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-        data = '' + \
+    return await render_template(
+        user_name,
+        '' + \
             '<div id="opennamu_give_auth"></div>' + \
             '<script defer src="/views/main_css/js/route/give_auth.js' + cache_v() + '"></script>' + \
             '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_give_auth(); });</script>' + \
         '',
-        menu = [['manager', await get_lang('return')]]
-    ))
+        sub,
+        [['manager', await get_lang('return')]]
+    )

route/n_list_recent_block.py

@@ -15,12 +15,13 @@ async def list_recent_block(user_name = 'Test', tool = 'all', num = 1, why = '')
     elif tool == 'admin':
         sub = '(' + await get_lang('admin') + ')'
 
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [await get_lang('recent_ban'), await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-        data = '' + \
+    return await render_template(
+        await get_lang('recent_ban'),
+        '' + \
             '<div id="opennamu_list_recent_block"></div>' + \
             '<script defer src="/views/main_css/js/route/list_recent_block.js' + cache_v() + '"></script>' + \
             '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_block(); });</script>' + \
         '',
-        menu = [['other', await get_lang('return')]]
-    ))
+        sub,
+        [['other', await get_lang('return')]]
+    )

route/n_list_recent_discuss.py

@@ -7,12 +7,13 @@ async def list_recent_discuss(num = 1, tool = 'normal'):
     elif tool == 'open':
         m_sub = '(' + await get_lang('open_discussion') + ')'
 
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [await get_lang('recent_discussion'), await wiki_set(), await wiki_custom(), wiki_css([m_sub, 0])],
-        data = '' + \
+    return await render_template(
+        await get_lang('recent_discussion'),
+        '' + \
             '<div id="opennamu_list_recent_discuss"></div>' + \
             '<script defer src="/views/main_css/js/route/list_recent_discuss.js' + cache_v() + '"></script>' + \
             '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_discuss(); });</script>' + \
         '',
-        menu = [['other', await get_lang('return')]]
-    ))
+        m_sub,
+        [['other', await get_lang('return')]]
+    )

route/n_list_user_check_submit.py

@@ -1,12 +1,13 @@
 from .tool.func import *
 
 async def list_user_check_submit(name = 'Test'):
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('check') + ')', 0])],
-        data = '' + \
+    return await render_template(
+        name,
+        '' + \
             '<div id="opennamu_list_user_check_submit"></div>' + \
             '<script defer src="/views/main_css/js/route/list_user_check_submit.js' + cache_v() + '"></script>' + \
             '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_user_check_submit(); });</script>' + \
         '',
-        menu = [['setting', await get_lang('return')]]
-    ))
+        '(' + await get_lang('check') + ')',
+        [['setting', await get_lang('return')]]
+    )

route/n_topic_list.py

@@ -1,12 +1,13 @@
 from .tool.func import *
 
 async def topic_list(page = 1, name = 'Test'):
-    return easy_minify(flask.render_template(await skin_check(),
-        imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('discussion_list') + ')', 0])],
-        data = '' + \
+    return await render_template(
+        name,
+        '' + \
             '<div id="opennamu_topic_list"></div>' + \
             '<script defer src="/views/main_css/js/route/topic_list.js' + cache_v() + '"></script>' + \
             '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_topic_list(); });</script>' + \
         '',
-        menu = [['w/' + url_pas(name), await get_lang('document')]]
-    ))
+        '(' + await get_lang('discussion_list') + ')',
+        [['w/' + url_pas(name), await get_lang('document')]]
+    )

route/recent_app_submit.py

@@ -86,11 +86,12 @@ async def recent_app_submit():
             else:
                 div += await get_lang('no_applications_now')
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('application_list'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = div,
-                menu = [['other', await get_lang('return')]]
-            ))
+            return await render_template(
+                await get_lang('application_list'),
+                div,
+                0,
+                [['other', await get_lang('return')]]
+            )
         else:
             if await acl_check(tool = 'ban_auth', memo = 'app submit') == 1:
                 return await re_error(conn, 0)
@@ -112,4 +113,4 @@ async def recent_app_submit():
             elif flask.request.form.get('decline', '') != '':
                 curs.execute(db_change('delete from user_set where id = ? and name = "application"'), [flask.request.form.get('decline', '')])
 
-            return redirect(conn, '/app_submit')
+            return redirect(conn, '/app_submit')

route/recent_change.py

@@ -241,8 +241,9 @@ async def recent_change(name = '', tool = '', num = 1, set_type = 'normal'):
             if sub == '':
                 sub = 0
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [title, await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-                data = div,
-                menu = menu
-            ))
+            return await render_template(
+                title,
+                div,
+                sub,
+                menu
+            )

route/recent_edit_request.py

@@ -49,8 +49,9 @@ async def recent_edit_request():
             '</table>' + \
         ''
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('recent_edit_request'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['recent_change', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('recent_edit_request'),
+            div,
+            0,
+            [['recent_change', await get_lang('return')]]
+        )

route/recent_history_add.py

@@ -29,9 +29,9 @@ async def recent_history_add(name = 'Test', do_type = ''):
 
             return redirect(conn, '/history/' + url_pas(name))
         else:            
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('history_add'), await wiki_set(), await wiki_custom(), wiki_css(['(' + name + ')', 0])],
-                data = '''
+            return await render_template(
+                await get_lang('history_add'),
+                '''
                     <form method="post">
                         <input class="__ON_INPUT__" placeholder="''' + await get_lang('why') + '''" name="send">
                         <hr class="main_hr">
@@ -42,5 +42,6 @@ async def recent_history_add(name = 'Test', do_type = ''):
                         ''' + await edit_editor(conn, ip) + '''
                     </form>
                 ''',
-                menu = [['history/' + url_pas(name), await get_lang('return')]]
-            ))
+                '(' + name + ')',
+                [['history/' + url_pas(name), await get_lang('return')]]
+            )

route/recent_history_delete.py

@@ -16,14 +16,15 @@ async def recent_history_delete(name = 'Test', rev = 1):
 
             return redirect(conn, '/history/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('history_delete') + ') (r' + num + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         <span>''' + await get_lang('delete_warning') + '''</span>
                         <hr class="main_hr">
                         <button type="submit">''' + await get_lang('delete') + '''</button>
                     </form>
                 ''',
-                menu = [['history/' + url_pas(name), await get_lang('return')]]
-            ))
+                '(' + await get_lang('history_delete') + ') (r' + num + ')',
+                [['history/' + url_pas(name), await get_lang('return')]]
+            )

route/recent_history_reset.py

@@ -14,14 +14,15 @@ async def recent_history_reset(name = 'Test'):
 
             return redirect(conn, '/history/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('history_reset') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         <span>''' + await get_lang('delete_warning') + '''</span>
                         <hr class="main_hr">
                         <button type="submit">''' + await get_lang('reset') + '''</button>
                     </form>
                 ''',
-                menu = [['history/' + url_pas(name), await get_lang('return')]]
-            ))
+                '(' + await get_lang('history_reset') + ')',
+                [['history/' + url_pas(name), await get_lang('return')]]
+            )

route/recent_history_send.py

@@ -27,9 +27,9 @@ async def recent_history_send(name = 'Test', rev = 1):
             if send:
                 send = send[0][0]
 
-                return easy_minify(flask.render_template(await skin_check(),
-                    imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('send_edit') + ') (r' + num + ')', 0])],
-                    data = '''
+                return await render_template(
+                    name,
+                    '''
                         <form method="post">
                             <span>''' + await get_lang('delete_warning') + '''</span>
                             <hr class="main_hr">
@@ -38,7 +38,8 @@ async def recent_history_send(name = 'Test', rev = 1):
                             <button type="submit">''' + await get_lang('edit') + '''</button>
                         </form>
                     ''',
-                    menu = [['history/' + url_pas(name), await get_lang('return')]]
-                ))
+                    '(' + await get_lang('send_edit') + ') (r' + num + ')',
+                    [['history/' + url_pas(name), await get_lang('return')]]
+                )
             else:
-                return redirect(conn, '/history/' + url_pas(name))
+                return redirect(conn, '/history/' + url_pas(name))

route/recent_history_tool.py

@@ -42,8 +42,9 @@ async def recent_history_tool(name = 'Test', rev = 1):
             data += '<li><a href="/history_send/' + num + '/' + url_pas(name) + '">' + await get_lang('send_edit') + '</a></li>'
             data += '</ul>'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(r' + num + ')', 0])],
-            data = data,
-            menu = [['history/' + url_pas(name), await get_lang('return')]]
-        ))
+        return await render_template(
+            name,
+            data,
+            '(r' + num + ')',
+            [['history/' + url_pas(name), await get_lang('return')]]
+        )

route/recent_record_reset.py

@@ -14,14 +14,15 @@ async def recent_record_reset(name = 'Test'):
 
             return redirect(conn, '/record/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('record_reset') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <form method="post">
                         <span>''' + await get_lang('delete_warning') + '''</span>
                         <hr class="main_hr">
                         <button type="submit">''' + await get_lang('reset') + '''</button>
                     </form>
                 ''',
-                menu = [['record/' + url_pas(name), await get_lang('return')]]
-            ))
+                '(' + await get_lang('record_reset') + ')',
+                [['record/' + url_pas(name), await get_lang('return')]]
+            )

route/recent_record_topic.py

@@ -39,8 +39,9 @@ async def recent_record_topic(name = 'Test'):
         div += '</table>'
         div += await get_next_page_bottom('/record/topic/' + url_pas(name) + '?num={}', num, data_list)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('discussion_record'), await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-            data = div,
-            menu = [['other', await get_lang('other')], ['user/' + url_pas(name), await get_lang('user_tool')]]
-        ))
+        return await render_template(
+            await get_lang('discussion_record'),
+            div,
+            sub,
+            [['other', await get_lang('other')], ['user/' + url_pas(name), await get_lang('user_tool')]]
+        )

route/tool/func.py

@@ -98,14 +98,14 @@ if sys.version_info < (3, 6):
 
 # Func
 # Func-main
-original_render_template = flask.render_template
-
-def custom_render_template(template_name_or_list, **context):
-    context['data'] = '<div class="opennamu_main">' + context['data'] + '</div>'
-
-    return original_render_template(template_name_or_list, **context)
+async def render_template(name, data, sub, menu):
+    other_set = {}
+    other_set["name"] = name
+    other_set["data"] = data
+    other_set["sub"] = sub
+    other_set["menu"] = menu
 
-flask.render_template = custom_render_template
+    return await python_to_golang("template", other_set)
 
 global_lang_data = {}
 global_some_set = {}
@@ -168,6 +168,12 @@ async def python_to_golang(func_name, other_set = {}):
                     data = await res.text()
 
                     return data
+    elif func_name == "template":
+        async with aiohttp.ClientSession() as session:
+            async with session.post('http://localhost:' + port_data + "/api/template", data = json_dumps(other_set), headers = headers) as res:
+                data = await res.text()
+
+                return data
     else:
         async with aiohttp.ClientSession() as session:
             async with session.post('http://localhost:' + port_data + '/compatible_api/' + func_name, data = json_dumps(other_set), headers = headers) as res:
@@ -2190,11 +2196,12 @@ async def re_error(conn, data):
         else:
             end = '<ul><li>' + await get_lang('authority_error') + '</li></ul>'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('error'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = '<h2>' + await get_lang('error') + '</h2>' + end,
-            menu = 0
-        )), 401
+        return await render_template(
+            await get_lang('error'),
+            '<h2>' + await get_lang('error') + '</h2>' + end,
+            0,
+            0
+        ), 401
     else:
         title = await get_lang('error')
         sub_title = title
@@ -2330,9 +2337,9 @@ async def re_error(conn, data):
             if flask.request.path != '/skin_set':
                 data += '<br>' + await get_lang('error_skin_set_old') + ' <a href="/skin_set">(' + await get_lang('go') + ')</a>'
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('skin_set'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '' + \
+            return await render_template(
+                await get_lang('skin_set'),
+                '' + \
                     '<div id="main_skin_set">' + \
                         '<h2>' + await get_lang('error') + '</h2>' + \
                         '<ul>' + \
@@ -2340,16 +2347,18 @@ async def re_error(conn, data):
                         '</ul>' + \
                     '</div>' + \
                 '',
-                menu = [['change', await get_lang('user_setting')], ['change/skin_set/main', await get_lang('main_skin_set')]]
-            ))
+                0,
+                [['change', await get_lang('user_setting')], ['change/skin_set/main', await get_lang('main_skin_set')]]
+            )
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [title, await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '' + \
+            return await render_template(
+                title,
+                '' + \
                     '<h2>' + sub_title + '</h2>' + \
                     '<ul>' + \
                         '<li>' + data + '</li>' + \
                     '</ul>' + \
                 '',
-                menu = 0
-            )), return_code
+                0,
+                0
+            ), return_code

route/topic.py

@@ -133,9 +133,9 @@ async def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
             
             shortcut += '</div>'
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('discussion') + ')', 0])],
-                data = '''
+            return await render_template(
+                name,
+                '''
                     <script defer src="/views/main_css/js/route/topic.js''' + cache_v() + '''"></script>
                     <style id="opennamu_list_hidden_style">.opennamu_list_hidden { display: none; }</style>
                     <label><input class="__ON_INPUT__" type="checkbox" onclick="opennamu_list_hidden_remove();" checked> ''' + await get_lang('remove_hidden') + '''</label>
@@ -170,5 +170,6 @@ async def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
                         ''' + await edit_editor(conn, ip, '', 'thread') + '''
                     </form>
                 ''',
-                menu = [['topic/' + url_pas(name), await get_lang('list')]]
-            ))
+                '(' + await get_lang('discussion') + ')',
+                [['topic/' + url_pas(name), await get_lang('list')]]
+            )

route/topic_comment_delete.py

@@ -15,13 +15,14 @@ async def topic_comment_delete(topic_num = 1, num = 1):
 
             return redirect(conn, '/thread/' + topic_num)
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('topic_delete'), await wiki_set(), await wiki_custom(), wiki_css(['(#' + num + ')', 0])],
-                data = '''
+            return await render_template(
+                await get_lang('topic_delete'),
+                '''
                     <hr class="main_hr">
                     <form method="post">
                         <button type="submit">''' + await get_lang('start') + '''</button>
                     </form>
                 ''',
-                menu = [['thread/' + topic_num + '/comment/' + num + '/tool', await get_lang('return')]]
-            ))
+                '(#' + num + ')',
+                [['thread/' + topic_num + '/comment/' + num + '/tool', await get_lang('return')]]
+            )

route/topic_comment_tool.py

@@ -55,8 +55,9 @@ async def topic_comment_tool(topic_num = 1, num = 1):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('discussion_tool'), await wiki_set(), await wiki_custom(), wiki_css(['(#' + num + ')', 0])],
-            data = ban,
-            menu = [['thread/' + topic_num + '#' + num, await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('discussion_tool'),
+            ban,
+            '(#' + num + ')',
+            [['thread/' + topic_num + '#' + num, await get_lang('return')]]
+        )

route/topic_list.py

@@ -37,8 +37,9 @@ async def topic_list(name = 'Test'):
         if div == '':
             plus = re.sub(r'^<br>', '', plus)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + sub + ')', 0])],
-            data = div + plus,
-            menu = menu
-        ))
+        return await render_template(
+            name,
+            div + plus,
+            '(' + sub + ')',
+            menu
+        )

route/topic_tool.py

@@ -76,8 +76,9 @@ async def topic_tool(topic_num = 1):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('topic_tool'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = data,
-            menu = [['thread/' + topic_num, await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('topic_tool'),
+            data,
+            0,
+            [['thread/' + topic_num, await get_lang('return')]]
+        )

route/topic_tool_acl.py

@@ -79,9 +79,9 @@ async def topic_tool_acl(topic_num = 1):
 
                 acl_html_list_view += '<option value="' + data_list + '" ' + check + '>' + (data_list if data_list != '' else 'normal') + '</option>'
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('topic_acl_setting'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('topic_acl_setting'),
+                '''
                     <form method="post">
                         <a href="/acl/TEST#exp">(''' + await get_lang('reference') + ''')</a>
                         <h2>''' + await get_lang('thread_acl') + '''</h2>
@@ -96,5 +96,6 @@ async def topic_tool_acl(topic_num = 1):
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['thread/' + topic_num + '/tool', await get_lang('return')]]
-            ))
+                0,
+                [['thread/' + topic_num + '/tool', await get_lang('return')]]
+            )

route/topic_tool_change.py

@@ -28,9 +28,9 @@ async def topic_tool_change(topic_num = 1):
 
             return redirect(conn, '/thread/' + topic_num)
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('topic_name_change'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('topic_name_change'),
+                '''
                     <form method="post">
                         ''' + await get_lang('document_name') + '''
                         <hr class="main_hr">
@@ -43,5 +43,6 @@ async def topic_tool_change(topic_num = 1):
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 ''',
-                menu = [['thread/' + topic_num + '/tool', await get_lang('return')]]
-            ))
+                0,
+                [['thread/' + topic_num + '/tool', await get_lang('return')]]
+            )

route/topic_tool_delete.py

@@ -17,14 +17,15 @@ async def topic_tool_delete(topic_num = 1):
 
             return redirect(conn, '/')
         else:
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('topic_delete'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = '''
+            return await render_template(
+                await get_lang('topic_delete'),
+                '''
                     <form method="post">
                         <span>''' + await get_lang('delete_warning') + '''</span>
                         <hr class="main_hr">
                         <button type="submit">''' + await get_lang('delete') + '''</button>
                     </form>
                 ''',
-                menu = [['thread/' + topic_num + '/tool', await get_lang('return')]]
-            ))
+                0,
+                [['thread/' + topic_num + '/tool', await get_lang('return')]]
+            )

route/topic_tool_setting.py

@@ -89,9 +89,9 @@ async def topic_tool_setting(topic_num = 1):
 
             agree_check = 'checked="checked"' if rd_d[0][1] == 'O' else ''
 
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('topic_setting'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = await render_simple_set('''
+            return await render_template(
+                await get_lang('topic_setting'),
+                await render_simple_set('''
                     <form method="post">
                         <h2>''' + await get_lang('topic_progress') + '''</h2>
                         <select name="stop_d">
@@ -112,5 +112,6 @@ async def topic_tool_setting(topic_num = 1):
                         <button type="submit">''' + await get_lang('save') + '''</button>
                     </form>
                 '''),
-                menu = [['thread/' + topic_num + '/tool', await get_lang('return')]]
-            ))
+                0,
+                [['thread/' + topic_num + '/tool', await get_lang('return')]]
+            )

route/user_alarm.py

@@ -41,8 +41,9 @@ async def user_alarm():
             await get_next_page_bottom('/alarm?num={}', num, data_list) + \
         ''
     
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('notice'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = data,
-            menu = [['user', await get_lang('return')]]
-        ))
+        return await render_template(
+            await get_lang('notice'),
+            data,
+            0,
+            [['user', await get_lang('return')]]
+        )

route/user_challenge.py

@@ -251,14 +251,15 @@ async def user_challenge():
                 
             data_html = data_html_green + data_html_red
             
-            return easy_minify(flask.render_template(await skin_check(),
-                imp = [await get_lang('challenge_and_level_manage'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-                data = data_html + '''
+            return await render_template(
+                await get_lang('challenge_and_level_manage'),
+                data_html + '''
                     <form method="post">
                         <div id="opennamu_get_user_info">''' + html.escape(ip) + '''</div>
                         <hr class="main_hr">
                         <button id="opennamu_save_button" type="submit">''' + await get_lang('reload') + '''</button>
                     </form>
                 ''',
-                menu = [['user', await get_lang('return')]]
-            ))
+                0,
+                [['user', await get_lang('return')]]
+            )