Browse Source

버그 수정

2DU 9 years ago
parent
commit
55538b4b0c
2 changed files with 7 additions and 4 deletions
  1. 6 3
      app.py
  2. 1 1
      templates/index.html

+ 6 - 3
app.py

@@ -2302,7 +2302,8 @@ def reraw(name = None, number = None):
                 enddata = re.sub('<', '&lt;', rows[0]['data'])
                 enddata = re.sub('<', '&lt;', rows[0]['data'])
                 enddata = re.sub('>', '&gt;', enddata)
                 enddata = re.sub('>', '&gt;', enddata)
                 enddata = re.sub('"', '&quot;', enddata)
                 enddata = re.sub('"', '&quot;', enddata)
-                enddata = re.sub("\n", '<br>', enddata)
+                
+                enddata = '<pre>' + enddata + '</pre>'
                 
                 
                 return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'])
                 return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'])
             else:
             else:
@@ -2316,7 +2317,8 @@ def reraw(name = None, number = None):
             enddata = re.sub('<', '&lt;', rows[0]['data'])
             enddata = re.sub('<', '&lt;', rows[0]['data'])
             enddata = re.sub('>', '&gt;', enddata)
             enddata = re.sub('>', '&gt;', enddata)
             enddata = re.sub('"', '&quot;', enddata)
             enddata = re.sub('"', '&quot;', enddata)
-            enddata = re.sub("\n", '<br>', enddata)
+            
+            enddata = '<pre>' + enddata + '</pre>'
             
             
             return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'])
             return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'])
         else:
         else:
@@ -2330,7 +2332,8 @@ def raw(name = None):
         enddata = re.sub('<', '&lt;', rows[0]['data'])
         enddata = re.sub('<', '&lt;', rows[0]['data'])
         enddata = re.sub('>', '&gt;', enddata)
         enddata = re.sub('>', '&gt;', enddata)
         enddata = re.sub('"', '&quot;', enddata)
         enddata = re.sub('"', '&quot;', enddata)
-        enddata = re.sub("\n", '<br>', enddata)
+        
+        enddata = '<pre>' + enddata + '</pre>'
         
         
         return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'], tn = 7, sub = 'Raw')
         return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'], tn = 7, sub = 'Raw')
     else:
     else:

+ 1 - 1
templates/index.html

@@ -67,7 +67,7 @@
                         {% if uppage %}
                         {% if uppage %}
                         <a class="menu-item" style="{{style}}" href="/w/{{uppage}}">상위</a>
                         <a class="menu-item" style="{{style}}" href="/w/{{uppage}}">상위</a>
                         {% endif %}
                         {% endif %}
-                        {% elif tn == 6 or tn == 13 or not tn %}
+                        {% elif tn == 6 or tn == 13 or not tn and not sub == '역링크' or tn == 12 or tn == 3 %}
                         <a class="menu-item" href="javascript:history.back(-1);">뒤로</a>
                         <a class="menu-item" href="javascript:history.back(-1);">뒤로</a>
                         {% elif tn == 10 and not list or tn == 11 %}
                         {% elif tn == 10 and not list or tn == 11 %}
                         <a class="menu-item" href="/topic/{{page}}">토론 목록</a>
                         <a class="menu-item" href="/topic/{{page}}">토론 목록</a>