ACL 부여 관련 개편

language/en-US.json

@@ -175,6 +175,7 @@
         "direct_input" : "Direct input",
         "acl_record" : "ACL record",
         "last_edit_time" : "Last edited time",
+        "admin_group" : "Admin group",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",
@@ -253,7 +254,6 @@
                 "acl_document_list" : "ACL document(s) list",
                 "acl_required" : "Required ACL",
             "_comment_2.3.2_" : "ACL List",
-                "admin_group_add" : "Authorize Administrators Group",
                 "ban_authority" : "Block authority",
                 "discussion_authority" : "Discussion manage authority",
                 "user_check_authority" : "User check authority",

language/ko-KR.json

@@ -158,7 +158,7 @@
     "admin": "관리자",
     "edit_filter_list": "편집 필터 목록",
     "wiki_skin": "위키 스킨",
-    "admin_group_add": "관리자 그룹 권한 부여",
+    "admin_group" : "관리자 그룹",
     "all": "전체",
     "skin_error": "이 스킨은 설정을 지원하지 않습니다.",
     "member": "가입자",

route/give_acl.py

@@ -111,6 +111,7 @@ def give_acl_2(conn, name):
                 
             data += '''
                 </select>
+                <hr class=\"main_hr\">
                 <h2>''' + load_lang('explanation') + '''</h2>
                 <ul>
                     <li>normal : ''' + load_lang('default') + '''</li>

route/give_admin_groups.py

@@ -61,25 +61,32 @@ def give_admin_groups_2(conn, name):
         else:
             state = ''
 
-        data += '''
-                <li><input type="checkbox" ''' + state +  ' name="ban" ' + exist_list[0] + '> ' + load_lang('ban_authority') + '''</li>
-                <li><input type="checkbox" ''' + state +  ' name="toron" ' + exist_list[2] + '> ' + load_lang('discussion_authority') + '''</li>
-                <li><input type="checkbox" ''' + state +  ' name="check" ' + exist_list[3] + '> ' + load_lang('user_check_authority') + '''</li>
-                <li><input type="checkbox" ''' + state +  ' name="acl" ' + exist_list[4] + '> ' + load_lang('document_acl_authority') + '''</li>
-                <li><input type="checkbox" ''' + state +  ' name="hidel" ' + exist_list[5] + '> ' + load_lang('history_hide_authority') + '''</li>
-                <li><input type="checkbox" ''' + state +  ' name="give" ' + exist_list[6] + '> ' + load_lang('authorization_authority') + '''</li>
-                <li><input type="checkbox" ''' + state +  ' name="owner" ' + exist_list[7] + '> ' + load_lang('owner_authority') + '''</li>
-            </ul>
-        '''
+        acl_name_list = ['ban', 'nothing', 'toron', 'check', 'acl', 'hidel', 'give', 'owner']
+        for i in range(0, 8):
+            if i != 2:
+                data += '<li><input type="checkbox" ''' + state +  ' name="' + acl_name_list[i] + '" ' + exist_list[i] + '> ' + acl_name_list[i] + '</li>'
+
+        data += '</ul>'
 
         return easy_minify(flask.render_template(skin_check(), 
-            imp = [load_lang('admin_group_add'), wiki_set(), custom(), other2([0, 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('admin_group') + ')', 0])],
             data =  '''
                 <form method="post">
                     ''' + data + '''
                     <hr class=\"main_hr\">
-                    <button id="save" ''' + state +  ''' type="submit">''' + load_lang('save') + '''</button>
+                    <h2>''' + load_lang('explanation') + '''</h2>
+                    <ul>
+                        <li>ban : ''' + load_lang('ban_authority') + '''</li>
+                        <li>toron : ''' + load_lang('discussion_authority') + '''</li>
+                        <li>check : ''' + load_lang('user_check_authority') + '''</li>
+                        <li>acl : ''' + load_lang('document_acl_authority') + '''</li>
+                        <li>hidel : ''' + load_lang('history_hide_authority') + '''</li>
+                        <li>give : ''' + load_lang('authorization_authority') + '''</li>
+                        <li>owner : ''' + load_lang('owner_authority') + '''</li>
+                    </ul>
+                    <hr class=\"main_hr\">
+                    <button ''' + state +  ''' type="submit">''' + load_lang('save') + '''</button>
                 </form>
             ''',
-            menu = [['manager', load_lang('return')]]
+            menu = [['give_log', load_lang('return')]]
         ))     

route/main_manager.py

@@ -31,12 +31,11 @@ def main_manager_2(conn, num, r_ver):
                         <li><a href="/ban">''' + load_lang('ban') + '''</a></li>
                         <li><a href="/manager/5">''' + load_lang('authorize') + '''</a></li>
                         <li><a href="/edit_filter">''' + load_lang('edit_filter_list') + '''</a></li>
-                        <li><a href="/give_log">''' + load_lang('admin_group_list') + '''</a></li>
                     </ul>
                     <br>
                     <h2>''' + load_lang('owner') + '''</h2>
                     <ul>
-                        <li><a href="/manager/8">''' + load_lang('admin_group_add') + '''</a></li>
+                        <li><a href="/give_log">''' + load_lang('admin_group_list') + '''</a></li>
                         <li><a href="/setting">''' + load_lang('setting') + '''</a></li>
                     </ul>
                     <h3>''' + load_lang('filter') + '''</h3>

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.4-master-01",
+        "r_ver" : "v3.1.4-master-02",
         "c_ver" : "400003",
         "s_ver" : "3"
     }, "stable" : {