2du 4 лет назад
Родитель
Сommit
64737aea38

+ 18 - 18
app.py

@@ -287,16 +287,9 @@ if os.path.exists('custom.py'):
 
 
     custom_run(conn, app)
     custom_run(conn, app)
 
 
-# Func
-# Func-alarm
-@app.route('/alarm')
-def alarm():
-    return alarm_2(conn)
-
-@app.route('/del_alarm')
-def alarm_del():
-    return alarm_del_2(conn)
+# alarm과 watch_list의 user 편입
 
 
+# Func
 # Func-inter_wiki
 # Func-inter_wiki
 @app.route('/<regex("inter_wiki|edit_top|image_license|(?:edit|email|file|name|extension)_filter"):tools>')
 @app.route('/<regex("inter_wiki|edit_top|image_license|(?:edit|email|file|name|extension)_filter"):tools>')
 def inter_wiki(tools = None):
 def inter_wiki(tools = None):
@@ -545,6 +538,22 @@ def user_custom_head_view():
 @app.route('/count/<name>')
 @app.route('/count/<name>')
 def user_count_edit(name = None):
 def user_count_edit(name = None):
     return user_count_edit_2(conn, name)
     return user_count_edit_2(conn, name)
+    
+@app.route('/alarm')
+def alarm():
+    return alarm_2(conn)
+
+@app.route('/del_alarm')
+def alarm_del():
+    return alarm_del_2(conn)
+    
+@app.route('/<regex("watch_list|star_doc"):tool>')
+def watch_list(tool = 'star_doc'):
+    return watch_list_2(conn, tool)
+
+@app.route('/<regex("watch_list|star_doc"):tool>/<everything:name>')
+def watch_list_name(tool = 'star_doc', name = 'Test'):
+    return watch_list_name_2(conn, tool, name)
 
 
 # Func-login
 # Func-login
 @app.route('/2fa_login', methods = ['POST', 'GET'])
 @app.route('/2fa_login', methods = ['POST', 'GET'])
@@ -575,15 +584,6 @@ def login_check_key(tool = 'check_pass_key'):
 def login_logout():
 def login_logout():
     return login_logout_2(conn)
     return login_logout_2(conn)
 
 
-# Func-watch_list
-@app.route('/<regex("watch_list|star_doc"):tool>')
-def watch_list(tool = 'star_doc'):
-    return watch_list_2(conn, tool)
-
-@app.route('/<regex("watch_list|star_doc"):tool>/<everything:name>')
-def watch_list_name(tool = 'star_doc', name = 'Test'):
-    return watch_list_name_2(conn, tool, name)
-
 # Func-application
 # Func-application
 @app.route('/application_submitted')
 @app.route('/application_submitted')
 def application_submitted():
 def application_submitted():

+ 5 - 9
route/__init__.py

@@ -77,16 +77,16 @@ from .user_setting import *
 from .user_tool import *
 from .user_tool import *
 from .user_count_edit import *
 from .user_count_edit import *
 from .user_custom_head_view import *
 from .user_custom_head_view import *
+from .user_watch_list import *
+from .user_watch_list_name import *
+from .user_alarm import *
+from .user_alarm_del import *
 
 
 # Import-inter_wiki
 # Import-inter_wiki
 from .inter_wiki_plus import *
 from .inter_wiki_plus import *
 from .inter_wiki_del import *
 from .inter_wiki_del import *
 from .inter_wiki import *
 from .inter_wiki import *
 
 
-# Import-watch_list
-from .watch_list import *
-from .watch_list_name import *
-
 # Import-login
 # Import-login
 from .login import *
 from .login import *
 from .login_pw_change import *
 from .login_pw_change import *
@@ -128,8 +128,4 @@ from .view_xref import *
 from .view_raw import *
 from .view_raw import *
 from .view_diff_data import *
 from .view_diff_data import *
 from .view_read import *
 from .view_read import *
-from .view_down import *
-
-# Import-alarm
-from .alarm import *
-from .alarm_del import *
+from .view_down import *

+ 1 - 1
route/tool/func.py

@@ -84,7 +84,7 @@ if sys.version_info < (3, 6):
 global_lang = {}
 global_lang = {}
 global_wiki_set = {}
 global_wiki_set = {}
 
 
-data_css_ver = '97'
+data_css_ver = '98'
 data_css = ''
 data_css = ''
 
 
 conn = ''
 conn = ''

+ 0 - 0
route/alarm.py → route/user_alarm.py


+ 0 - 0
route/alarm_del.py → route/user_alarm_del.py


+ 0 - 0
route/watch_list.py → route/user_watch_list.py


+ 0 - 0
route/watch_list_name.py → route/user_watch_list_name.py


+ 1 - 0
views/main_css/js/render_onmark.js

@@ -310,6 +310,7 @@ function do_onmark_link_render(data, data_js, name_doc, name_include, data_nowik
                 }
                 }
 
 
                 return  '<a id="out_link" ' +
                 return  '<a id="out_link" ' +
+                            'target="_blank" ' +
                             'name="' + name_include + 'set_link_' + num_link_str + '" ' + 
                             'name="' + name_include + 'set_link_' + num_link_str + '" ' + 
                             'title=""' +
                             'title=""' +
                             'href="">' + link_out + '</a>';
                             'href="">' + link_out + '</a>';