잉여개발기 (SPDV) 3 лет назад
Родитель
Сommit
0115c5f254

+ 1 - 0
views/ringo/index.html

@@ -15,6 +15,7 @@
         <script src="/views/ringo/js/skin_set.js?ver=1"></script>
         <link rel="stylesheet" href="/views/ringo/css/main.css?ver=2">
         {% if request.cookies.get('main_css_darkmode', '') == '1' %}
+            <link rel="stylesheet" href="/views/main_css/css/sub/dark.css?ver=1">
             <link rel="stylesheet" href="/views/ringo/css/dark.css?ver=1">
         {% endif %}
         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">

+ 1 - 1
views/ringo/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Ringo",
-    "skin_ver" : "v1.0.0",
+    "skin_ver" : "v1.0.1",
     "require_ver" : "3500111"
 }

+ 4 - 4
views/ringo/js/skin_set.js

@@ -5,17 +5,17 @@ function ringo_do_regex_data(data) {
 function ringo_get_post() {
     check = document.getElementById('invert');
     if(check.checked === true) {
-        document.cookie = 'main_css_darkmode=1;';
+        document.cookie = 'main_css_darkmode=1; path=/';
     } else {
-        document.cookie = 'main_css_darkmode=0;';
+        document.cookie = 'main_css_darkmode=0; path=/';
     }
 
     history.go(0);
 }
 
-let cookies = document.cookie;
-
 function ringo_do_skin_set() {
+    let cookies = document.cookie;
+    
     if(window.location.pathname === '/change/skin_set') {
         let set_language = {
             "en-US" : {

+ 26 - 8
views/tenshi/index.html

@@ -10,10 +10,11 @@
         {{imp[3][3]|safe}}
         <link rel="stylesheet" href="/views/tenshi/css/main.css?ver=20">
         {% if request.cookies.get('main_css_darkmode', '') == '1' %}
+            <link rel="stylesheet" href="/views/main_css/css/sub/dark.css?ver=1">
             <link rel="stylesheet" href="/views/tenshi/css/dark.css?ver=9">
         {% endif %}
-        <script src="/views/tenshi/js/skin_set.js?ver=9"></script>
-        <script src="/views/tenshi/js/main.js?ver=3"></script>
+        <script src="/views/tenshi/js/skin_set.js?ver=10"></script>
+        <script src="/views/tenshi/js/main.js?ver=4"></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}}
@@ -39,12 +40,12 @@
                     <div id="top_tool">
                         <div id="top_tool_group">
                             <div id="top_tool_cel">
-                                <a href="javascript:opening('recent_cel');" class="top_in_cel">
+                                <a href="javascript:ringo_opening('recent_cel_in');" class="top_in_cel">
                                     <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>
                                 </a>
-                                <div id="recent_cel" class="cel_in_cel" style="display: none;">
+                                <div id="recent_cel_in" class="cel_in_cel" style="display: none;">
                                     <a href="/recent_changes">
                                         <span class="iconify" data-icon="ic:baseline-autorenew" data-inline="true"></span>
                                         {{'recent_change'|load_lang}}
@@ -63,12 +64,12 @@
                             </div>
                             <div id="top_tool_cel">
-                                <a href="javascript:opening('other_cel');" class="top_in_cel">
+                                <a href="javascript:ringo_opening('other_cel_in');" class="top_in_cel">
                                     <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>
                                 </a>
-                                <div id="other_cel" class="cel_in_cel" style="display: none;">
+                                <div id="other_cel_in" class="cel_in_cel" style="display: none;">
                                     <a href="/random">
                                         <span class="iconify" data-icon="ic:baseline-shuffle" data-inline="true"></span>
                                         {{'random'|load_lang}}
@@ -91,12 +92,30 @@
                                         {{'upload'|load_lang}}
                                     </a>
                                     <hr>
-                                    <a href="/skin_set">
+                                    <a href="/change/skin_set">
                                         <span class="iconify" data-icon="ic:baseline-settings" data-inline="true"></span>
                                         {{'skin_setting'|load_lang}}
                                     </a>
                                 </div>
                             </div>
+                            {% if imp[1][6] != '' %}
+                                 
+                                <div id="top_tool_cel">
+                                    <a href="javascript:ringo_opening('add_cel_in');" class="top_in_cel">
+                                        <span class="iconify" data-icon="ic:baseline-playlist-add" data-inline="true"></span>
+                                        <span class="not_mobile">{{'added_menu'|load_lang}}</span>
+                                        <span class="iconify" data-icon="ic:baseline-arrow-drop-down" data-inline="true"></span>
+                                    </a>
+                                    <div id="add_cel_in" class="cel_in_cel" style="display: none;">
+                                        {% for added_top_menu in imp[1][6] %}
+                                            <a href="{{added_top_menu[1]}}">
+                                                <span class="iconify" data-icon="ic:baseline-plus" data-inline="true"></span>
+                                                {{added_top_menu[0]}}
+                                            </a>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
                             <div id="top_tool_cel" id="top_in_user">
                                 <a href="/user" class="top_in_cel">
@@ -220,6 +239,5 @@
                 </a>
             </div>
         </div>
-        <script>window.addEventListener('DOMContentLoaded', skin_set);</script>
     </body>
 </html>

+ 1 - 1
views/tenshi/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Tenshi",
-    "skin_ver" : "v2.0.3",
+    "skin_ver" : "v2.0.4",
     "require_ver" : "3500110"
 }

+ 40 - 20
views/tenshi/js/main.js

@@ -1,29 +1,49 @@
-var save_data = '';
-var open = 0;
-
-function opening(data) {
-    save_data = data;
-    if(data === 'recent_cel') {
-        var element = document.getElementById(data);
-        var element_2 = document.getElementById('other_cel');
-    } else {
-        var element = document.getElementById(data);
-        var element_2 = document.getElementById('recent_cel');
+let ringo_save_data = '';
+let ringo_open = 0;
+let ringo_menu_list = [
+    'recent_cel',
+    'other_cel',
+    'add_cel'
+];
+
+function ringo_opening(data) {
+    let element = [data];
+    
+    for(for_a in ringo_menu_list) {
+        if(ringo_menu_list[for_a] + '_in' !== data) {
+            element.push(ringo_menu_list[for_a] + '_in');
+        }
     }
 
-    if(element.style.display == 'none') {
-        element.style.display = 'block';
-        element_2.style.display = 'none';
+    if((document.getElementById(element[0]).style.display == 'none' && ringo_open == 0) || ringo_save_data !== data) {
+        document.getElementById(element[0]).style.display = 'block';
+
+        for(for_a in element) {
+            if(for_a !== '0') { 
+                document.getElementById(element[for_a]).style.display = 'none';
+            }
+        }
+
+        ringo_open = 1;
+        ringo_save_data = data;
+
+        setTimeout(function() { ringo_open = 2; }, 100);
     } else {
-        element.style.display = 'none';
-    }
+        document.getElementById(element[0]).style.display = 'none';
 
-    open = 1;
-    setTimeout(function() { open = 0; }, 100);
+        ringo_open = 0
+    }
 }
 
 document.onclick = function(event) {
-    if(save_data !== '' && open == 0) {
-        document.getElementById(save_data).style.display = 'none';
+    let cel_list = [];
+    for(for_a in ringo_menu_list) {
+        cel_list.push(document.getElementById(ringo_menu_list[for_a]));
+    }
+
+    if(ringo_save_data !== '' && ringo_open == 2) {
+        document.getElementById(ringo_save_data).style.display = 'none';
+
+        setTimeout(function() { ringo_open = 0; }, 100);
     }
 }

+ 17 - 15
views/tenshi/js/skin_set.js

@@ -1,23 +1,23 @@
-function regex_data(data) {
+function ringo_do_regex_data(data) {
     return new RegExp('(?:^|; )' + data + '=([^;]*)');
 }
 
-function get_post() {
+function ringo_get_post() {
     check = document.getElementById('invert');
     if(check.checked === true) {
-        document.cookie = 'main_css_darkmode=1;';
+        document.cookie = 'main_css_darkmode=1; path=/';
     } else {
-        document.cookie = 'main_css_darkmode=0;';
+        document.cookie = 'main_css_darkmode=0; path=/';
     }
 
     history.go(0);
 }
 
-function skin_set() {
+function ringo_do_skin_set() {
     let cookies = document.cookie;
-
-    if(window.location.pathname === '/skin_set') {
-        var set_language = {
+    
+    if(window.location.pathname === '/change/skin_set') {
+        let set_language = {
             "en-US" : {
                 "save" : "Save",
                 "darkmode" : "Darkmode"
@@ -27,8 +27,8 @@ function skin_set() {
             }
         }
 
-        var language = cookies.match(regex_data('language'))[1];
-        var user_language = cookies.match(regex_data('user_language'))[1];
+        let language = cookies.match(ringo_do_regex_data('language'))[1];
+        let user_language = cookies.match(ringo_do_regex_data('user_language'))[1];
         if(user_language in set_language) {
             language = user_language;
         }
@@ -37,11 +37,11 @@ function skin_set() {
             language = "en-US";
         }
 
-        var set_data = {};
+        let set_data = {};
 
         if(
-            cookies.match(regex_data('main_css_darkmode')) &&
-            cookies.match(regex_data('main_css_darkmode'))[1] === '1'
+            cookies.match(ringo_do_regex_data('main_css_darkmode')) &&
+            cookies.match(ringo_do_regex_data('main_css_darkmode'))[1] === '1'
         ) {
             set_data["invert"] = "checked";
         }
@@ -49,7 +49,9 @@ function skin_set() {
         document.getElementById("main_skin_set").innerHTML = ' \
             <input ' + set_data["invert"] + ' type="checkbox" id="invert" name="invert" value="invert"> ' + set_language[language]['darkmode'] + ' \
             <hr class="main_hr"> \
-            <button onclick="get_post();">' + set_language[language]['save'] + '</button> \
+            <button onclick="ringo_get_post();">' + set_language[language]['save'] + '</button> \
         ';
     }
-}
+}
+
+window.addEventListener('DOMContentLoaded', ringo_do_skin_set);