temp

route/main_sys_update.py

@@ -46,17 +46,17 @@ def main_sys_update():
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('update'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
                 data = load_lang('update_warning') + '''
-                    <hr class=\"main_hr\">
+                    <hr class="main_hr">
                     <ul class="inside_ul">
-                        <li>''' + load_lang('version') + ''' : <span id="ver_send_2"></span></li>
-                        <li id="ver_send" style="display: none;">''' + load_lang('lastest') + ''' : </li>
+                        <li id="ver_send_2">''' + load_lang('version') + ''' : </li>
+                        <li id="ver_send">''' + load_lang('lastest') + ''' : </li>
                     </ul>
                     <a href="https://github.com/openNAMU/openNAMU">(Beta)</a> <a href="https://github.com/openNAMU/openNAMU/tree/stable">(Stable)</a>
-                    <hr class=\"main_hr\">
+                    <hr class="main_hr">
                     <form method="post">
                         <button type="submit">''' + load_lang('update') + '''</button>
                     </form>
-                    <script>load_ver();</script>
+                    <!-- JS : opennamu_do_insert_version -->
                 ''',
                 menu = [['manager', load_lang('return')]]
             ))

route/main_tool_admin.py

@@ -63,8 +63,8 @@ def main_tool_admin(num = 1, add_2 = ''):
                     </ul>
                     <h2>3. ''' + load_lang('version') + '''</h2>
                     <ul class="inside_ul">
-                        <li>''' + load_lang('version') + ''' : <span id="ver_send_2"></span></li>
-                        <li id="ver_send" style="display: none;">''' + load_lang('lastest') + ''' : </li>
+                        <li id="ver_send_2">''' + load_lang('version') + ''' : </li>
+                        <li id="ver_send">''' + load_lang('lastest') + ''' : </li>
                     </ul>
                     <h3>3.1. ''' + load_lang('skin_info') + '''</h3>
                     <ul class="inside_ul">
@@ -72,7 +72,11 @@ def main_tool_admin(num = 1, add_2 = ''):
                         <div id="ver_send_3"></div>
                     </ul>
                 </div>
-                <script>load_ver(); do_skin_ver_check(); simple_render('other_simple_render');</script>
+                <!-- JS : opennamu_do_insert_version -->
+                <script>
+                    do_skin_ver_check();
+                    simple_render('other_simple_render');
+                </script>
             ''',
             menu = [['other', load_lang('return')]]
         ))

route/recent_history_add.py

@@ -34,7 +34,6 @@ def recent_history_add(name = 'Test'):
                 imp = [load_lang('history_add'), wiki_set(), wiki_custom(), wiki_css(['(' + name + ')', 0])],
                 data = '''
                     <form method="post">
-                        <script>do_stop_exit();</script>
                         ''' + edit_button() + '''
                         <textarea rows="25" id="content" name="content"></textarea>
                         <hr class="main_hr">
@@ -47,6 +46,7 @@ def recent_history_add(name = 'Test'):
                     </form>
                     <hr class="main_hr">
                     <div id="see_preview"></div>
+                    <script>do_stop_exit();</script>
                 ''',
                 menu = [['history/' + url_pas(name), load_lang('return')]]
             ))

route/tool/func.py

@@ -1042,6 +1042,7 @@ def wiki_css(data):
     # Func JS
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
     
+    data_css += '<script defer src="/views/main_css/js/func/version.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/func/http_warning_text.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/func/ie_end_of_life.js?ver=' + data_css_ver + '"></script>'
     data_css += '<script src="/views/main_css/js/func/shortcut.js?ver=' + data_css_ver + '"></script>'

route/topic.py

@@ -139,7 +139,6 @@ def topic(topic_num = 0):
                     <div id="top_topic"></div>
                     <div id="main_topic"></div>
                     <div id="plus_topic"></div>
-                    <script>opennamu_do_thread_make("''' + topic_num + '''");</script>
                     <a href="/thread/''' + topic_num + '/tool">(' + load_lang('topic_tool') + ''')</a>
                     <hr class="main_hr">
                     <form style="''' + display + '''" method="post">
@@ -154,6 +153,7 @@ def topic(topic_num = 0):
                     </form>
                     <hr class="main_hr">
                     <div id="see_preview"></div>
+                    <script>opennamu_do_thread_make("''' + topic_num + '''");</script>
                 ''',
                 menu = [['topic/' + url_pas(name), load_lang('list')]]
             ))

route/user_info.py

@@ -62,7 +62,6 @@ def user_info(name = ''):
             data = '''
                 <h2>''' + load_lang('state') + '''</h2>
                 <div id="get_user_info"></div>
-                <script>load_user_info("''' + ip + '''");</script>
                 ''' + login_menu + '''
                 ''' + tool_menu + '''
                 <h2>''' + load_lang('other') + '''</h2>
@@ -73,6 +72,7 @@ def user_info(name = ''):
                     <li><a href="/count/''' + url_pas(ip) + '''">''' + load_lang('count') + '''</a></li>
                 </ul>
                 ''' + admin_menu + '''
+                <script>load_user_info("''' + ip + '''");</script>
             ''',
             menu = 0
         ))

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev28)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev29)",
         "c_ver" : "3500113",
         "s_ver" : "3500110"
     }

