Kaynağa Gözat

add old rev warring and table css fix

잉여개발기 (SPDV) 3 yıl önce
ebeveyn
işleme
fe0f0d663e

+ 1 - 0
lang/en-US.json

@@ -322,6 +322,7 @@
                 "topic_text" : "Discussion textarea phrase",
                 "phrase_user_page_admin" : "Administrator user page phrase",
                 "phrase_user_page_owner" : "Onwer user page phrase",
+                "phrase_old_page_warring" : "Warning on previous revision document visit",
             "_comment_2.2.4_" : "Ext_API",
                 "recaptcha" : "reCAPTCHA",
                 "hcaptcha" : "hCAPTCHA",

+ 2 - 1
lang/ko-KR.json

@@ -465,5 +465,6 @@
     "not_all_acl": "전부 금지",
     "document_move_acl": "문서 이동 ACL",
     "document_delete_acl": "문서 삭제 ACL",
-    "document_edit_acl" : "문서 편집 ACL"
+    "document_edit_acl" : "문서 편집 ACL",
+    "phrase_old_page_warring" : "이전 리비전 문서 방문시 경고문"
 }

+ 7 - 3
route/main_func_setting_phrase.py

@@ -27,7 +27,8 @@ def main_func_setting_phrase():
             'license',
             'topic_text',
             'phrase_user_page_admin',
-            'phrase_user_page_owner'
+            'phrase_user_page_owner',
+            'phrase_old_page_warring'
         ]
         if flask.request.method == 'POST':
             for i in i_list:
@@ -116,12 +117,15 @@ def main_func_setting_phrase():
                         <h2>18. ''' + load_lang('topic_text') + '''</h2>
                         <textarea rows="3" name="''' + i_list[17] + '''">''' + html.escape(d_list[17]) + '''</textarea>
                         
-                        <h2>19. ''' + load_lang('phrase_user_page_admin') + '''  (HTML)</h2>
+                        <h2>19. ''' + load_lang('phrase_user_page_admin') + ''' (HTML)</h2>
                         <textarea rows="3" name="''' + i_list[18] + '''">''' + html.escape(d_list[18]) + '''</textarea>
                         
-                        <h2>20. ''' + load_lang('phrase_user_page_owner') + '''  (HTML)</h2>
+                        <h2>20. ''' + load_lang('phrase_user_page_owner') + ''' (HTML)</h2>
                         <textarea rows="3" name="''' + i_list[19] + '''">''' + html.escape(d_list[19]) + '''</textarea>
 
+                        <h2>21. ''' + load_lang('phrase_old_page_warring') + ''' (''' + load_lang('beta') + ''') (HTML)</h2>
+                        <textarea rows="3" name="''' + i_list[20] + '''">''' + html.escape(d_list[20]) + '''</textarea>
+
                         <hr class="main_hr">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>

+ 1 - 1
route/tool/func.py

@@ -1008,7 +1008,7 @@ def wiki_css(data):
     data += ['' for _ in range(0, 3 - len(data))]
     
     data_css = ''
-    data_css_ver = '149'
+    data_css_ver = '150'
     
     # Func JS + Defer
     data_css += '<script defer src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'

+ 6 - 0
route/view_read.py

@@ -212,6 +212,12 @@ def view_read(name = 'Test', doc_rev = 0, doc_from = '', do_type = ''):
 
         div = file_data + user_doc + end_data + category_doc
 
+        if num != '0':
+            curs.execute(db_change('select data from other where name = "phrase_old_page_warring"'))
+            db_data = curs.fetchall()
+            if db_data and db_data[0][0] != '':
+                div = db_data[0][0] + '<hr class="main_hr">' + div
+
         curs.execute(db_change("select data from other where name = 'body'"))
         body = curs.fetchall()
         div = (body[0][0] + div) if body else div

+ 2 - 2
views/main_css/css/main.css

@@ -28,9 +28,9 @@ table {
 }
 
 td {
-    border: 1px solid gainsboro;
+    border: 0.5px solid gainsboro;
     
-    padding: 5px 10px;
+    padding: 8px 10px;
 }
 
 /* 링크 */