瀏覽代碼

https://github.com/openNAMU/openNAMU/issues/1803

잉여개발기 (SPDV) 3 年之前
父節點
當前提交
3b9276e7e7
共有 4 個文件被更改,包括 68 次插入31 次删除
  1. 16 28
      route/main_setting_main.py
  2. 10 1
      route/main_setting_skin_set.py
  3. 23 2
      route/tool/func_render_namumark.py
  4. 19 0
      route/user_setting_skin_set_main.py

+ 16 - 28
route/main_setting_main.py

@@ -37,7 +37,9 @@ def main_setting_main(db_set):
             33 : ['history_recording_off', ''],
             34 : ['namumark_compatible', ''],
             35 : ['user_name_view', ''],
-            36 : ['link_case_insensitive', '']
+            36 : ['link_case_insensitive', ''],
+            37 : ['move_with_redirect', ''],
+            38 : ['slow_thread', '']
         }
 
         if flask.request.method == 'POST':
@@ -87,35 +89,13 @@ def main_setting_main(db_set):
                 else:
                     tls_select += '<option value="' + tls_select_one + '">' + tls_select_one + '</option>'
 
-            check_box_div = ['', '', '', '', '', '', '', '', '', '', '', '', '']
+            check_box_div = [7, 8, '', 20, 23, 24, 25, 26, 31, 33, 34, 35, 36, 37]
             for i in range(0, len(check_box_div)):
-                if i == 0:
-                    acl_num = 7
-                elif i == 1:
-                    acl_num = 8
-                elif i == 3:
-                    acl_num = 20
-                elif i == 4:
-                    acl_num = 23
-                elif i == 5:
-                    acl_num = 24
-                elif i == 6:
-                    acl_num = 25
-                elif i == 7:
-                    acl_num = 26
-                elif i == 8:
-                    acl_num = 31
-                elif i == 9:
-                    acl_num = 33
-                elif i == 10:
-                    acl_num = 34
-                elif i == 11:
-                    acl_num = 35
-                elif i == 12:
-                    acl_num = 36
-
-                if d_list[acl_num]:
+                acl_num = check_box_div[i]
+                if acl_num != '' and d_list[acl_num]:
                     check_box_div[i] = 'checked="checked"'
+                else:
+                    check_box_div[i] = ''
 
             branch_div = ''
             branch_list = ['stable', 'dev', 'beta']
@@ -274,6 +254,14 @@ def main_setting_main(db_set):
                         <input type="checkbox" name="history_recording_off" ''' + check_box_div[9] + '''> ''' + load_lang('set_history_recording_off') + ''' (''' + load_lang('beta') + ''')
                         <hr class="main_hr">
 
