구글 아이콘이 나은 듯, cut_100 수정

route/tool/func.py

@@ -417,7 +417,13 @@ def other2(data):
     return data
 
 def cut_100(data):
-    return re.sub('<(((?!>).)*)>', '', data)[0:100] + '...'
+    data = re.sub('<(((?!>).)*)>', ' ', data)
+    data = re.sub('\n', ' ', data)
+    data = re.sub('^ +', '', data)
+    data = re.sub(' +$', '', data)
+    data = re.sub(' {2,}', ' ', data)
+
+    return data[0:100] + '...'
 
 def wiki_set(num = 1):
     if num == 1:

views/marisa/index.html

@@ -14,7 +14,7 @@
         {{imp[1][5]|safe}}
         {{imp[2][3]|safe}}
         <meta name="title" content="{{imp[0]}} - {{imp[1][0]}}">
-        <meta name="keywords" content="{{imp[1][0]}}">
+        <meta name="keywords" content="{{imp[0]}}">
         <meta name="description" content="{{data|cut_100}}">
         <meta name="viewport" content="width=device-width, initial-scale=1">
     </head>
@@ -28,18 +28,18 @@
                     <div id="top_tool" class="not_mobile">
                         <div id="top_tool_cel">
                             <a href="javascript:void(0);" onclick="opening('recent_cel');">
-                                <span class="iconify" data-icon="octicon:clock" data-inline="true"></span>
+                                <span class="iconify" data-icon="ic:baseline-access-time" data-inline="true"></span>
                                 {{'recent'|load_lang}}
-                                <span class="iconify" data-icon="octicon:chevron-down" data-inline="true"></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;">
                                 <a href="/recent_changes">
-                                    <span class="iconify" data-icon="octicon:sync" data-inline="true"></span>
+                                    <span class="iconify" data-icon="ic:baseline-autorenew" data-inline="true"></span>
                                     {{'edit'|load_lang}}
                                 </a>
                                 <hr>
                                 <a href="/recent_discuss">
-                                    <span class="iconify" data-icon="octicon:comment" data-inline="true"></span>
+                                    <span class="iconify" data-icon="ic:baseline-add-comment" data-inline="true"></span>
                                     {{'discussion'|load_lang}}
                                 </a>
                             </div>
@@ -47,23 +47,23 @@
                          
                         <div id="top_tool_cel">
                             <a href="javascript:void(0);" onclick="opening('other_cel');">
-                                <span class="iconify" data-icon="octicon:package" data-inline="true"></span>
+                                <span class="iconify" data-icon="ic:baseline-archive" data-inline="true"></span>
                                 {{'other'|load_lang}}
-                                <span class="iconify" data-icon="octicon:chevron-down" data-inline="true"></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;">
                                 <a href="/random">
-                                    <span class="iconify" data-icon="octicon:repo-push" data-inline="true"></span>
+                                    <span class="iconify" data-icon="ic:baseline-shuffle" data-inline="true"></span>
                                     {{'random'|load_lang}}
                                 </a>
                                 <hr>
                                 <a href="/other">
-                                    <span class="iconify" data-icon="octicon:tools" data-inline="true"></span>
+                                    <span class="iconify" data-icon="ic:baseline-build" data-inline="true"></span>
                                     {{'tool'|load_lang}}
                                 </a>
                                 <hr>
                                 <a href="/skin_set">
-                                    <span class="iconify" data-icon="octicon:settings" data-inline="true"></span>
+                                    <span class="iconify" data-icon="ic:baseline-settings" data-inline="true"></span>
                                     {{'skin_setting'|load_lang}}
                                 </a>
                             </div>
@@ -73,12 +73,12 @@
                             <a href="/user">
                                 {% if imp[2][2] == 1 %}
                                     {% if imp[2][8] != '0' %}
-                                        <span class="iconify" data-icon="octicon:megaphone" data-inline="true"></span>
+                                        <span class="iconify" data-icon="ic:baseline-add-alert" data-inline="true"></span>
                                     {% else %}
