Browse Source

공백 제거 후 스킨에게 맡김

Surplus_Up (2DU) 6 years ago
parent
commit
ef48112326

+ 1 - 1
route/edit.py

@@ -195,7 +195,7 @@ def edit_2(conn, name):
         data_old = re.sub(r'\n+$', '', data_old)
 
         return easy_minify(flask.render_template(skin_check(), 
-            imp = [name, wiki_set(), custom(), other2([' (' + sub + ')', 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + sub + ')', 0])],
             data =  get_name + '''
                 <form method="post">
                     <script>

+ 1 - 1
route/edit_delete.py

@@ -60,7 +60,7 @@ def edit_delete_2(conn, name, app_var):
             return redirect('/w/' + url_pas(name))
 
         return easy_minify(flask.render_template(skin_check(),
-            imp = [name, wiki_set(), custom(), other2([' (' + load_lang('delete') + ')', 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('delete') + ')', 0])],
             data =  '''
                     <form method="post">
                         ''' + ip_warring() + '''

+ 1 - 1
route/edit_move.py

@@ -151,7 +151,7 @@ def edit_move_2(conn, name):
             return redirect('/w/' + url_pas(move_title))
     else:
         return easy_minify(flask.render_template(skin_check(),
-            imp = [name, wiki_set(), custom(), other2([' (' + load_lang('move') + ')', 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('move') + ')', 0])],
             data = '''
                 <form method="post">
                     ''' + ip_warring() + '''

+ 1 - 1
route/edit_revert.py

@@ -65,7 +65,7 @@ def edit_revert_2(conn, name):
             return redirect('/w/' + url_pas(name))
 
         return easy_minify(flask.render_template(skin_check(),
-            imp = [name, wiki_set(), custom(), other2([' (' + load_lang('revert') + ')', 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('revert') + ')', 0])],
             data =  '''
                     <form method="post">
                         <span>r''' + flask.request.args.get('num', '0') + '''</span>

+ 1 - 1
route/give_acl.py

@@ -138,7 +138,7 @@ def give_acl_2(conn, name):
                     ''
 
         return easy_minify(flask.render_template(skin_check(),
-            imp = [name, wiki_set(), custom(), other2([' (' + load_lang('acl') + ')', 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('acl') + ')', 0])],
             data = '''
                 <form method="post">
                     <a href="/setting/8">(''' + load_lang('main_acl_setting') + ''')</a>

+ 1 - 1
route/give_admin.py

@@ -54,7 +54,7 @@ def give_admin_2(conn, name):
                     div += '<option value="' + data[0] + '">' + data[0] + '</option>'
 
         return easy_minify(flask.render_template(skin_check(),
-            imp = [name, wiki_set(), custom(), other2([' (' + load_lang('authorize') + ')', 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('authorize') + ')', 0])],
             data =  '''
                     <form method="post">
                         <select name="select">''' + div + '''</select>

+ 1 - 1
route/give_history_add.py

@@ -42,7 +42,7 @@ def give_history_add_2(conn, name):
             p_text = load_lang('default_edit_help')
 
         return easy_minify(flask.render_template(skin_check(),
-            imp = [load_lang('history_add'), wiki_set(), custom(), other2([' (' + name + ')', 0])],
+            imp = [load_lang('history_add'), wiki_set(), custom(), other2(['(' + name + ')', 0])],
             data = '''
                 <form method="post">
                     <script>do_stop_exit();</script>

+ 1 - 1
route/search_deep.py

@@ -65,7 +65,7 @@ def search_deep_2(conn, name):
     div += next_fix('/search/' + url_pas(name) + '?num=', num, all_list)
 
     return easy_minify(flask.render_template(skin_check(),
-        imp = [name, wiki_set(), custom(), other2([' (' + load_lang('search') + ')', 0])],
+        imp = [name, wiki_set(), custom(), other2(['(' + load_lang('search') + ')', 0])],
         data = div,
         menu = 0
     ))

+ 1 - 1
route/setting.py

@@ -398,7 +398,7 @@ def setting_2(conn, num, db_set):
                 sub_plus = ''
 
             return easy_minify(flask.render_template(skin_check(),
-                imp = [load_lang(data = 'main' + title, safe = 1), wiki_set(), custom(), other2([' (HTML)' + sub_plus, 0])],
+                imp = [load_lang(data = 'main' + title, safe = 1), wiki_set(), custom(), other2(['(HTML)' + sub_plus, 0])],
                 data = '''
                     <form method="post">
                         ''' + start + '''

+ 1 - 1
route/topic.py

@@ -140,7 +140,7 @@ def topic_2(conn, topic_num):
         '''
 
         return easy_minify(flask.render_template(skin_check(),
-            imp = [name, wiki_set(), custom(), other2([' (' + load_lang('discussion') + ')', 0])],
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('discussion') + ')', 0])],
             data = '''
                 <h2 id="topic_top_title">''' + sub + '''</h2>
                 ''' + data,

+ 1 - 1
route/topic_admin.py

@@ -56,7 +56,7 @@ def topic_admin_2(conn, topic_num, num):
         '''
 
     return easy_minify(flask.render_template(skin_check(),
-        imp = [load_lang('discussion_tool'), wiki_set(), custom(), other2([' (#' + num + ')', 0])],
+        imp = [load_lang('discussion_tool'), wiki_set(), custom(), other2(['(#' + num + ')', 0])],
         data = ban,
         menu = [['thread/' + topic_num + '#' + num, load_lang('return')]]
     ))

+ 1 - 1
route/topic_close_list.py

@@ -76,7 +76,7 @@ def topic_close_list_2(conn, name):
         plus = re.sub(r'^<br>', '', plus)
 
     return easy_minify(flask.render_template(skin_check(),
-        imp = [name, wiki_set(), custom(), other2([' (' + sub + ')', 0])],
+        imp = [name, wiki_set(), custom(), other2(['(' + sub + ')', 0])],
         data = div + plus,
         menu = menu
     ))

+ 1 - 1
route/user_tool.py

@@ -27,7 +27,7 @@ def user_tool_2(conn, name):
         '''
 
     return easy_minify(flask.render_template(skin_check(),
-        imp = [name, wiki_set(), custom(), other2([' (' + load_lang('tool') + ')', 0])],
+        imp = [name, wiki_set(), custom(), other2(['(' + load_lang('tool') + ')', 0])],
         data = data,
         menu = 0
     ))

+ 1 - 1
route/view_diff_data.py

@@ -56,7 +56,7 @@ def view_diff_data_2(conn, name):
                 result = '<pre>' + end_data + '</pre>'
 
             return easy_minify(flask.render_template(skin_check(),
-                imp = [name, wiki_set(), custom(), other2([' (' + load_lang('compare') + ')', 0])],
+                imp = [name, wiki_set(), custom(), other2(['(' + load_lang('compare') + ')', 0])],
                 data = result,
                 menu = [['history/' + url_pas(name), load_lang('return')]]
             ))

+ 1 - 1
route/view_down.py

@@ -12,7 +12,7 @@ def view_down_2(conn, name):
     div += '</ul>'
 
     return easy_minify(flask.render_template(skin_check(),
-        imp = [name, wiki_set(), custom(), other2([' (' + load_lang('sub') + ')', 0])],
+        imp = [name, wiki_set(), custom(), other2(['(' + load_lang('sub') + ')', 0])],
         data = div,
         menu = [['w/' + url_pas(name), load_lang('return')]]
     ))

+ 1 - 1
route/view_xref.py

@@ -55,7 +55,7 @@ def view_xref_2(conn, name):
     div += '</ul>' + next_fix('/xref/' + url_pas(name) + '?num=', num, data_list)
 
     return easy_minify(flask.render_template(skin_check(),
-        imp = [name, wiki_set(), custom(), other2([' (' + load_lang('backlink') + ')', 0])],
+        imp = [name, wiki_set(), custom(), other2(['(' + load_lang('backlink') + ')', 0])],
         data = div,
         menu = [['w/' + url_pas(name), load_lang('return')], ['backlink_reset/' + url_pas(name), load_lang('reset_backlink')]]
     ))

+ 2 - 2
version.json

@@ -1,8 +1,8 @@
 {
     "master" : {
-        "r_ver" : "v3.1.9-master-19",
+        "r_ver" : "v3.1.9-master-20",
         "c_ver" : "3191700",
-        "s_ver" : "8"
+        "s_ver" : "9"
     }, "stable" : {
         "r_ver" : "v3.1.8-stable-06",
         "c_ver" : "3184400",

+ 1 - 1
views/marisa/index.html

@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         {% if imp[3][0] != 0 %}
-            <title>{{imp[0]}}{{imp[3][0]}} - {{imp[1][0]}}</title>
+            <title>{{imp[0]}} {{imp[3][0]}} - {{imp[1][0]}}</title>
         {% else %}
             <title>{{imp[0]}} - {{imp[1][0]}}</title>
         {% endif %}

+ 1 - 1
views/marisa/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Marisa",
     "skin_ver" : "v1.2.6",
-    "require_ver" : "8"
+    "require_ver" : "9"
 }