+                        <input type="checkbox" name="move_with_redirect" ''' + check_box_div[13] + '''> ''' + load_lang('move_with_redirect') + '''
+                        <hr class="main_hr">
+
+                        <span>''' + load_lang('slow_thread') + ''' (''' + load_lang('second') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''') (''' + load_lang('not_working') + ''')</span>
+                        <hr class="main_hr">
+                        <input name="slow_thread" value="''' + html.escape(d_list[38]) + '''">
+                        <hr class="main_hr">
+
                         <button id="opennamu_save_button" type="submit">''' + load_lang('save') + '''</button>
                     </form>
                 '''),

+ 10 - 1
route/main_setting_skin_set.py

@@ -62,10 +62,19 @@ def main_setting_skin_set():
                         <select name="main_css_category_set">
                             ''' + set_data["main_css_category_set"] + '''
                         </select>
-                        <h3>''' + load_lang("footnote") + '''</h3>
+                        <h3>''' + load_lang("footnote") + ''' (''' + load_lang('beta') + ''')</h3>
+                        <h4>''' + load_lang("footnote_render") + '''</h4>
                         <select name="main_css_footnote_set">
                             ''' + set_data["main_css_footnote_set"] + '''
                         </select>
+                        <h4>''' + load_lang("footnote_number") + '''</h4>
+                        <select name="main_css_footnote_number">
+                            ''' + set_data["main_css_footnote_number"] + '''
+                        </select>
+                        <h4>''' + load_lang("footnote_real_num_view") + '''</h4>
+                        <select name="main_css_view_real_footnote_num">
+                            ''' + set_data["main_css_view_real_footnote_num"] + '''
+                        </select>
                         <h3>''' + load_lang("include_link") + '''</h3>
                         <select name="main_css_include_link">
                             ''' + set_data["main_css_include_link"] + '''

+ 23 - 2
route/tool/func_render_namumark.py

@@ -153,6 +153,9 @@ class class_do_render_namumark:
         return data
 
     def get_tool_footnote_make(self):
+        footnote_number_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_footnote_number', self.ip)
+        footnote_number_view_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_view_real_footnote_num', self.ip)
+    
         data = ''
         for for_a in self.data_footnote:
             if data == '':
@@ -1194,7 +1197,11 @@ class class_do_render_namumark:
 
     def do_redner_footnote(self):
         footnote_num = 0
+
         footnote_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_footnote_set', self.ip)
+        footnote_number_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_footnote_number', self.ip)
+        footnote_number_view_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_view_real_footnote_num', self.ip)
+
         footnote_regex = re.compile('(?:\[\*((?:(?!\[\*|\]| ).)+)?(?: ((?:(?!\[\*|\]).)+))?\]|\[(각주|footnote)\])', re.I)
         footnote_count_all = len(re.findall(footnote_regex, self.render_data)) * 4
         while 1:
@@ -1235,7 +1242,14 @@ class class_do_render_namumark:
 
                         fn = self.doc_include + 'fn_' + footnote_first
                         rfn = self.doc_include + 'rfn_' + footnote_num_str
-                        foot_v_name = footnote_name + ' (' + footnote_num_str + ')'
+
+                        if footnote_number_set == 'only_number':
+                            foot_v_name += footnote_first
+                        else:
+                            foot_v_name += footnote_name
+                            
+                        if footnote_number_view_set != 'off':
+                            foot_v_name += ' (' + footnote_num_str + ')'
                     else:
                         self.data_footnote[footnote_name] = {}
                         self.data_footnote[footnote_name]['list'] = [footnote_num_str]
@@ -1243,7 +1257,14 @@ class class_do_render_namumark:
 
                         fn = self.doc_include + 'fn_' + footnote_num_str
                         rfn = self.doc_include + 'rfn_' + footnote_num_str
-                        foot_v_name = footnote_name + footnote_name_add
+
+                        if footnote_number_set == 'only_number':
+                            foot_v_name += footnote_num_str
+                        else:
+                            foot_v_name += footnote_name
+                            
+                        if footnote_number_view_set != 'off':
+                            foot_v_name += footnote_name_add
 
                     if footnote_set == 'spread':
                         data_name = self.get_tool_data_storage(

+ 19 - 0
route/user_setting_skin_set_main.py

@@ -56,6 +56,14 @@ def user_setting_skin_set_main_set_list():
             ['default', load_lang('default')],
             ['0', load_lang('off')],
             ['1', load_lang('use')]
+        ], 'main_css_footnote_number' : [
+            ['default', load_lang('default')],
+            ['all', load_lang('all')],
+            ['only_number', load_lang('only_number')]
+        ], 'main_css_view_real_footnote_num' : [
+            ['default', load_lang('default')],
+            ['off', load_lang('off')],
+            ['on', load_lang('use')]
         ]
     }
 
@@ -145,10 +153,21 @@ def user_setting_skin_set_main():
                             ''' + set_data["main_css_category_set"] + '''
                         </select>
                         <h3>''' + load_lang("footnote") + ''' (''' + load_lang('beta') + ''')</h3>
+                        <h4>''' + load_lang("footnote_render") + '''</h4>
                         ''' + set_data_main["main_css_footnote_set"] + '''
                         <select name="main_css_footnote_set">
                             ''' + set_data["main_css_footnote_set"] + '''
                         </select>
+                        <h4>''' + load_lang("footnote_number") + '''</h4>
+                        ''' + set_data_main["main_css_footnote_number"] + '''
+                        <select name="main_css_footnote_number">
+                            ''' + set_data["main_css_footnote_number"] + '''
+                        </select>
+                        <h4>''' + load_lang("footnote_real_num_view") + '''</h4>
+                        ''' + set_data_main["main_css_view_real_footnote_num"] + '''
+                        <select name="main_css_view_real_footnote_num">
+                            ''' + set_data["main_css_view_real_footnote_num"] + '''
+                        </select>
                         <h3>''' + load_lang("include_link") + '''</h3>
                         ''' + set_data_main["main_css_include_link"] + '''
                         <select name="main_css_include_link">