fix some

route/edit.py

@@ -246,19 +246,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 else:
                     monaco_thema = ''
                 
-                add_script = '''
-                    require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs' }});
-                    require.config({ 'vs/nls': { availableLanguages: { '*': 'ko' } }});
-                    require(["vs/editor/editor.main"], function () {
-                        window.editor = monaco.editor.create(document.getElementById('opennamu_monaco_editor'), {
-                            value: document.getElementById('opennamu_edit_textarea').value,
-                            language: 'plaintext',
-                            automaticLayout: true,
-                            wordWrap: true,
-                            theme: \'''' + monaco_thema + '''\'
-                        });
-                    });
-                '''
+                add_script = 'do_monaco_init("' + monaco_thema + '");'
             else:
                 editor_display = ''
                 monaco_display = 'style="display: none;"'
@@ -274,21 +262,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('edit') + ')' + sub_menu, 0])],
                 data =  editor_top_text + add_get_file + '''
                     <script>
-                        function opennamu_edit_turn_off_monaco() {
-                            do_monaco_to_textarea();
-                            
-                            document.getElementById('opennamu_edit_textarea').style.display = 'block';
-                            document.getElementById('opennamu_monaco_editor').style.display = 'none';
-                            document.getElementById('opennamu_monaco_editor').remove();
-                        }
-
-                        function do_monaco_to_textarea() {
-                            if(document.getElementById('opennamu_monaco_editor')) {
-                                try {
-                                    document.getElementById('opennamu_edit_textarea').value = window.editor.getValue();
-                                } catch(e) {}
-                            }
-                        }
+                        
                     </script>
                     <form method="post">
                         <textarea style="display: none;" id="opennamu_edit_origin" name="doc_data_org">''' + html.escape(data_section) + '''</textarea>
@@ -302,7 +276,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                         <div id="opennamu_monaco_editor" class="opennamu_textarea_500" ''' + monaco_display + '''></div>
                         <textarea id="opennamu_edit_textarea" ''' + editor_display + ''' class="opennamu_textarea_500" name="content" placeholder="''' + p_text + '''">''' + html.escape(data_section) + '''</textarea>
                         <hr class="main_hr">
-                        
+
                         <input placeholder="''' + load_lang('why') + '''" name="send">
                         <hr class="main_hr">
                         
@@ -316,25 +290,8 @@ def edit(name = 'Test', section = 0, do_type = ''):
                     <div id="opennamu_preview_area">''' + data_preview + '''</div>
                     
                     <script>
-                        function do_stop_exit() {
-                            window.onbeforeunload = function() {
-                                do_monaco_to_textarea();
-
-                                let data = document.getElementById('opennamu_edit_textarea').value;
-                                let origin = document.getElementById('opennamu_edit_origin').value;
-                                if(data !== origin) {
-                                    return '';
-                                }
-                            }
-                        }
-
-                        function do_stop_exit_release() {
-                            window.onbeforeunload = function () {}
-                        }
-
                         do_stop_exit();
                         do_paste_image('opennamu_edit_textarea', 'opennamu_monaco_editor');
-
                         ''' + add_script + '''
                     </script>
                 ''',

route/edit_upload.py

@@ -151,7 +151,7 @@ def edit_upload():
                             ''' + license_list + '''
                         </select>
                         <hr class="main_hr">
-                        <textarea class="opennamu_textarea_200" placeholder="''' + load_lang('other') + '''" name="f_lice">''' + upload_default + '''</textarea>
+                        <textarea class="opennamu_textarea_100" placeholder="''' + load_lang('other') + '''" name="f_lice">''' + upload_default + '''</textarea>
                         <hr class="main_hr">
                         ''' + captcha_get() + '''
                         <button id="opennamu_save_button" type="submit">''' + load_lang('save') + '''</button>

route/give_user_fix.py

@@ -13,6 +13,8 @@ def give_user_fix(user_name = ''):
 
         if flask.request.method == 'POST':
             select = flask.request.form.get('select', '')
