Merge pull request #627 from 2du/master

버그 수정

app.py

@@ -8,7 +8,7 @@ for i_data in os.listdir("route"):
 
         exec("from route." + f_src + " import *")
 
-r_ver = 'v3.0.9-stable-06'
+r_ver = 'v3.0.9-stable-07'
 c_ver = '400000'
 
 print('Version : ' + r_ver)

route/change_password.py

@@ -86,11 +86,7 @@ def change_password_2(conn, server_init):
             
             oauth_content += '</ul>'
 
-            forwarded_protocol = flask.request.headers.get('X-Forwarded-Proto', None)
-            if forwarded_protocol == 'http':
-                http_warring = '<hr class=\"main_hr\"><span>' + load_lang('http_warring') + '</span>'
-            else:
-                http_warring = ''
+            http_warring = '<hr class=\"main_hr\"><span>' + load_lang('http_warring') + '</span>'
 
             return easy_minify(flask.render_template(skin_check(),    
                 imp = [load_lang('user_setting'), wiki_set(), custom(), other2([0, 0])],

route/login.py

@@ -1,4 +1,5 @@
 from .tool.func import *
+from flask import request
 
 def login_2(conn):
     curs = conn.cursor()
@@ -77,11 +78,7 @@ def login_2(conn):
         if oauth_check == 0:
             oauth_content = ''
 
-        forwarded_protocol = flask.request.headers.get('X-Forwarded-Proto', None)
-        if forwarded_protocol == 'http':
-            http_warring = '<hr class=\"main_hr\"><span>' + load_lang('http_warring') + '</span>'
-        else:
-            http_warring = ''
+        http_warring = '<hr class=\"main_hr\"><span>' + load_lang('http_warring') + '</span>'
         
         return easy_minify(flask.render_template(skin_check(),    
             imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],

route/register.py

@@ -88,11 +88,7 @@ def register_2(conn):
         if data and data[0][0] != '':
             contract = data[0][0] + '<hr class=\"main_hr\">'
         
-        forwarded_protocol = flask.request.headers.get('X-Forwarded-Proto', None)
-        if forwarded_protocol == 'http':
-            http_warring = '<hr class=\"main_hr\"><span>' + load_lang('http_warring') + '</span>'
-        else:
-            http_warring = ''
+        http_warring = '<hr class=\"main_hr\"><span>' + load_lang('http_warring') + '</span>'
 
         return easy_minify(flask.render_template(skin_check(),    
             imp = [load_lang('register'), wiki_set(), custom(), other2([0, 0])],

route/tool/func.py

@@ -332,7 +332,7 @@ def ip_or_user(data):
 
 def edit_help_button():
     # https://stackoverflow.com/questions/11076975/insert-text-into-textarea-at-cursor-position-javascript
-    js_data =   '''
+    js_data = '''
         <script>
             function insert_data(name, data) {
                 if(document.selection) { 

route/tool/set_mark/namu.py

@@ -73,7 +73,7 @@ def table_parser(data, cel_data, start_data, num = 0):
     if table_bgcolor:
         all_table += 'background: ' + table_bgcolor.groups()[0] + ';'
         
-    bgcolor = re.search("<bgcolor=(#(?:[0-9a-f-A-F]{3}){1,2}|\w+)>", data)
+    bgcolor = re.search("<(?:bgcolor=)?(#(?:[0-9a-f-A-F]{3}){1,2}|\w+)>", data)
     if bgcolor:
         cel_style += 'background: ' + bgcolor.groups()[0] + ';'
         
@@ -301,14 +301,36 @@ def middle_parser(data, fol_num, syntax_num, folding_num):
                         
                         del(middle_list[middle_number])
         else:
-            break
+            if middle_stack == 0:
+                break
+            else:
+                if middle_list == []:
+                    data += '}}}'
+                else:
+                    if middle_stack > 0:
+                        middle_stack -= 1
+
+                    if middle_stack > 0:
+                        data += '}}}'
+                    else:                    
+                        if middle_number > 0:
+                            middle_number -= 1
+                            
+                        if middle_list[middle_number] == '2div':
+                            data += '</div_end></div_end></div_end>'
+                        elif middle_list[middle_number] == 'pre':
+                            data += '</code></pre>'
+                        else:
+                            data += '</' + middle_list[middle_number] + '>'
+                        
+                        del(middle_list[middle_number])
 
     num = 0
     while 1:
         nowiki_data = re.search('<code>((?:(?:(?!<\/code>).)*\n*)*)<\/code>', data)
         if nowiki_data:
             nowiki_data = nowiki_data.groups()
-
+            
             num += 1
 
             end_data += [['nowiki_' + str(num), nowiki_data[0], 'code']]
@@ -460,10 +482,10 @@ def namu(conn, data, title, main_num):
         math = math_re.search(data)
         if math:
             if first == 0:
-                plus_data +=    '''
-                                <link rel="stylesheet" href="/views/main_css/katex/katex.min.css">
-                                <script src="/views/main_css/katex/katex.min.js"></script>
-                                '''
+                plus_data += '''
+                    <link rel="stylesheet" href="/views/main_css/katex/katex.min.css">
+                    <script src="/views/main_css/katex/katex.min.js"></script>
+                '''
 
             math = math.groups()[0]
             
@@ -726,7 +748,7 @@ def namu(conn, data, title, main_num):
 
     data = table_start(data)
 
-    category = '\n<hr><div id="cate">category : '
+    category = '\n<hr><div id="cate">Category : '
     category_re = re.compile('^(?:category|분류):', re.I)
     while 1:
         link = re.search('\[\[((?:(?!\[\[|\]\]).)+)\]\]', data)
@@ -903,7 +925,7 @@ def namu(conn, data, title, main_num):
                     else:
                         footdata_in = footdata[2]
 
-                    footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '" id="fn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> ' + footdata_in + '</li>'
+                    footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> <span id="fn-' + str(footdata[0]) + '">' + footdata_in + '</span></li>'
                 
                 data = re_footnote.sub(footdata_all + '</ul>', data, 1)
                 
@@ -921,7 +943,7 @@ def namu(conn, data, title, main_num):
 
                         footnote_all += [[float(footshort), footshort, 0]]
 
-                        data = re_footnote.sub('<sup><a href="#fn-' + footshort + '" id="rfn-' + footshort + '">(' + footshort + ')</a></sup>', data, 1)
+                        data = re_footnote.sub('<sup><a href="javascript:open_foot(\'fn-' + footshort + '\')" id="rfn-' + footshort + '">(' + footshort + ')</a></sup><span class="foot_plus" id="cfn-' + footshort + '"></span>', data, 1)
                     else:
                         data = re_footnote.sub('<sup><a href="#">(' + footnote_name + ')</a></sup>', data, 1)
                 else:
@@ -939,7 +961,7 @@ def namu(conn, data, title, main_num):
 
                     footnote_all += [[footnote_number, footnote_name, footnote]]
                     
-                    data = re_footnote.sub('<sup><a href="#fn-' + str(footnote_number) + '" id="rfn-' + str(footnote_number) + '">(' + footnote_name + ')</a></sup>', data, 1)
+                    data = re_footnote.sub('<sup><a href="javascript:open_foot(\'fn-' + str(footnote_number) + '\')" id="rfn-' + str(footnote_number) + '">(' + footnote_name + ')</a></sup><span class="foot_plus" id="cfn-' + str(footnote_number) + '"></span>', data, 1)
         else:
             break
 
@@ -953,7 +975,7 @@ def namu(conn, data, title, main_num):
         else:
             footdata_in = footdata[2]
 
-        footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '" id="fn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> ' + footdata_in + '</li>'
+        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>':
@@ -964,7 +986,7 @@ def namu(conn, data, title, main_num):
     category += '</div>'
     category = re.sub(' / <\/div>$', '</div>', category)
 
-    if category == '\n<hr><div id="cate">category : </div>':
+    if category == '\n<hr><div id="cate">Category : </div>':
         category = ''
 
     data += category

views/main_css/main.css

@@ -32,4 +32,6 @@ s:hover, strike:hover, del:hover { color: gray; background-color: gainsboro; tex
 #main_table_width_quarter { width: 25%; }
 #redirect { border: 1px solid; padding: 10px; }
 body { word-break: break-all; overflow: scroll; }
-hr.main_hr { border: none; }
+hr.main_hr { border: none; }
+#include_link { display: none; }
+.foot_plus { background: gainsboro; }

views/main_css/main.js

@@ -0,0 +1,10 @@
+function open_foot(name) {
+    var g_data = document.getElementById(name);
+    var o_data = document.getElementById('c' + name);
+
+    if(o_data.innerHTML === '') {
+        o_data.innerHTML += '<sup><a onclick="open_foot(\'' + name + '\')" href="#' + name + '">(Go)</a></sup> ' + g_data.innerHTML;
+    } else {
+        o_data.innerHTML = '';
+    }
+}

views/neo_yousoro/index.html

@@ -4,6 +4,7 @@
         <meta charset="utf-8">
         <title>{{imp[0]}} - {{imp[1][0]}}</title>
         <link rel="stylesheet" href="/views/main_css/main.css">
+        <script src="/views/main_css/main.js"></script>
         <link rel="stylesheet" href="/views/neo_yousoro/css/main.css">
         <script src="/views/neo_yousoro/js/main.js"></script>
         <script src="/views/neo_yousoro/js/skin_set.js"></script>