Merge pull request #368 from 2DU/master

Master

mark.py

@@ -74,6 +74,11 @@ def namumark(conn, title, data, num, in_c, toc_y):
     data = footnote(data, fol_num)
     data = table(data)
     data = end(data, category)
+
+    data += '<script>function folding(num) { var fol = document.getElementById(\'folding_\' + num); \
+            if(fol.style.display == \'inline-block\' || fol.style.display == \'block\') { fol.style.display = \'none\'; } \
+            else { if(num % 3 == 0) { fol.style.display = \'block\'; } else { fol.style.display = \'inline-block\'; } } } \
+            </script>'
     
     if(num == 1):        
         for d4 in backlink:

set_mark/mid_pas.py

@@ -100,12 +100,6 @@ def mid_pas(data, fol_num, include, in_c, toc_y):
             elif fol:
                 fol_d = fol.groups()
                 if toc_y != 0:
-                    if folding_test == 0:
-                        data += '<script>function folding(num) { var fol = document.getElementById(\'folding_\' + num); \
-                                if(fol.style.display == \'inline-block\' || fol.style.display == \'block\') { fol.style.display = \'none\'; } \
-                                else { if(num % 3 == 0) { fol.style.display = \'block\'; } else { fol.style.display = \'inline-block\'; } } } \
-                                </script>'
-
                     data = com.sub("<div>" + fol_d[0] + " <div id='folding_" + str(fol_num + 1) + "' style='display: inline-block;'>" + \
                                     "[<a href='javascript:void(0);' onclick='folding(" + str(fol_num + 1) + \
                                     "); folding(" + str(fol_num + 2) + "); folding(" + str(fol_num) + ");'>펼치기</a>]</div>" + \

views/acme/index.tpl

@@ -42,14 +42,12 @@
                             <a href="/recent_changes">
                                 <i class="fa fa-refresh" aria-hidden="true"></i>
                                 최근 변경
-                                <i class="fa fa-angle-left"></i>
                             </a>
                         </li>
                         <li>
                             <a href="/recent_discuss">
                                 <i class="fa fa-comment" aria-hidden="true"></i>
                                 최근 토론
-                                <i class="fa fa-angle-left"></i>
                             </a>
                         </li>
                         <li class="dropdown">