Просмотр исходного кода

https://github.com/openNAMU/openNAMU/issues/1777

잉여개발기 2 лет назад
Родитель
Сommit
ee9a02ffdf
5 измененных файлов с 38 добавлено и 6 удалено
  1. 2 0
      lang/en-US.json
  2. 6 4
      lang/ko-KR.json
  3. 4 0
      route/main_setting_skin_set.py
  4. 9 0
      route/user_setting_skin_set_main.py
  5. 17 2
      route/view_read.py

+ 2 - 0
lang/en-US.json

@@ -118,6 +118,7 @@
         "spread" : "Speard",
         "popup" : "Popup",
         "popover" : "Popover",
+        "trace" : "Trace",
         "_comment_1.1_" : "Time",
             "second" : "Second(s)",
             "hour" : "Hour(s)",
@@ -300,6 +301,7 @@
                 "list_view_change" : "Change how the number list is viewed",
                 "view_joke" : "Show contents of joke macro",
                 "math_scroll" : "Use scroll in math macros",
+                "view_history" : "Use trace in view",
             "_comment_" : "Option",
                 "change_to_normal" : "Change to plain text.",
                 "change_to_link" : "Change to Link.",

+ 6 - 4
lang/ko-KR.json

@@ -570,8 +570,10 @@
     "table_scroll": "표에 스크롤 사용",
     "data": "데이터",
     "volume": "용량",
-    "list_view_change" : "숫자 리스트의 보기 방식 변경",
-    "view_joke" : "농담 매크로 내용 보이기",
-    "math_scroll" : "Math 매크로에서 스크롤 사용",
-    "remove_blind_thread" : "숨겨진 토론 보이지 않기"
+    "list_view_change": "숫자 리스트의 보기 방식 변경",
+    "view_joke": "농담 매크로 내용 보이기",
+    "math_scroll": "Math 매크로에서 스크롤 사용",
+    "remove_blind_thread": "숨겨진 토론 보이지 않기",
+    "trace": "추적",
+    "view_history": "문서 열람 추적 사용"
 }

+ 4 - 0
route/main_setting_skin_set.py

@@ -121,6 +121,10 @@ def main_setting_skin_set():
                         <select name="main_css_math_scroll">
                             ''' + set_data["main_css_math_scroll"] + '''
                         </select>
+                        <h3>''' + load_lang("view_history") + '''</h3>
+                        <select name="main_css_view_history">
+                            ''' + set_data["main_css_view_history"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

+ 9 - 0
route/user_setting_skin_set_main.py

@@ -84,6 +84,10 @@ def user_setting_skin_set_main_set_list():
             ['default', load_lang('default')],
             ['off', load_lang('off')],
             ['on', load_lang('use')]
+        ], 'main_css_view_history' : [
+            ['default', load_lang('default')],
+            ['off', load_lang('off')],
+            ['on', load_lang('use')]
         ]
     }
 
@@ -244,6 +248,11 @@ def user_setting_skin_set_main():
                         <select name="main_css_math_scroll">
                             ''' + set_data["main_css_math_scroll"] + '''
                         </select>
+                        <h3>''' + load_lang("view_history") + '''</h3>
+                        ''' + set_data_main["main_css_view_history"] + '''
+                        <select name="main_css_view_history">
+                            ''' + set_data["main_css_view_history"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

+ 17 - 2
route/view_read.py

@@ -247,8 +247,23 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
                 flask.session['lastest_document'] = flask.session['lastest_document'][-9:] + [name]
             else:
                 flask.session['lastest_document'] += [name]
-
-            print(flask.session['lastest_document'])
+            
+            flask.session['lastest_document'] = list(reversed(dict.fromkeys(reversed(flask.session['lastest_document']))))
+
+            view_history_on = get_main_skin_set(curs, flask.session, 'main_css_view_history', ip)
+            if view_history_on == 'on':
+                end_data = '' + \
+                    '<div id="redirect">' + \
+                        load_lang('trace') + ' : ' + \
+                        ' ➥ '.join(
+                            [
+                                '<a href="/w/' + url_pas(for_a) + '">' + html.escape(for_a) + '</a>'
+                                for for_a in flask.session['lastest_document']
+                            ]
+                        ) + \
+                    '</div>' + \
+                    '<hr class="main_hr">' + \
+                '' + end_data
 
             if uppage != 0:
                 menu += [['w/' + url_pas(uppage), load_lang('upper')]]