surplus-dev 3 år sedan
förälder
incheckning
bb20ef0ab0
6 ändrade filer med 25 tillägg och 8 borttagningar
  1. 7 4
      route/give_acl.py
  2. 4 1
      route/main_func_setting_acl.py
  3. 5 2
      route/main_view.py
  4. 1 1
      version.json
  5. 4 0
      views/ringo/css/main.css
  6. 4 0
      views/tenshi/css/main.css

+ 7 - 4
route/give_acl.py

@@ -82,7 +82,7 @@ def give_acl_2(name):
 
             for i in acl_get_list:
                 data += '' + \
-                    '<h' + i[2] + '>' + i[3] + ' ' + i[0] + (' (' + load_lang('beta') + ')' if i[2] == '4' else '') + '</h' + i[2] + '>' + \
+                    '<h' + i[2] + '>' + i[0] + (' (' + load_lang('beta') + ')' if i[2] == '4' else '') + '</h' + i[2] + '>' + \
                     '<hr class="main_hr">' + \
                     '<select name="' + i[1] + '" ' + check_ok + '>' + \
                 ''
@@ -100,12 +100,14 @@ def give_acl_2(name):
             acl_data = curs.fetchall()
             acl_why = html.escape(acl_data[0][0]) if acl_data else ''
             data += '' + \
-                '<hr class="main_hr">' + \
+                '<h2>' + load_lang('why') + '</h2>' + \
                 '<input value="' + acl_why + '" placeholder="' + load_lang('why') + '" name="why" ' + check_ok + '>' + \
+                '<hr class="main_hr">' + \
             ''
 
             data += '''
-                <h2 id="exp">''' + load_lang('explanation') + '''</h2>
+                <h2>''' + load_lang('explanation') + '''</h2>
+                <span id="exp"></span>
                 <ul class="opennamu_ul">
                     <li>normal : ''' + load_lang('unset') + '''</li>
                     <li>admin : ''' + load_lang('admin_acl') + '''</li>
@@ -127,7 +129,8 @@ def give_acl_2(name):
                 data = '''
                     <form method="post">
                         <a href="/setting/acl">(''' + load_lang('main_acl_setting') + ''')</a>
-                        ''' + data + '''
+                        <hr class="main_hr">
+                        ''' + render_simple_set(data) + '''
                         <button type="submit" ''' + check_ok + '''>''' + load_lang('save') + '''</button>
                     </form>
                 ''',

+ 4 - 1
route/main_func_setting_acl.py

@@ -10,7 +10,10 @@ def main_func_setting_acl():
             3 : 'upload_acl',
             4 : 'all_view_acl',
             5 : 'many_upload_acl',
-            6 : 'vote_acl'
+            6 : 'vote_acl',
+            7 : 'document_edit_acl',
+            8 : 'document_move_acl',
+            9 : 'document_delete_acl'
         }
 
         if flask.request.method == 'POST':

+ 5 - 2
route/main_view.py

@@ -15,9 +15,12 @@ def main_view(name = ''):
                 mime_type = 'text/plain'
             else:
                 mime_type = mime_type[len(mime_type) - 1].lower()
-                image_type = ['jpeg', 'jpg', 'gif', 'png', 'webp', 'ico']
+                image_type = ['jpeg', 'jpg', 'gif', 'png', 'webp', 'ico', 'svg']
                 if mime_type in image_type:
-                    mime_type = 'image/' + mime_type
+                    if not mime_type == 'svg':
+                        mime_type = 'image/' + mime_type
+                    else:
+                        mime_type = 'image/svg+xml'
                 elif mime_type == 'js':
                     mime_type = 'text/javascript'
                 elif mime_type == 'txt':

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC2-dev122",
+        "r_ver" : "v3.4.6-RC2-dev123",
         "c_ver" : "3500355",
         "s_ver" : "3500111"
     }

+ 4 - 0
views/ringo/css/main.css

@@ -317,6 +317,10 @@ footer.only_mobile {
     margin-top: 0px;
 }
 
+#b_logo {
+    width: 100px;
+}
+
 input, textarea, button, select {
     border: 1px solid #aaa;
     

+ 4 - 0
views/tenshi/css/main.css

@@ -466,4 +466,8 @@ blockquote {
     border-left: 4px solid #ffb3ff;
     
     margin-bottom: 20px;
+}
+
+#b_logo {
+    width: 100px;
 }