+
+            admin_check(None, 'user_fix (' + user_name + ') (' + select + ')')
             if select == 'password_change':
                 password = flask.request.form.get('new_password', '')
                 check_password = flask.request.form.get('password_check', '')

route/main_setting_phrase.py

@@ -62,69 +62,69 @@ def main_setting_phrase():
                 data = render_simple_set('''
                     <form method="post">
                         <h2>''' + load_lang('register_text') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[0] + '''">''' + html.escape(d_list[0]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[0] + '''">''' + html.escape(d_list[0]) + '''</textarea>
 
                         <h2>''' + load_lang('non_login_alert') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[1] + '''">''' + html.escape(d_list[1]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[1] + '''">''' + html.escape(d_list[1]) + '''</textarea>
 
                         <h2>''' + load_lang('edit_bottom_text') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[2] + '''">''' + html.escape(d_list[2]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[2] + '''">''' + html.escape(d_list[2]) + '''</textarea>
 
                         <h2>''' + load_lang('copyright_checkbox_text') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[3] + '''">''' + html.escape(d_list[3]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[3] + '''">''' + html.escape(d_list[3]) + '''</textarea>
 
                         <h2>''' + load_lang('check_key_text') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[4] + '''">''' + html.escape(d_list[4]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[4] + '''">''' + html.escape(d_list[4]) + '''</textarea>
 
                         <h2>''' + load_lang('email_title') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[5] + '''">''' + html.escape(d_list[5]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[5] + '''">''' + html.escape(d_list[5]) + '''</textarea>
 
                         <h2>''' + load_lang('email_text') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[6] + '''">''' + html.escape(d_list[6]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[6] + '''">''' + html.escape(d_list[6]) + '''</textarea>
 
                         <h2>''' + load_lang('email_insert_text') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[7] + '''">''' + html.escape(d_list[7]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[7] + '''">''' + html.escape(d_list[7]) + '''</textarea>
 
                         <h2>''' + load_lang('password_search_text') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[8] + '''">''' + html.escape(d_list[8]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[8] + '''">''' + html.escape(d_list[8]) + '''</textarea>
 
                         <h2>''' + load_lang('reset_user_text') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[9] + '''">''' + html.escape(d_list[9]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[9] + '''">''' + html.escape(d_list[9]) + '''</textarea>
 
                         <h2>''' + load_lang('error_401') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[10] + '''">''' + html.escape(d_list[10]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[10] + '''">''' + html.escape(d_list[10]) + '''</textarea>
 
                         <h2>''' + load_lang('error_404') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[11] + '''">''' + html.escape(d_list[11]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[11] + '''">''' + html.escape(d_list[11]) + '''</textarea>
 
                         <h2>''' + load_lang('approval_question') + '''</h2>
                         <sup><a href="/setting/main">''' + load_lang('approval_question_visible_only_when_approval_on') + '''</a></sup>
                         <hr class="main_hr">
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[12] + '''">''' + html.escape(d_list[12]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[12] + '''">''' + html.escape(d_list[12]) + '''</textarea>
 
                         <h2>''' + load_lang('edit_help') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[13] + '''">''' + html.escape(d_list[13]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[13] + '''">''' + html.escape(d_list[13]) + '''</textarea>
 
                         <h2>''' + load_lang('upload_help') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[14] + '''">''' + html.escape(d_list[14]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[14] + '''">''' + html.escape(d_list[14]) + '''</textarea>
 
                         <h2>''' + load_lang('upload_default') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[15] + '''">''' + html.escape(d_list[15]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[15] + '''">''' + html.escape(d_list[15]) + '''</textarea>
 
                         <h2>''' + load_lang('bottom_text') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[16] + '''">''' + html.escape(d_list[16]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[16] + '''">''' + html.escape(d_list[16]) + '''</textarea>
 
                         <h2>''' + load_lang('topic_text') + '''</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[17] + '''">''' + html.escape(d_list[17]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[17] + '''">''' + html.escape(d_list[17]) + '''</textarea>
                         
                         <h2>''' + load_lang('phrase_user_page_admin') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[18] + '''">''' + html.escape(d_list[18]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[18] + '''">''' + html.escape(d_list[18]) + '''</textarea>
                         
                         <h2>''' + load_lang('phrase_user_page_owner') + ''' (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[19] + '''">''' + html.escape(d_list[19]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[19] + '''">''' + html.escape(d_list[19]) + '''</textarea>
 
                         <h2>''' + load_lang('phrase_old_page_warring') + ''' (''' + load_lang('beta') + ''') (HTML)</h2>
-                        <textarea class="opennamu_textarea_200" name="''' + i_list[20] + '''">''' + html.escape(d_list[20]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[20] + '''">''' + html.escape(d_list[20]) + '''</textarea>
 
                         <hr class="main_hr">
                         <button id="opennamu_save_button" type="submit">''' + load_lang('save') + '''</button>

route/main_tool_other.py

@@ -39,6 +39,7 @@ def main_tool_other():
                 <ul class="opennamu_ul">
                     <li><a href="/image_file_list">''' + load_lang('image_file_list') + '''</a></li>
                     <li><a href="/vote">''' + load_lang('vote_list') + '''</a></li>
+                    <li><a href="/bbs/main">''' + load_lang('bbs_main') + '''</a></li>
                 </ul>
                 <h2>''' + load_lang('other') + '''</h2>
                 <ul class="opennamu_ul">

route/recent_change.py

@@ -204,7 +204,7 @@ def recent_change(name = None, tool = ''):
                     '<hr class="main_hr">' + div + \
                 ''
 
-                menu = 0
+                menu = [['other', load_lang('return')]]
                 title = load_lang('recent_change')
 
             if sub == '':

route/recent_discuss.py

@@ -76,5 +76,5 @@ def recent_discuss(tool):
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('recent_discussion'), wiki_set(), wiki_custom(), wiki_css([m_sub, 0])],
             data = div,
-            menu = 0
+            menu = [['other', load_lang('return')]]
         ))

route/tool/func.py

@@ -311,8 +311,8 @@ class class_check_json:
         return self.data_db_set
 
 def get_db_table_list():
+    # DB table
     # Init-Create_DB
-    # DB 테이블 구조
     
     # --이거 개편한다더니 도대체 언제?--
     create_data = {}
@@ -1094,7 +1094,7 @@ def wiki_css(data):
     data += ['' for _ in range(0, 3 - len(data))]
     
     data_css = ''
-    data_css_ver = '172'
+    data_css_ver = '173'
     
     # Func JS + Defer
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'

route/tool/func_render_namumark.py

@@ -1763,7 +1763,7 @@ class class_do_render_namumark:
 
                 data_name = self.get_tool_data_storage('<div id="' + self.doc_include + 'opennamu_quote_' + str(quote_count) + '"></div>', '', quote_data_org)
 
-                self.render_data = re.sub(quote_regex, lambda x : ('\n<front_br><blockquote><back_br>\n<' + data_name + '></' + data_name + '><front_br></blockquote><back_br>\n'), self.render_data, 1)
+                self.render_data = re.sub(quote_regex, lambda x : ('\n<blockquote><back_br>\n<' + data_name + '></' + data_name + '><front_br></blockquote>\n'), self.render_data, 1)
 
             quote_count_max -= 1
             quote_count += 1

route/topic.py

@@ -209,7 +209,7 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
                         
                         <div>''' + edit_button('opennamu_edit_textarea') + '''</div>
 
-                        <textarea id="opennamu_edit_textarea" class="opennamu_textarea_200" placeholder="''' + topic_text + '''" name="content">''' + html.escape(thread_data) + '''</textarea>
+                        <textarea id="opennamu_edit_textarea" class="opennamu_textarea_100" placeholder="''' + topic_text + '''" name="content">''' + html.escape(thread_data) + '''</textarea>
                         <hr class="main_hr">
                         
                         ''' + captcha_get() + ip_warning() + '''

route/user_setting.py

@@ -84,7 +84,7 @@ def user_setting():
                 fa_data = curs.fetchall()
                 fa_data = fa_data[0][0] if fa_data and fa_data[0][0] != '' else ''
                 fa_data_select = ''
-                fa_data_sp_list = [['off', ''], ['pw', 'on']]
+                fa_data_sp_list = [[load_lang('off'), ''], [load_lang('password'), 'on']]
                 for fa_data_get in fa_data_sp_list:
                     fa_data_selected = ''
                     if fa_data == fa_data_get[1]:

route/vote_add.py

@@ -58,7 +58,7 @@ def vote_add():
                     '<form method="post">' + \
                         '<input name="name" placeholder="' + load_lang('name') + '">' + \
                         '<hr class="main_hr">' + \
-                        '<textarea class="opennamu_textarea_200" name="subject" placeholder="' + load_lang('explanation') + '"></textarea>' + \
+                        '<textarea class="opennamu_textarea_100" name="subject" placeholder="' + load_lang('explanation') + '"></textarea>' + \
                         '<hr class="main_hr">' + \
                         '<textarea class="opennamu_textarea_500" name="data" placeholder="' + load_lang('1_line_1_q') + '"></textarea>' + \
                         '<hr class="main_hr">' + \

views/main_css/css/main.css

@@ -65,6 +65,7 @@ summary {
 
 /* thread */
 .opennamu_comment {
+    display: inline-table;
     width: 100%;
 }
 
@@ -208,8 +209,8 @@ pre {
     height: 500px;
 }
 
-.opennamu_textarea_200 {
-    height: 200px;
+.opennamu_textarea_100 {
+    height: 100px;
 }
 
 .opennamu_spead_footnote {
@@ -256,7 +257,7 @@ blockquote {
     padding: 15px 40px 15px 15px;
     margin: 15px 0 0;
 
-    display: table;
+    display: inline-block;
 
     border: 2px solid #ccc;
     border-left: 5px solid black;

views/main_css/js/route/editor.js

@@ -117,4 +117,50 @@ function pasteListener(e) {
             alert("업로드 실패");
         });
     }
+}
+
+function do_stop_exit() {
+    window.onbeforeunload = function() {
+        do_monaco_to_textarea();
+
+        let data = document.getElementById('opennamu_edit_textarea').value;
+        let origin = document.getElementById('opennamu_edit_origin').value;
+        if(data !== origin) {
+            return '';
+        }
+    }
+}
+
+function do_stop_exit_release() {
+    window.onbeforeunload = function () {}
+}
+
+function opennamu_edit_turn_off_monaco() {
+    do_monaco_to_textarea();
+    
+    document.getElementById('opennamu_edit_textarea').style.display = 'block';
+    document.getElementById('opennamu_monaco_editor').style.display = 'none';
+    document.getElementById('opennamu_monaco_editor').remove();
+}
+
+function do_monaco_to_textarea() {
+    if(document.getElementById('opennamu_monaco_editor')) {
+        try {
+            document.getElementById('opennamu_edit_textarea').value = window.editor.getValue();
+        } catch(e) {}
+    }
+}
+
+function do_monaco_init(monaco_thema) {
+    require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs' }});
+    require.config({ 'vs/nls': { availableLanguages: { '*': 'ko' } }});
+    require(["vs/editor/editor.main"], function () {
+        window.editor = monaco.editor.create(document.getElementById('opennamu_monaco_editor'), {
+            value: document.getElementById('opennamu_edit_textarea').value,
+            language: 'plaintext',
+            automaticLayout: true,
+            wordWrap: true,
+            theme: monaco_thema
+        });
+    });
 }