Ver código fonte

활용도 추가 및 버그 수정

https://github.com/openNAMU/openNAMU/issues/2119
잉여개발기 2 anos atrás
pai
commit
549fd7b149
4 arquivos alterados com 23 adições e 15 exclusões
  1. 1 1
      route/tool/func.py
  2. 1 1
      version.json
  3. 14 8
      views/ringo/index.html
  4. 7 5
      views/ringo/js/sidebar.js

+ 1 - 1
route/tool/func.py

@@ -1197,7 +1197,7 @@ def wiki_set(conn):
     for for_a in range(1, 4):
         curs.execute(db_change("select data from other where name = ?"), ['template_var_' + str(for_a)])
         db_data = curs.fetchall()
-        template_var += [[db_data[0][0]]] if db_data else [['']]
+        template_var += [db_data[0][0]] if db_data else ['']
 
     data_list += [template_var]
 

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev56",
+        "r_ver" : "v3.5.0-dev57",
         "c_ver" : "3500376",
         "s_ver" : "3500113"
     }

+ 14 - 8
views/ringo/index.html

@@ -11,7 +11,7 @@
         <link href="https://cdn.jsdelivr.net/gh/sun-typeface/SUIT/fonts/static/woff2/SUIT.css" rel="stylesheet">
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
         <script src="/views/ringo/js/main.js.cache_v2"></script>
-        <script src="/views/ringo/js/sidebar.js.cache_v1"></script>
+        <script src="/views/ringo/js/sidebar.js.cache_v2"></script>
         <script src="/views/ringo/js/skin_set.js.cache_v5"></script>
         <link rel="stylesheet" href="/views/ringo/css/main.css.cache_v8">
         {% if request.cookies.get('main_css_darkmode', '') == '1' %}
@@ -220,7 +220,9 @@
                 </article>
             </header>
             <article class="main" id="main_data">
+                {{imp[1][7][0]|safe}}
                 {{data|safe}}
+                {{imp[1][7][2]|safe}}
             </article>
             <footer class="not_mobile">
                 <article class="main" id="footer">
@@ -233,13 +235,17 @@
         </section>
         <div class="aside_width"> </div>
         <aside class="do_fixed">
-            <button id="side_button_1" class="side_button selected">{{'edit'|load_lang}}</button><!--
-         --><button id="side_button_2" class="side_button">{{'discussion'|load_lang}}</button><!--
-         --><button id="side_button_3" class="side_button">{{'toc'|load_lang}}</button><!--
-         --><button id="side_button_4" class="side_button">{{'footnote'|load_lang}}</button>
-            <div id="side_content">
-                Loading...
-            </div>
+            {% if imp[1][7][1] == '' %}
+                <button id="side_button_1" class="side_button selected">{{'edit'|load_lang}}</button><!--
+             --><button id="side_button_2" class="side_button">{{'discussion'|load_lang}}</button><!--
+             --><button id="side_button_3" class="side_button">{{'toc'|load_lang}}</button><!--
+             --><button id="side_button_4" class="side_button">{{'footnote'|load_lang}}</button>
+                <div id="side_content">
+                    Loading...
+                </div>
+            {% else %}
+                {{imp[1][7][1]|safe}}
+            {% endif %}
         </aside>
         <div id="nav_bar">
             <div id="go_top">

+ 7 - 5
views/ringo/js/sidebar.js

@@ -91,10 +91,12 @@ function ringo_do_side_button_4() {
 let temp_save = ['', '', '', ''];
 
 window.addEventListener('DOMContentLoaded', function() {
-    document.getElementById("side_button_1").addEventListener("click", ringo_do_side_button_1);
-    document.getElementById("side_button_2").addEventListener("click", ringo_do_side_button_2);
-    document.getElementById("side_button_3").addEventListener("click", ringo_do_side_button_3);
-    document.getElementById("side_button_4").addEventListener("click", ringo_do_side_button_4);
+    if(document.getElementById("side_button_1")) {
+        document.getElementById("side_button_1").addEventListener("click", ringo_do_side_button_1);
+        document.getElementById("side_button_2").addEventListener("click", ringo_do_side_button_2);
+        document.getElementById("side_button_3").addEventListener("click", ringo_do_side_button_3);
+        document.getElementById("side_button_4").addEventListener("click", ringo_do_side_button_4);
 
-    ringo_do_side_button_1();
+        ringo_do_side_button_1();
+    }
 });