2DU 9 лет назад
Родитель
Сommit
b6805c7999
2 измененных файлов с 20 добавлено и 9 удалено
  1. 14 4
      app.py
  2. 6 5
      templates/index.html

+ 14 - 4
app.py

@@ -708,12 +708,13 @@ def recentblock():
     else:
         return render_template('index.html', logo = data['name'], rows = '', tn = 20, title = '최근 차단내역')
 
-@app.route('/history/<path:name>', methods=['POST', 'GET'])
-def gethistory(name = None):
+@app.route('/history/<path:name>/n/<int:number>', methods=['POST', 'GET'])
+def gethistory(name = None, number = None):
     if(request.method == 'POST'):
         return '<meta http-equiv="refresh" content="0;url=/w/' + parse.quote(name).replace('/','%2F') + '/r/' + request.form["a"] + '/diff/' + request.form["b"] + '" />'
     else:
-        i = 0
+        v = number * 50
+        i = v - 49
         div = '<div>'
         curs.execute("select * from history where title = '" + pymysql.escape_string(name) + "' order by id+0 desc")
         rows = curs.fetchall()
@@ -724,6 +725,7 @@ def gethistory(name = None):
                     a = rows[i]
                 except:
                     div = div + '</div>'
+                    div = div + '<br><a href="/history/' + parse.quote(name).replace('/','%2F') + '/n/' + str(number - 1) + '">(이전)'
                     break
                 if(rows[i]['send']):
                     send = rows[i]['send']
@@ -763,7 +765,15 @@ def gethistory(name = None):
                 else:
                     ip = rows[i]['ip']
                 div = div + '<table style="width: 100%;"><tbody><tr><td style="text-align: center;width:33.33%;">r' + rows[i]['id'] + '</a> <a href="/w/' + parse.quote(rows[i]['title']).replace('/','%2F') + '/r/' + rows[i]['id'] + '">(w)</a> <a href="/w/' + parse.quote(rows[i]['title']).replace('/','%2F') + '/raw/' + rows[i]['id'] + '">(Raw)</a> <a href="/revert/' + parse.quote(rows[i]['title']).replace('/','%2F') + '/r/' + rows[i]['id'] + '">(되돌리기)</a> (' + leng + ')</td><td style="text-align: center;width:33.33%;">' + ip + '</td><td style="text-align: center;width:33.33%;">' + rows[i]['date'] + '</td></tr><tr><td colspan="3" style="text-align: center;width:100%;">' + send + '</td></tr></tbody></table>'
-                i = i + 1
+                if(i == v):
+                    div = div + '</div>'
+                    if(number == 1):
+                        div = div + '<br><a href="/history/' + parse.quote(name).replace('/','%2F') + '/n/' + str(number + 1) + '">(다음)'
+                    else:
+                        div = div + '<br><a href="/history/' + parse.quote(name).replace('/','%2F') + '/n/' + str(number - 1) + '">(이전) <a href="/history/' + parse.quote(name).replace('/','%2F') + '/n/' + str(number + 1) + '">(다음)'
+                    break
+                else:
+                    i = i + 1
             return render_template('index.html', logo = data['name'], rows = div, tn = 5, title = name, page = parse.quote(name).replace('/','%2F'))
         else:
             return render_template('index.html', logo = data['name'], rows = '', tn = 5, title = name, page = parse.quote(name).replace('/','%2F'))

+ 6 - 5
templates/index.html

@@ -52,7 +52,7 @@
 					<a class="menu-item" href="/delete/{{page}}">삭제</a>
 					<a class="menu-item" href="/move/{{page}}">이동</a>
 					<a class="menu-item" href="/raw/{{page}}">Raw</a>
-					<a class="menu-item" href="/history/{{page}}">역사</a>
+					<a class="menu-item" href="/history/{{page}}/n/1">역사</a>
 					<a class="menu-item" href="/xref/{{page}}">역링크</a>
 				</nav>
 			</div>
@@ -131,7 +131,7 @@
 				</nav>
 			</div>
 			<h1 class="title">{{title}} <sub>(역사)</sub></h1>
-            <form class="usrform" method='POST' action='/history/{{page}}'>
+            <form class="usrform" method='POST' action='/history/{{page}}/n/1'>
             <input id="form-control input-sm" type='text' id='history' name='a'>
             <input id="form-control input-sm" type='text' id='history' name='b'>
             <button class="btn btn-primary" type='submit'>리비전 비교</button>
@@ -153,7 +153,7 @@
 			<div id="tool">
 				<nav class="menu">
 					<a class="menu-item selected" href="#" onclick="return false">옛문서</a>
-					<a class="menu-item" href="/history/{{page}}">목록</a>
+					<a class="menu-item" href="javascript:history.back(-1);">뒤로가기</a>
 				</nav>
 			</div>
 			<h1 class="titlee">{{title}} <sub>(옛문서)</sub></h1>
@@ -279,7 +279,7 @@
 			<div id="tool">
 				<nav class="menu">
 					<a class="menu-item selected" href="#" onclick="return false">되돌리기</a>
-					<a class="menu-item" href="/w/{{page}}">문서</a>
+					<a class="menu-item" href="javascript:history.back(-1);">뒤로가기</a>
 				</nav>
 			</div>
 			<form id="usrform" method="POST" action="/revert/{{page}}/r/{{r}}">
@@ -317,6 +317,7 @@
                 <li>비 효율적으로 돌아가던거 수정 (완료)</li>
                 <li>하위 문서 지원 (완료)</li>
                 <li>관리자 기능의 접근성 향상 (완료)</li>
+                <li>대규모도 편하게 접근되게 (완료)</li>
                 <h2>1.4</h2>
                 <li>관리자 기능 접근성</li>
                 <li>사용자 문서 생성</li>
@@ -334,7 +335,7 @@
 				<li>일부 파일 <a class="out_link" href="https://twitter.com/Basix1120">Basix</a></li>
 				<br>
 				<h2>기타</h2>
-				<li>현재 버전 1.3.1 - Beta <s>정식 버전은 10.0이라더라.</s></li>
+				<li>현재 버전 1.3.7 - Beta <s>정식 버전은 10.0이라더라.</s></li>
 			</div>
 			{% elif tn == 15 %}
 			<h1 class="title">{{title}}</h1>