Merge pull request #999 from 2du/dev

Dev

language/en-US.json

@@ -342,6 +342,7 @@
                 "upload_acl" : "Upload ACL",
                 "edit_req_acl" : "Edit request ACL",
                 "many_upload_acl" : "Upload multiple files ACL",
+                "vote_acl" : "Vote ACL",
         "_comment_2.7_" : "Application list",
             "application_list": "Application list",
             "application_time": "Application time",

language/ko-KR.json

@@ -392,5 +392,6 @@
     "on" : "켜기",
     "2fa" : "2차 인증",
     "2fa_password" : "2차 비밀번호",
-    "2fa_password_change" : "2차 비밀번호 변경"
+    "2fa_password_change" : "2차 비밀번호 변경",
+    "vote_acl" : "투표 ACL"
 }

route/setting.py

@@ -122,13 +122,13 @@ def setting_2(conn, num, db_set):
                 if d_list[acl_num]:
                     check_box_div[i] = 'checked="checked"'
 
-            branch_div =''
-            if d_list[12] == 'stable':
-                branch_div += '<option value="stable">stable</option>'
-                branch_div += '<option value="beta">beta</option>'
-            else:
-                branch_div += '<option value="beta">beta</option>'
-                branch_div += '<option value="stable">stable</option>'
+            branch_div = ''
+            branch_list = ['stable', 'dev', 'beta']
+            for i in branch_list:
+                if d_list[12] == i:
+                    branch_div = '<option value="' + i + '">' + i + '</option>' + branch_div
+                else:
+                    branch_div += '<option value="' + i + '">' + i + '</option>'
 
             if db_set != 'sqlite':
                 sqlite_only = 'style="display:none;"'

route/tool/func.py

@@ -515,7 +515,7 @@ def next_fix(link, num, page, end = 50):
 
 def other2(data):
     global req_list
-    main_css_ver = '51'
+    main_css_ver = '52'
     data += ['' for _ in range(0, 3 - len(data))]
 
     if req_list == '':

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-beta-25 (v3.2.0-dev-202008016-01)",
+        "r_ver" : "v3.2.0-beta-26 (v3.2.0-dev-2020-08-20-01)",
         "c_ver" : "3202500",
         "s_ver" : "9"
     }

views/main_css/css/main.css

@@ -18,7 +18,7 @@ input[type="checkbox"], input[type="radio"] { width: auto; }
 #toron_color_red { background: #fecabf; }
 #toron_color_grey { background: gainsboro; }
 #toron_color_not { display: none; }
-#cate { border: 1px solid; padding: 5px; }
+#cate { border: 1px solid; padding: 5px; margin-top: 20px; }
 blockquote { border: 1px solid; padding: 15px; margin: 0; margin-top: 10px; display: inline-block; }
 img, iframe { max-width: 100%; }
 pre { border: 1px solid; padding: 10px; white-space: pre-wrap; }
@@ -49,4 +49,4 @@ blockquote { background-image: url(/views/main_css/file/quote.png); background-p
 .content { height: 500px; }
 .topic_content { height: 200px; }
 .spead_footnote { background-color: #efefef; color: #555; border: 1px solid #cecece; }
-#footnote_data { border-top: 1px solid gainsboro; padding-top: 10px; }
+#footnote_data { border-top: 1px solid gainsboro; padding-top: 10px; }

views/main_css/js/load_skin_set.js

@@ -93,10 +93,8 @@ function main_css_skin_load() {
             var backup_category = get_category.innerHTML;
             var in_data = document.getElementById('in_data_0').innerHTML;
             get_category.innerHTML = '';
-
-            backup_category = backup_category.replace('<hr>', '') + '<hr>';
-
             document.getElementById('in_data_0').innerHTML = backup_category + in_data;
+            head_data.innerHTML += '<style>#cate { margin-top: 0px; margin-bottom: 20px; }</style>';
         }
     }
 }