views/main_css/file/easter_egg.html

@@ -1,37 +0,0 @@
-<div id="easter_egg"></div>
-<script>
-    let random_code = [
-        'DzjjcMNrTHU', // 상해홍차관
-        'xpg2Ag-xt_c', // 죽취비상
-        'IKIoAlhQV-c', // 유령악단
-        'MLOvyLsYJvo', // 플라워링 나이트
-        'Fsppuynb440', // 우상에 세계를 맡기고
-        'DbTIoBK9Wvo', // 고향별이 비치는 바다
-        'nytZOF0hp_c', // 오늘 밤은 표일한 에고이스트
-        'I9GiwMcg424', // 브와르 마법 도서관
-        '8NQSBvzjWZk', // 배드애플
-        'uiqEO6BK7BM', // 달까지 닿아라 불사의 연기
-        'np7BG71YTIY', // 라스트 리모드
-        '8gaqt1AOyck', // 쇄월
-        'EsnW_hyI-V8', // 디자이어 드라이브
-        'es9twrnfZ_Q', // 유심지의 유정천
-    ];
-    let get_num = location.search.replace(/[^0-9]+/g, '');
-    if(get_num !== '' && Number(get_num) < random_code.length) {
-        get_num = Number(get_num);
-    } else {
-        get_num = Math.floor(Math.random() * random_code.length);
-    }
-
-    let add_link = '';
-    for(let i = 0; i < random_code.length; i++) {
-        add_link += '<a href="?select=' + String(i) + '">(' + String(i) + ')</a> ';
-    }
-
-    document.getElementById('easter_egg').innerHTML = '' +
-        add_link +
-        '<hr class="main_hr">' +
-        '<iframe     style="width: 560px; height: 315px;" ' +
-                    'src="https://www.youtube.com/embed/' + random_code[get_num] + '" allowfullscreen></iframe>' +
-        '';
-</script>

views/main_css/js/func/version.js

@@ -0,0 +1,37 @@
+"use strict";
+
+function opennamu_do_insert_version(
+	dom_name_version_now, 
+    dom_name_version_new
+) {
+    let url = "/api/version";
+    let xhr = new XMLHttpRequest();
+    xhr.open("GET", url);
+    xhr.send();
+
+    xhr.onreadystatechange = function() {
+        if(this.readyState === 4 && this.status === 200) {
+            let get_data = JSON.parse(this.responseText);
+            document.getElementById(dom_name_version_now).innerHTML += get_data['version'];
+            
+            let url_2 = 'https://raw.githubusercontent.com/openNAMU/openNAMU/' + get_data['build'] + '/version.json';
+            let xhr_2 = new XMLHttpRequest();
+            xhr_2.open("GET", url_2);
+            xhr_2.send();
+            
+            xhr_2.onreadystatechange = function() {
+                if(this.readyState === 4 && this.status === 200) {
+                    document.getElementById(dom_name_version_new).innerHTML += JSON.parse(this.responseText)['beta']['r_ver'];
+                }
+            }
+        }
+    }
+}
+
+let opennamu_do_insert_version_url = [
+    '/manager/1',
+    '/update'
+];
+if(opennamu_do_insert_version_url.includes(window.location.pathname)) {
+    opennamu_do_insert_version('ver_send_2', 'ver_send');
+}

views/main_css/js/load_something.js

@@ -12,32 +12,6 @@ function load_user_info(name) {
     }
 }
 
-function load_ver() {
-    var url = "/api/version";
-    var xhr = new XMLHttpRequest();
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    xhr.onreadystatechange = function() {
-        if(this.readyState === 4 && this.status === 200) {
-            let get_data = JSON.parse(this.responseText);
-            document.getElementById('ver_send_2').innerHTML = get_data['version'];
-            
-            let url_2 = 'https://raw.githubusercontent.com/openNAMU/openNAMU/' + get_data['build'] + '/version.json';
-            var xhr_2 = new XMLHttpRequest();
-            xhr_2.open("GET", url_2, true);
-            xhr_2.send();
-            
-            xhr_2.onreadystatechange = function() {
-                if(this.readyState === 4 && this.status === 200) {
-                    document.getElementById('ver_send').innerHTML += JSON.parse(this.responseText)['beta']['r_ver'];
-                    document.getElementById('ver_send').style.display = "list-item";
-                }
-            }
-        }
-    }
-}
-
 function do_skin_ver_check() {
     var url = "/api/skin_info?all=true";
     var xhr = new XMLHttpRequest();

views/tenshi/index.html

@@ -11,7 +11,6 @@
         <link rel="stylesheet" href="/views/tenshi/css/main.css?ver=20">
         <script src="/views/tenshi/js/skin_set.js?ver=8"></script>
         <script src="/views/tenshi/js/main.js?ver=3"></script>
-        <script>main_load(); window.addEventListener('DOMContentLoaded', skin_set);</script>
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">
         {{imp[1][5]|safe}}
@@ -218,5 +217,6 @@
                 </a>
             </div>
         </div>
+        <script>main_load(); window.addEventListener('DOMContentLoaded', skin_set);</script>
     </body>
 </html>