2
0
Эх сурвалжийг харах

이런 저런 사소한 기능 변경

Surplus_Up (2DU) 7 жил өмнө
parent
commit
b992f85ad6

+ 1 - 1
language/ko-KR.json

@@ -103,7 +103,7 @@
         "close_discussion" : "닫힌 토론",
         "open_discussion" : "열린 토론",
         "recent_discussion" : "최근 토론",
-        "recent_change" : "최근 수정",
+        "recent_change" : "최근 편집",
         "edit_filter" : "편집 필터",
         "recent_ban" : "최근 차단",
         "load" : "다른 문서 불러오기",

+ 7 - 6
route/change_password.py

@@ -59,20 +59,21 @@ def change_password_2(conn, server_init):
                 email = ''
 
             div2 = load_skin()
-            
             div3 = ''
-            var_div3 = ''
 
             curs.execute('select data from user_set where name = "lang" and id = ?', [flask.session['id']])
             data = curs.fetchall()
+            if not data:
+                curs.execute('select data from other where name = "language"')
+                data = curs.fetchall()
+                if not data:
+                    data = [['en-US']]
 
             for lang_data in support_language:
                 if data and data[0][0] == lang_data:
-                    div3 = '<option value="' + lang_data + '">' + lang_data + '</option>'
+                    div3 = '<option value="' + lang_data + '">' + lang_data + '</option>' + div3
                 else:
-                    var_div3 += '<option value="' + lang_data + '">' + lang_data + '</option>'
-
-            div3 += var_div3
+                    div3 += '<option value="' + lang_data + '">' + lang_data + '</option>'
 
             oauth_provider = load_oauth('_README')['support']
             oauth_content = '<ul>'

+ 8 - 8
route/tool/func.py

@@ -614,16 +614,16 @@ def load_skin(data = ''):
 
         curs.execute('select data from user_set where name = "skin" and id = ?', [ip])
         data = curs.fetchall()
+
+        if not data:
+            curs.execute('select data from other where name = "skin"')
+            data = curs.fetchall()
+            if not data:
+                data = [['neo_yousoro']]
+
         for skin_data in os.listdir(os.path.abspath('views')):
             if not skin_data in system_file:
-                if not data:
-                    curs.execute('select data from other where name = "skin"')
-                    sql_data = curs.fetchall()
-                    if sql_data and sql_data[0][0] == skin_data:
-                        div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
-                    else:
-                        div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'
-                elif data[0][0] == skin_data:
+                if data[0][0] == skin_data:
                     div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
                 else:
                     div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'

+ 1 - 1
views/main_css/main.css

@@ -1,5 +1,5 @@
 textarea { width: 100%; }
-input { width: 100%; }
+input { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
 #last { margin-top: 30px; }
 #toc { border: 1px solid; padding: 20px; width: fit-content; width: -moz-fit-content; margin-top: 10px; }
 #toc-name { font-size: 18px; }