-                                        <span class="iconify" data-icon="octicon:person" data-inline="true"></span>
+                                        <span class="iconify" data-icon="ic:baseline-person-add" data-inline="true"></span>
                                     {% endif %}
                                 {% else %}
-                                    <span class="iconify" data-icon="octicon:x" data-inline="true"></span>
+                                    <span class="iconify" data-icon="ic:baseline-person" data-inline="true"></span>
                                 {% endif %}
                                 {{imp[2][5]}}
                             </a>
@@ -88,18 +88,18 @@
                             <input id="search_input" name="search" placeholder="{{'search'|load_lang}}" autocomplete="off" type="search">
                             |
                             <button type="submit" formaction="/goto">
-                                <span class="iconify" data-icon="octicon:clippy" data-inline="true"></span>
+                                <span class="iconify" data-icon="ic:round-find-in-page" data-inline="true"></span>
                             </button>
                             |
                             <button type="submit" formaction="/search">
-                                <span class="iconify" data-icon="octicon:search" data-inline="true"></span>
+                                <span class="iconify" data-icon="ic:baseline-search" data-inline="true"></span>
                             </button>
                             <div id="pre_search" style="display: none;"></div>
                         </form>
                     </div>
                     <div id="top_tool_mobile" class="is_mobile">
                         <a href="javascript:void(0);" onclick="opening('mobile_menu');">
-                            <span class="iconify" data-icon="octicon:repo-push" data-inline="true"></span> {{'tool'|load_lang}}
+                            <span class="iconify" data-icon="ic:baseline-reorder" data-inline="true"></span> {{'tool'|load_lang}}
                         </a>
                     </div>
                 </div>
@@ -110,15 +110,15 @@
                         <input id="mobile_search_input" name="search" placeholder="{{'search'|load_lang}}" autocomplete="off" type="search">
                         <br>
                         <button id="mobile_button_first" type="submit" formaction="/goto">
-                            <span class="iconify" data-icon="octicon:clippy" data-inline="true"></span>
+                            <span class="iconify" data-icon="ic:round-find-in-page" data-inline="true"></span>
                         </button>
                         |
                         <button type="submit" formaction="/search">
-                            <span class="iconify" data-icon="octicon:search" data-inline="true"></span>
+                            <span class="iconify" data-icon="ic:baseline-search" data-inline="true"></span>
                         </button>
                         |
                         <a href="javascript:void(0);" onclick="opening('mobile_menu');">
-                            <span class="iconify" data-icon="octicon:repo-pull" data-inline="true"></span>
+                            <span class="iconify" data-icon="ic:baseline-reorder" data-inline="true"></span>
                         </a>
                     </form>
                     <h2>{{'recent'|load_lang}}</h2>
@@ -194,17 +194,17 @@
         <div id="nav_bar">
             <div id="go_top">
                 <a href="#top">
-                    <span class="iconify" data-icon="octicon:arrow-up" data-inline="true"></span>
+                    <span class="iconify" data-icon="ic:baseline-arrow-upward" data-inline="true"></span>
                 </a>                  
             </div>
             <div id="go_bottom">
                 <a href="#bottom">
-                    <span class="iconify" data-icon="octicon:arrow-down" data-inline="true"></span>
+                    <span class="iconify" data-icon="ic:baseline-arrow-downward" data-inline="true"></span>
                 </a>
             </div>
             <div id="go_toc">
                 <a href="#toc">
-                    <span class="iconify" data-icon="octicon:list-unordered" data-inline="true"></span>
+                    <span class="iconify" data-icon="ic:baseline-list" data-inline="true"></span>
                 </a>
             </div>                                    
         </div>

views/marisa/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Marisa",
-    "skin_ver" : "v1.0.9",
+    "skin_ver" : "v1.1.0",
     "require_ver" : "3"
 }