Merge branch 'master' of https://github.com/2DU/opennamu

route/setting.py

@@ -189,7 +189,7 @@ def setting_2(conn, num):
                         <hr class=\"main_hr\">
                         <input type="checkbox" name="ip_view" ''' + ch_2 + '''> ''' + load_lang('hide_ip') + '''
                         <hr class=\"main_hr\">
-                        <input type="checkbox" name="email_have" ''' + ch_3 + '''> ''' + load_lang('email_required') + ''' {<a href="/setting/5">''' + load_lang('google_imap_required') + '''</a>}
+                        <input type="checkbox" name="email_have" ''' + ch_3 + '''> ''' + load_lang('email_required') + ''' {<a href="/setting/6">''' + load_lang('google_imap_required') + '''</a>}
                         <hr class=\"main_hr\">
                         <span>''' + load_lang('wiki_host') + '''</span>
                         <hr class=\"main_hr\">
@@ -487,4 +487,4 @@ def setting_2(conn, num):
                 menu = [['setting', load_lang('return')]]
             ))
     else:
-        return redirect()
+        return redirect()

route/tool/set_mark/namu.py

@@ -727,7 +727,7 @@ def namu(conn, data, title, main_num):
 
     data = table_start(data)
 
-    category = '\n<div id="cate_all"><hr><div id="cate">Category : '
+    category = '<div id="cate_all"><hr><div id="cate">Category : '
     category_re = re.compile('^(?:category|분류):', re.I)
     while 1:
         link = re.search('\[\[((?:(?!\[\[|\]\]).)+)\]\]', data)
@@ -888,7 +888,7 @@ def namu(conn, data, title, main_num):
     footnote_dict = {}
     footnote_re = {}
     
-    footdata_all = '\n<hr><ul id="footnote_data">'
+    footdata_all = '<hr><ul id="footnote_data">'
     
     re_footnote = re.compile('(?:\[\*((?:(?! |\]).)*)(?: ((?:(?!(?:\[\*|\])).)+))?\]|(\[(?:각주|footnote)\]))')
     while 1:
@@ -909,7 +909,7 @@ def namu(conn, data, title, main_num):
                 data = re_footnote.sub(footdata_all + '</ul>', data, 1)
                 
                 footnote_all = []
-                footdata_all = '\n<hr><ul id="footnote_data">'
+                footdata_all = '<hr><ul id="footnote_data">'
             else:
                 footnote = footnote_data[1]
                 footnote_name = footnote_data[0]
@@ -957,7 +957,7 @@ def namu(conn, data, title, main_num):
         footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> <span id="fn-' + str(footdata[0]) + '">' + footdata_in + '</span></li>'
 
     footdata_all += '</ul>'
-    if footdata_all == '\n<hr><ul id="footnote_data"></ul>':
+    if footdata_all == '<hr><ul id="footnote_data"></ul>':
         footdata_all = ''
 
     data = re.sub('\n$', footdata_all, data + '\n', 1)
@@ -965,7 +965,7 @@ def namu(conn, data, title, main_num):
     category += '</div></div>'
     category = re.sub(' \| <\/div><\/div>$', '</div></div>', category)
 
-    if category == '\n<div id="cate_all"><hr><div id="cate">Category : </div></div>':
+    if category == '<div id="cate_all"><hr><div id="cate">Category : </div></div>':
         category = ''
 
     data += category