ソースを参照

fix footnote error and bbs error

https://github.com/openNAMU/openNAMU/issues/1774
잉여개발기 (SPDV) 3 年 前
コミット
42920c634e

+ 1 - 1
route/bbs_w_set.py

@@ -72,7 +72,7 @@ def bbs_w_set(bbs_num = ''):
                         
                         <h2>''' + load_lang('acl') + '''</h2>
                         <h3>''' + load_lang('bbs_view_acl') + '''</h3>
-                        <select ''' + disable + ''' name="bbs_comment_acl">''' + acl_div[3] + '''</select>
+                        <select ''' + disable + ''' name="bbs_view_acl">''' + acl_div[3] + '''</select>
 
                         <h4>''' + load_lang('bbs_acl') + '''</h4>
                         <select ''' + disable + ''' name="bbs_acl">''' + acl_div[0] + '''</select>

+ 1 - 1
route/tool/func.py

@@ -1108,7 +1108,7 @@ def wiki_css(data):
     data_css += '<script defer src="/views/main_css/js/func/shortcut.js?ver=' + data_css_ver + '"></script>'
     
     # Route JS + Defer
-    data_css += '<script defer src="/views/main_css/js/route/thread.js?ver=' + data_css_ver + '"></script>'
+
     
     # Route JS
     data_css += '<script src="/views/main_css/js/route/editor.js?ver=' + data_css_ver + '"></script>'

+ 6 - 0
views/main_css/css/main.css

@@ -222,6 +222,9 @@ pre {
     background-color: #efefef;
     
     border: 1px solid #cecece;
+
+    font-size: small;
+    font-weight: initial;
 }
 
 .opennamu_popup_footnote {
@@ -236,6 +239,9 @@ pre {
     background-color: #efefef;
     
     border: 1px solid #cecece;
+
+    font-size: small;
+    font-weight: initial;
 }
 
 @media ( max-width: 768px ) {

+ 3 - 6
views/main_css/js/route/render.js

@@ -121,7 +121,6 @@ function opennamu_do_render_html(name = '') {
 
 function opennamu_do_footnote_spread(set_name, load_name) {
     if(document.getElementById(set_name + '_load').style.display === 'none') {
-        console.log(set_name, load_name);
         document.getElementById(set_name).title = '';
         document.getElementById(set_name + '_load').innerHTML = '<a href="#' + load_name + '">(Go)</a> ' + document.getElementById(load_name + '_title').innerHTML;
         document.getElementById(set_name + '_load').style.display = "inline-block";
@@ -132,7 +131,6 @@ function opennamu_do_footnote_spread(set_name, load_name) {
 
 function opennamu_do_footnote_popover(set_name, load_name) {
     if(document.getElementById(set_name + '_load').style.display === 'none') {
-        console.log(set_name, load_name);
         document.getElementById(set_name).title = '';
         document.getElementById(set_name + '_load').innerHTML = '<a href="#' + load_name + '">(Go)</a> ' + document.getElementById(load_name + '_title').innerHTML;
         document.getElementById(set_name + '_load').style.display = "inline-block";
@@ -141,11 +139,10 @@ function opennamu_do_footnote_popover(set_name, load_name) {
         let screen_width = window.innerWidth;
         let left = document.getElementById(set_name).getBoundingClientRect().left;
         let left_org = document.getElementById(set_name + '_load').getBoundingClientRect().left;
-        let top = document.getElementById(set_name).getBoundingClientRect().top;
-        console.log(width, screen_width, left, left_org);
-        console.log(screen_width - (left + width));
+        let top = window.pageYOffset + document.getElementById(set_name).getBoundingClientRect().top;
+
+        document.getElementById(set_name + '_load').style.top = String(top) + "px";
         if(screen_width - (left + width) < 50) {
-            console.log("test");
             if(left > 350) {
                 document.getElementById(set_name + '_load').style.left = String(left - 300) + "px";
             } else {