2du 4 lat temu
rodzic
commit
2862a173fa

+ 1 - 0
route/main_manager.py

@@ -54,6 +54,7 @@ def main_manager_2(conn, num):
                         <li><a href="/name_filter">''' + load_lang('id_filter_list') + '''</a></li>
                         <li><a href="/file_filter">''' + load_lang('file_filter_list') + '''</a></li>
                         <li><a href="/extension_filter">''' + load_lang('extension_filter_list') + '''</a></li>
+                        <li><a href="/doc_filter">''' + load_lang('doc_filter_list') + '''</a></li>
                     </ul>
                     <h3>2.2. ''' + load_lang('server') + '''</h2>
                     <ul class="inside_ul">

+ 1 - 1
route/tool/func.py

@@ -84,7 +84,7 @@ global_wiki_set = {}
 
 global_db_set = ''
 
-data_css_ver = '116'
+data_css_ver = '117'
 data_css = ''
 
 conn = ''

+ 16 - 0
route/tool/func_mark.py

@@ -134,6 +134,22 @@ def render_do(doc_name, doc_data, data_type, data_in):
                 ''',
                 []
             ]
+        elif rep_data == 'markdown':
+            data_in = (data_in + '_') if data_in else ''
+            data_end = [
+                '<pre style="display: none;" id="' + data_in + 'render_content_set">' + html.escape(wiki_set_data) + '</pre>' + \
+                '<pre style="display: none;" id="' + data_in + 'render_content_load">' + html.escape(doc_data) + '</pre>' + \
+                '<div class="render_content" id="' + data_in + 'render_content"></div>', 
+                '''
+                    do_onmark_render(
+                        test_mode = "normal", 
+                        name_id = "''' + data_in + '''render_content",
+                        name_include = "''' + data_in + '''",
+                        name_doc = "''' + doc_name.replace('"', '//"') + '''"
+                    );
+                ''',
+                []
+            ]
         else:
             data_end = [
                 doc_data, 

+ 2 - 2
views/main_css/js/load_skin_set.js

@@ -153,8 +153,8 @@ function main_css_skin_load() {
     }
     
     if(
-        document.cookie.match(regex_data('main_css_darkmode')) &&
-        document.cookie.match(regex_data('main_css_darkmode'))[1] === '1'
+        document.cookie.match(main_css_regex_data('main_css_darkmode')) &&
+        document.cookie.match(main_css_regex_data('main_css_darkmode'))[1] === '1'
     ) {
         head_data.innerHTML += '' +
             '<link rel="stylesheet" href="/views/main_css/css/sub/dark.css?ver=5">' +

+ 186 - 0
views/ringo/css/main.css

@@ -0,0 +1,186 @@
+body {
+    margin: 0;
+}
+
+html {
+    background: #eee;
+}
+
+header#main {
+    border-bottom: 0;
+    
+    line-height: 50px;
+    
+    padding-left: 20px;
+    padding-right: 20px;
+    
+    background-color: #99ddff;
+}
+
+header#main a {
+    color: black;
+}
+
+header#main span#right {
+    float: right;
+}
+
+header#main form.not_mobile input.search {
+    display: inline-block;
+    
+    width: 200px;
+}
+
+header#main form.not_mobile {
+    display: inline-block;
+}
+
+input.search {
+    height: 35px;
+    
+    vertical-align: middle;
+    
+    margin-top: -5px;
+    
+    border: 0;
+    
+    padding: 10px;
+}
+
+input.only_mobile.search {
+    width: calc(100% - 70px);
+    
+    display: inline-block;
+}
+
+input.search:focus-visible {
+    outline: none;
+}
+
+button.search_button {
+    width: 35px;
+    height: 35px;
+    
+    vertical-align: middle;
+    
+    margin-top: -5px;
+    margin-left: -5px;
+    
+    border: 0;
+    
+    font-size: 20px;
+    
+    line-height: 0px;
+}
+
+button.search_button#goto {
+    background-color: #ccffbb;
+}
+
+button.search_button#search {
+    background-color: #ffeecc;
+}
+
+aside {
+    width: 250px;
+    
+    float: left;
+    
+    display: inline-block;
+    
+    padding-top: 10px;
+    padding-left: 20px;
+    padding-right: 20px;
+    
+    background-color: #ffeaee;
+    
+    height: calc(100vh - (50px + 20px));
+}
+
+aside button {
+    width: 25%;
+}
+
+section {
+    width: calc(100% - (250px + 40px));
+    
+    display: inline-block;
+    
+    border-left: 0px solid;
+    
+    background-color: white;
+}
+
+header#section {
+    padding-top: 11px;
+    padding-bottom: 11px;
+    
+    border-bottom: 0px solid;
+    
+    background-color: #cceeff;
+}
+
+article.main {
+    max-width: 1000px;
+    
+    padding-left: 20px;
+    padding-right: 20px;
+    
+    margin: auto;
+}
+
+article.main#content {
+    padding-top: 20px;
+    
+    min-height: 400px;
+}
+
+article.main#title h1 {
+    margin: 0;
+}
+
+.only_mobile, header#main form.only_mobile {
+    display: none;
+}
+
+@media screen and (max-width: 1000px) {    
+    aside {        
+        float: none;
+        
+        border-top: 0px solid;
+        
+        width: calc(100vw - 40px);
+        height: 100%;
+        
+        padding: 20px;
+    }
+    
+    section {
+        width: 100vw;
+        
+        padding-bottom: 20px;
+        
+        border-left: 0;
+    }
+    
+    .not_mobile, header#main form.not_mobile {
+        display: none;
+    }
+    
+    .only_mobile, header#main form.only_mobile {
+        display: block;
+    }
+}
+
+footer {
+    border-top: 0px solid;
+    
+    margin-top: 20px;
+    background: #eee;
+    
+    padding: 20px;
+}
+
+footer.only_mobile {
+    margin-top: 0px;
+}

+ 107 - 0
views/ringo/index.html

@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        {% if imp[3][0] != 0 %}
+            <title>{{imp[0]}} {{imp[3][0]}} - {{imp[1][0]}}</title>
+        {% else %}
+            <title>{{imp[0]}} - {{imp[1][0]}}</title>
+        {% endif %}
+        {{imp[3][3]|safe}}
+        <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
+        <link rel="stylesheet" href="/views/ringo/css/main.css?ver=1">
+        <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">
+        {{imp[1][5]|safe}}
+        {{imp[2][3]|safe}}
+        {% if imp[3][0] != 0 %}
+            <meta name="title" content="{{imp[0]}}{{imp[3][0]}} - {{imp[1][0]}}">
+        {% else %}
+            <meta name="title" content="{{imp[0]}} - {{imp[1][0]}}">
+        {% endif %}
+        <meta name="keywords" content="{{imp[0]}}">
+        {% if imp[2][12] != 0 and imp[2][12] == 'w' %}
+            <meta name="description" content="{{data|cut_100}}">
+        {% endif %}
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+    </head>
+    <body>
+        <header id="main">
+            <span id="left">
+                <span id="logo"><a href="/">{{imp[1][4]|safe}}</a></span>
+            </span>
+            <span id="right">
+                <span class="top_cel" id="">
+                    <span class="iconify" data-icon="ic:baseline-access-time" data-inline="true"></span>
+                    <span class="not_mobile">{{'list'|load_lang}}</span>
+                    <span class="iconify" data-icon="ic:baseline-arrow-drop-down" data-inline="true"></span>
+                </span>
+                <span class="top_cel" id="">
+                    <span class="iconify" data-icon="ic:baseline-archive" data-inline="true"></span>
+                    <span class="not_mobile">{{'tool'|load_lang}}</span>
+                    <span class="iconify" data-icon="ic:baseline-arrow-drop-down" data-inline="true"></span>
+                </span>
+                <span class="top_cel" id="">
+                    {% if imp[2][2] == 1 %}
+                        {% if imp[2][8] != '0' %}
+                            <span class="iconify" data-icon="ic:baseline-add-alert" data-inline="true"></span>
+                        {% else %}
+                            <span class="iconify" data-icon="ic:baseline-person-add" data-inline="true"></span>
+                        {% endif %}
+                    {% else %}
+                        <span class="iconify" data-icon="ic:baseline-person" data-inline="true"></span>
+                    {% endif %}
+                    <span class="not_mobile">{{'tool'|load_lang}}</span>
+                    <span class="iconify" data-icon="ic:baseline-arrow-drop-down" data-inline="true"></span>
+                </span>
+                <form class="not_mobile" method="post" action="/search" role="search">
+                    <input class="not_mobile search" name="search" placeholder="{{'search'|load_lang}}" autocomplete="off" type="search">
+                    <button type="submit" id="goto" formaction="/goto" class="search_button">
+                        <span class="iconify" data-icon="ic:round-find-in-page" data-inline="true"></span>
+                    </button>
+                    <button type="submit" id="search" formaction="/search" class="search_button">
+                        <span class="iconify" data-icon="ic:baseline-search" data-inline="true"></span>
+                    </button>
+                </form>
+            </span>
+            <form class="only_mobile" method="post" action="/search" role="search">
+                <input class="only_mobile search" name="search" placeholder="{{'search'|load_lang}}" autocomplete="off" type="search">
+                <button type="submit" id="goto" formaction="/goto" class="search_button">
+                    <span class="iconify" data-icon="ic:round-find-in-page" data-inline="true"></span>
+                </button>
+                <button type="submit" id="search" formaction="/search" class="search_button">
+                    <span class="iconify" data-icon="ic:baseline-search" data-inline="true"></span>
+                </button>
+            </form>
+        </header>
+        <section>
+            <header id="section">
+                <article class="main" id="title">
+                    <h1><span class="change_space">{{imp[0]}}</span></h1>
+                </article>
+            </header>
+            <article class="main" id="content">
+                {{data|safe}}
+            </article>
+            <footer class="not_mobile">
+                <article class="main" id="footer">
+                    {{imp[1][1]|safe}}
+                    <br>
+                    <br>
+                    <a href="https://github.com/openNAMU/openNAMU"><img id="b_logo" src="/views/main_css/file/s_logo.png"></a>
+                </article>
+            </footer>
+        </section>
+        <aside>
+            <button class="side_button selected">A</button><!--
+         --><button class="side_button">B</button><!--
+         --><button class="side_button">C</button><!--
+         --><button class="side_button">D</button>
+        </aside>
+        <footer class="only_mobile">
+            {{imp[1][1]|safe}}
+            <br>
+            <br>
+            <a href="https://github.com/openNAMU/openNAMU"><img id="b_logo" src="/views/main_css/file/s_logo.png"></a>
+        </footer>
+    </body>
+</html>

+ 1 - 1
views/tenshi/index.html

@@ -112,7 +112,7 @@
                             </div>
                         </div>
-                        <form method="post" action="/search" id="search" role="search">
+                        <form method="post" id="not_mobile_form" action="/search" id="search" role="search">
                             <input id="search_input" name="search" placeholder="{{'search'|load_lang}}" autocomplete="off" type="search">
                             |
                             <button type="submit" formaction="/goto">