Startsida Utforska Hjälp
Logga in
wiki
/
openNAMU__openNAMU
spegling av https://github.com/openNAMU/openNAMU.git
2
0
Fork 0
Filer Ärenden 0 Wiki
Bläddra i källkod

cut_100 폐지하고 새로운 스킨 변수 추가

잉여개발기 (SPDV) 2 år sedan
förälder
27470b183a
incheckning
6c77e05a04
4 ändrade filer med 11 tillägg och 29 borttagningar
Delad Vy Visa Diff Statistik
  1. 3 21
      route/tool/func.py
  2. 4 2
      route/view_w.py
  3. 3 3
      version.json
  4. 1 3
      views/ringo/index.html

+ 3 - 21
route/tool/func.py
Visa fil 

@@ -1075,7 +1075,7 @@ def wiki_css(data):
 
     global global_wiki_set
 
 
     # without_DB
 
-    data += ['' for _ in range(0, 3 - len(data))]
 
+    data += ['' for _ in range(0, 4 - len(data))]
 
     
     data_css = ''
 
     data_css_dark = ''
 
@@ -1128,30 +1128,12 @@ def wiki_css(data):
 
 
         global_wiki_set['dark_main_css'] = data_css_dark
 
 
-    data = data[0:2] + ['', data_css] + data[2:] + [data_css_dark]
 
+    data = data[0:2] + ['', data_css] + data[2:3] + [data_css_dark] + data[3:]
 
 
     return data
 
 
 def cut_100(data):
 
-    # without_DB
 
-    if re.search(r'<div class="opennamu_render_complete">', data):
 
-        data = re.sub(r'(.|\r|\n)*<div class="opennamu_render_complete">', '', data, 1)
 
-
 
-        data = data.replace('<br>', ' ')
 
-        data = data.replace('\r', '') 
-        data = data.replace('\n', ' ')
 
-        data = re.sub(r'<[^<>]+>', ' ', data)
 
-        data = data.replace('\n', ' ')
 
-        data = re.sub(r' {2,}', ' ', data)
 
-        data = re.sub(r'(^ +| +$)', '', data)
 
-
 
-        data_len = len(data)
 
-        if data_len > 100:
 
-            return data[0:100]
 
-        else:
 
-            return data[0:data_len]
 
-    else:
 
-        return ''
 
+    return ''
 
 
 def wiki_set(conn):
 
     curs = conn.cursor()

+ 4 - 2
route/view_w.py
Visa fil 

@@ -181,9 +181,10 @@ def view_w(name = 'Test', do_type = ''):
 
             </div>
 
         '''
 
 
-        curs.execute(db_change("select title from data where title = ?"), [name])
 
+        curs.execute(db_change("select data from data where title = ?"), [name])
 
         data = curs.fetchall()
 
 
+        description = ''
 
         if acl_check(conn, name, 'render') == 1:
 
             response_data = 401
 
 
@@ -208,6 +209,7 @@ def view_w(name = 'Test', do_type = ''):
 
             history_color = 1 if db_data else 0
 
         else:
 
             response_data = 200
 
+            description = data[0][0].replace('\r', '').replace('\n', ' ')
 
 
         curs.execute(db_change("select title from acl where title = ?"), [name])
 
         acl = 1 if curs.fetchall() else 0
 
@@ -333,7 +335,7 @@ def view_w(name = 'Test', do_type = ''):
 
         menu += [['doc_watch_list/1/' + url_pas(name), get_lang(conn, 'watchlist')]]
 
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
 
-            imp = [name_view, wiki_set(conn), wiki_custom(conn), wiki_css([sub, r_date, watch_list])],
 
+            imp = [name_view, wiki_set(conn), wiki_custom(conn), wiki_css([sub, r_date, watch_list, description])],
 
             data = div,
 
             menu = menu
 
         )), response_data

+ 3 - 3
version.json
Visa fil 

@@ -1,7 +1,7 @@
 
 {
 
     "beta" : {
 
-        "r_ver" : "v3.5.0-dev98",
 
-        "c_ver" : "3500379",
 
-        "s_ver" : "3500113"
 
+        "r_ver" : "v3.5.0-dev99",
 
+        "c_ver" : "20240426",
 
+        "s_ver" : "20240426"
 
     }
 
 }

+ 1 - 3
views/ringo/index.html
Visa fil 

@@ -28,9 +28,7 @@
 
             <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][0] == 'w' %}

-            <meta name="description" content="{{data|cut_100}}">

-        {% endif %}

+        <meta name="description" content="{{imp[3][6]}}">

         <meta name="viewport" content="width=device-width, initial-scale=1">

     </head>

     <body>