Преглед на файлове

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

잉여개발기 (SPDV) преди 2 години
родител
ревизия
fc89075bd6
променени са 5 файла, в които са добавени 33 реда и са изтрити 4 реда
  1. 5 0
      route/main_setting_skin_set.py
  2. 12 2
      route/tool/func.py
  3. 1 1
      route/tool/func_tool.py
  4. 14 0
      route/user_setting_skin_set_main.py
  5. 1 1
      version.json

+ 5 - 0
route/main_setting_skin_set.py

@@ -144,6 +144,11 @@ def main_setting_skin_set():
                         <select name="main_css_view_history">
                             ''' + set_data["main_css_view_history"] + '''
                         </select>
+                        <h3>''' + load_lang("font_size") + '''</h3>
+                        ''' + set_data_main["main_css_font_size"] + '''
+                        <select name="main_css_font_size">
+                            ''' + set_data["main_css_font_size"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

+ 12 - 2
route/tool/func.py

@@ -1349,6 +1349,18 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
 
                 get_class_render[0] = '<div class="opennamu_render_complete">' + get_class_render[0] + '</div>'
 
+                font_size_set_data = get_main_skin_set(curs, flask.session, 'main_css_font_size', ip)
+                if font_size_set_data != 'default':
+                    font_size_set_data = number_check(font_size_set_data)
+
+                    get_class_render[0] = '''
+                        <style>
+                            .opennamu_render_complete {
+                                font-size: ''' + font_size_set_data + '''px !important;
+                            }
+                        </style>
+                    ''' + get_class_render[0]
+
                 curs.execute(db_change("select data from other where name = 'namumark_compatible'"))
                 db_data = curs.fetchall()
                 if db_data and db_data[0][0] != '':
@@ -1356,7 +1368,6 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
                         <style>
                             .opennamu_render_complete {
                                 font-size: 14.4px !important;
-
                                 line-height: 1.5;
                             }
 
@@ -1366,7 +1377,6 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
 
                             .opennamu_render_complete summary {
                                 list-style: none !important;
-                                
                                 font-weight: bold !important;
                             }
                         </style>

+ 1 - 1
route/tool/func_tool.py

@@ -75,7 +75,7 @@ def get_main_skin_set(curs, flask_session, set_name, ip):
     if ip_or_user(ip) == 0:
         curs.execute(db_change('select data from user_set where name = ? and id = ?'), [set_name, ip])
         db_data = curs.fetchall()
-        set_data = db_data[0][0] if db_data else 'default'
+        set_data = db_data[0][0] if db_data and db_data[0][0] != '' else 'default'
     else:
         set_data = flask_session[set_name] if set_name in flask_session and flask_session[set_name] != '' else 'default'
 

+ 14 - 0
route/user_setting_skin_set_main.py

@@ -92,6 +92,15 @@ def user_setting_skin_set_main_set_list():
             ['default', load_lang('default')],
             ['off', load_lang('off')],
             ['on', load_lang('use')]
+        ], 'main_css_font_size' : [
+            ['default', load_lang('default')],
+            ['10', '10'],
+            ['12', '12'],
+            ['14', '14'],
+            ['16', '16'],
+            ['18', '18'],
+            ['20', '20'],
+            ['22', '22'],
         ]
     }
 
@@ -263,6 +272,11 @@ def user_setting_skin_set_main():
                         <select name="main_css_view_history">
                             ''' + set_data["main_css_view_history"] + '''
                         </select>
+                        <h3>''' + load_lang("font_size") + '''</h3>
+                        ''' + set_data_main["main_css_font_size"] + '''
+                        <select name="main_css_font_size">
+                            ''' + set_data["main_css_font_size"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev79",
+        "r_ver" : "v3.4.6-RC5-dev80",
         "c_ver" : "3500374",
         "s_ver" : "3500112"
     }