浏览代码

일부 버그 수정

Surplus_Up (2DU) 6 年之前
父节点
当前提交
650fa4fb4d
共有 6 个文件被更改,包括 11 次插入8 次删除
  1. 1 1
      route/tool/func.py
  2. 6 2
      route/tool/set_mark/namumark.py
  3. 1 1
      route/topic.py
  4. 1 1
      route/topic_close_list.py
  5. 1 1
      version.json
  6. 1 2
      views/main_css/css/main.css

+ 1 - 1
route/tool/func.py

@@ -398,7 +398,7 @@ def other2(data):
     req_list = ''
     
     css_filter = {
-        'main.css' : '4'
+        'main.css' : '5'
     }
     for i_data in os.listdir(os.path.join("views", "main_css", "css")):
         if i_data in css_filter:

+ 6 - 2
route/tool/set_mark/namumark.py

@@ -758,14 +758,18 @@ def namumark(conn, data, title, main_num, include_num):
             width = re.search(', ?width=((?:(?!,).)+)', video[1])
             if width:
                 video_width = width.groups()[0]
+                if re.search('^[0-9]+$', video_width):
+                    video_width += 'px'
             else:
-                video_width = '560'
+                video_width = '560px'
             
             height = re.search(', ?height=((?:(?!,).)+)', video[1])
             if height:
                 video_height = height.groups()[0]
+                if re.search('^[0-9]+$', video_height):
+                    video_height += 'px'                
             else:
-                video_height = '315'
+                video_height = '315px'
 
             code = re.search('^((?:(?!,).)+)', video[1])
             if code:

+ 1 - 1
route/topic.py

@@ -111,7 +111,7 @@ def topic_2(conn, topic_num):
             <a href="/thread/''' + str(topic_num) + '/tool">(' + load_lang('topic_tool') + ''')</a>
             <hr class=\"main_hr\">
             <form style="''' + display + '''" method="post">
-                <textarea id="content" placeholder="''' + load_lang('content') + '''" name="content"></textarea>
+                <textarea rows="10" id="content" placeholder="''' + load_lang('content') + '''" name="content"></textarea>
                 <hr class=\"main_hr\">
                 ''' + captcha_get() + (ip_warring() if display == '' else '') + '''
                 <input style="display: none;" name="topic" value="''' + name + '''">

+ 1 - 1
route/topic_close_list.py

@@ -39,7 +39,7 @@ def topic_close_list_2(conn, name):
             <form style="''' + display + '" method="post" action="/thread/' + topic_num + '''">
                 <input placeholder="''' + load_lang('discussion_name') + '''" name="title">
                 <hr class=\"main_hr\">
-                <textarea id="content" placeholder="''' + load_lang('content') + '''" name="content"></textarea>
+                <textarea rows="10" id="content" placeholder="''' + load_lang('content') + '''" name="content"></textarea>
                 <hr class=\"main_hr\">
                 ''' + captcha_get() + (ip_warring() if display == '' else '') + '''
                 <input style="display: none;" name="topic" value="''' + name + '''">

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-13",
+        "r_ver" : "v3.1.5-master-14",
         "c_ver" : "400005",
         "s_ver" : "5"
     }, "stable" : {

+ 1 - 2
views/main_css/css/main.css

@@ -43,5 +43,4 @@ blockquote { background-image: url(/views/acme/img/quote.png); background-positi
 @media (max-height: 400px) { .foot_plus { height: 80%; top: calc(100% - 92%); }}
 .foot_in { overflow-y: scroll; height: calc(100% - 20px); }
 #origin { display: none; }
-.all_in_data { display: block; width: 100%; }
-#content { height: 100px; }
+.all_in_data { display: block; width: 100%; }