Explorar el Código

상위 문서

2DU hace 9 años
padre
commit
150b412cad
Se han modificado 2 ficheros con 23 adiciones y 5 borrados
  1. 20 4
      app.py
  2. 3 1
      templates/index.html

+ 20 - 4
app.py

@@ -1165,6 +1165,14 @@ def search():
 
 @app.route('/w/<path:name>')
 def w(name = None):
+    m = re.search("^(.*)\/(.*)$", name)
+    if(m):
+        g = m.groups()
+        uppage = g[0]
+        style = ""
+    else:
+        uppage = ""
+        style = "display:none;"
     curs.execute("select * from data where title = '" + pymysql.escape_string(name) + "'")
     rows = curs.fetchall()
     if(rows):
@@ -1181,12 +1189,20 @@ def w(name = None):
             left = result[0]
         else:
             left = ''
-        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'], tn = 1, acl = acl, left = left)
+        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'], tn = 1, acl = acl, left = left, uppage = uppage, style = style)
     else:
-        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = '문서 없음', license = data['license'], tn = 1)
+        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = '문서 없음', license = data['license'], tn = 1, uppage = uppage, style = style)
 
 @app.route('/w/<path:name>/redirect/<redirect>')
 def redirectw(name = None, redirect = None):
+    m = re.search("^(.*)\/(.*)$", name)
+    if(m):
+        g = m.groups()
+        uppage = g[0]
+        style = ""
+    else:
+        uppage = ""
+        style = "display:none;"
     curs.execute("select * from data where title = '" + pymysql.escape_string(name) + "'")
     rows = curs.fetchall()
     if(rows):
@@ -1209,13 +1225,13 @@ def redirectw(name = None, redirect = None):
         redirect = re.sub('<', '&lt;', redirect)
         redirect = re.sub('>', '&gt;', redirect)
         redirect = re.sub('"', '&quot;', redirect)
-        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'], tn = 1, redirect = '<a href="/edit/' + parse.quote(test).replace('/','%2F') + '">' + redirect + '</a>에서 넘어 왔습니다.', left = left, acl = acl)
+        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = enddata, license = data['license'], tn = 1, redirect = '<a href="/edit/' + parse.quote(test).replace('/','%2F') + '">' + redirect + '</a>에서 넘어 왔습니다.', left = left, acl = acl, uppage = uppage, style = style)
     else:
         test = redirect
         redirect = re.sub('<', '&lt;', redirect)
         redirect = re.sub('>', '&gt;', redirect)
         redirect = re.sub('"', '&quot;', redirect)
-        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = '문서 없음', license = data['license'], tn = 1, redirect = '<a href="/edit/' + parse.quote(test).replace('/','%2F') + '">' + redirect + '</a>에서 넘어 왔습니다.')
+        return render_template('index.html', title = name, logo = data['name'], page = parse.quote(name).replace('/','%2F'), data = '문서 없음', license = data['license'], tn = 1, redirect = '<a href="/edit/' + parse.quote(test).replace('/','%2F') + '">' + redirect + '</a>에서 넘어 왔습니다.', uppage = uppage, style = style)
 
 @app.route('/w/<path:name>/r/<number>')
 def rew(name = None, number = None):

+ 3 - 1
templates/index.html

@@ -53,7 +53,8 @@
 					<a class="menu-item" href="/move/{{page}}">이동</a>
 					<a class="menu-item" href="/raw/{{page}}">Raw</a>
 					<a class="menu-item" href="/history/{{page}}/n/1">역사</a>
-					<a class="menu-item" href="/xref/{{page}}">역링크</a>
+					<!-- <a class="menu-item" href="/xref/{{page}}">역링크</a> -->
+                    <a class="menu-item" style="{{style}}" href="/w/{{uppage}}">상위</a>
 				</nav>
 			</div>
 			<h1 class="title">{{title}} <sub>{{acl}}</sub></h1>
@@ -325,6 +326,7 @@
                 <li>파일 문서 생성</li>
                 <li>사문 접근성</li>
                 <li>검색 기능 수정 (완료)</li>
+                <li> (완료)</li>
 				<h2>계속</h2>
 				<li>버그 수정</li>
 				<li>파서 제작</li>