diff로 변경

route/recent_changes.py

@@ -163,7 +163,10 @@ def recent_changes_2(conn, name, tool):
                 title = '<a href="/w/' + url_pas(name) + '?num=' + data[0] + '">r' + data[0] + '</a> '
             else:
                 title = '<a href="/w/' + url_pas(data[1]) + '">' + html.escape(data[1]) + '</a> '
-                title += '<a href="/history/' + url_pas(data[1]) + '">(r' + data[0] + ')</a> '
+                if int(data[0]) < 2:
+                    title += '<a href="/history/' + url_pas(data[1]) + '">(r' + data[0] + ')</a> '
+                else:
+                    title += '<a href="/diff/' + url_pas(data[1]) + '?first=' + str(int(data[0]) - 1) + '&second=' + data[0] + '">(r' + data[0] + ')</a> '
 
             div += '''
                 <tr ''' + style[0] + '''>

route/recent_history_tool.py

@@ -5,56 +5,34 @@ def recent_history_tool_2(conn, name):
 
     num = str(int(number_check(flask.request.args.get('num', '1'))))
 
-    data = '''
-        <h2>''' + load_lang('tool') + '''</h2>
-        <ul>
-            <li>
-                <a href="/raw/''' + url_pas(name) + '?num=' + num + '">' + load_lang('raw') + '''</a>
-            </li>
-    '''
-
-    if (int(num) - 1) > 0:
-        data += '''
-            <li>
-                <a href="/diff/''' + url_pas(name) + '?first=''' + str(int(num) - 1) + '&second=' + num + '">' + load_lang('compare') + '''</a>
-            </li>
-        '''
+    data = '' + \
+        '<h2>' + load_lang('tool') + '</h2>' + \
+        '<ul>' + \
+            '<li><a href="/raw/' + url_pas(name) + '?num=' + num + '">' + load_lang('raw') + '</a></li>' + \
+    ''
 
     if flask.request.args.get('type', '') == 'history':
-        data += '''
-            <li>
-                <a href="/revert/''' + url_pas(name) + '?num=' + num + '">' + load_lang('revert') + '''</a>
-            </li>
-        '''
+        data += '<li><a href="/revert/' + url_pas(name) + '?num=' + num + '">' + load_lang('revert') + '</a></li>'
+        if (int(num) - 1) > 0:
+            data += '<li><a href="/diff/' + url_pas(name) + '?first=' + str(int(num) - 1) + '&second=' + num + '">' + load_lang('compare') + '</a></li>'
     elif (int(num) - 1) > 0:
-        data += '''
-            <li>
-                <a href="/revert/''' + url_pas(name) + '?num=' + str(int(num) - 1) + '">' + load_lang('revert') + '''</a>
-            </li>
-        '''
+        data += '<li><a href="/revert/' + url_pas(name) + '?num=' + str(int(num) - 1) + '">' + load_lang('revert') + '</a></li>'
+
+    if flask.request.args.get('type', '') != 'history':
+        data += '<li><a href="/history/' + url_pas(name) + '">' + load_lang('history') + '</a></li>'
 
     if admin_check(6) == 1:
-        curs.execute(db_change('''
-            select title from history
-            where title = ? and id = ? and hide = 'O'
-        '''), [name, num])
+        curs.execute(db_change('' + \
+            'select title from history ' + \
+            'where title = ? and id = ? and hide = "O"' + \
+        ''), [name, num])
         hide = curs.fetchall()
-        data += '''
-            <li>
-                <a href="/hidden/''' + url_pas(name) + '?num=' + num + '">' + (load_lang('hide_release') if hide else load_lang('hide')) + '''
-            </li>
-        '''
+        data += '<li><a href="/hidden/' + url_pas(name) + '?num=' + num + '">' + (load_lang('hide_release') if hide else load_lang('hide')) + '</li>'
 
     if admin_check() == 1:
-        data += '''
-            <li>
-                <a href="/history_delete/''' + url_pas(name) + '?num=' + num + '">' + load_lang('history_delete') + '''
-            </li>
-        '''
-
-    data += '''
-        </ul>
-    '''
+        data += '<li><a href="/history_delete/' + url_pas(name) + '?num=' + num + '">' + load_lang('history_delete') + '</li>'
+
+    data += '</ul>'
 
     return easy_minify(flask.render_template(skin_check(),
         imp = [name, wiki_set(), custom(), other2(['(r' + num + ')', 0])],