2du 4 лет назад
Родитель
Сommit
00d0971b18
5 измененных файлов с 42 добавлено и 5 удалено
  1. 2 0
      lang/en-US.json
  2. 3 1
      lang/ko-KR.json
  3. 13 2
      route/main_func_setting_phrase.py
  4. 23 1
      route/view_read.py
  5. 1 1
      version.json

+ 2 - 0
lang/en-US.json

@@ -313,6 +313,8 @@
                 "upload_help" : "File upload phrase",
                 "upload_default" : "File upload other Default",
                 "topic_text" : "Discussion textarea phrase",
+                "phrase_user_page_admin" : "Administrator user page phrase",
+                "phrase_user_page_owner" : "Onwer user page phrase",
             "_comment_2.2.4_" : "Ext_API",
                 "recaptcha" : "reCAPTCHA",
                 "hcaptcha" : "hCAPTCHA",

+ 3 - 1
lang/ko-KR.json

@@ -447,5 +447,7 @@
     "thread_acl": "스레드 ACL",
     "not_all_acl": "전부 금지",
     "password_min_length": "비밀번호 최소 길이",
-    "error_password_length_too_short": "비밀번호 길이가 너무 짧습니다. 최소 글자 수 : "
+    "error_password_length_too_short": "비밀번호 길이가 너무 짧습니다. 최소 글자 수 : ",
+    "phrase_user_page_admin": "관리자인 사용자 문서 문구",
+    "phrase_user_page_owner": "소유자인 사용자 문서 문구"
 }

+ 13 - 2
route/main_func_setting_phrase.py

@@ -25,7 +25,9 @@ def main_func_setting_phrase():
             'upload_help',
             'upload_default',
             'license',
-            'topic_text'
+            'topic_text',
+            'phrase_user_page_admin',
+            'phrase_user_page_owner'
         ]
         if flask.request.method == 'POST':
             for i in i_list:
@@ -113,12 +115,21 @@ 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>
+                        <textarea rows="3" name="''' + i_list[18] + '''">''' + html.escape(d_list[18]) + '''</textarea>
+                        
+                        <h2>20. ''' + load_lang('phrase_user_page_owner') + '''  (HTML)</h2>
+                        <textarea rows="3" name="''' + i_list[19] + '''">''' + html.escape(d_list[19]) + '''</textarea>
 
                         <hr class="main_hr">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
                     <ul id="footnote_data">
-                        <li><a href="#note_1" id="note_1_end">(1)</a> ''' + load_lang('approval_question_visible_only_when_approval_on') + '''</li>
+                        <li>
+                            <a href="#note_1" id="note_1_end">(1)</a>
+                            <a href="/setting/main">''' + load_lang('approval_question_visible_only_when_approval_on') + '''</a>
+                        </li>
                     </ul>
                     <script>simple_render('main_set_data');</script>
                 ''',

+ 23 - 1
route/view_read.py

@@ -42,8 +42,30 @@ def view_read(name = 'Test', doc_rev = 0, doc_from = '', do_type = ''):
                 category_doc += '<h2 id="cate_under">' + load_lang('under_category') + '</h2><ul class="inside_ul">' + category_sub + '</ul>'
         elif re.search(r"^user:([^/]*)", name):
             match = re.search(r"^user:([^/]*)", name)
+            
             user_name = html.escape(match.group(1))
-            user_doc = '''
+            user_doc = ''
+            
+            # S admin or owner 특수 틀 추가
+            if admin_check('all', None, user_name) == 1:
+                if admin_check(None, None, user_name) == 1:
+                    curs.execute(db_change('select data from other where name = "phrase_user_page_owner"'))
+                    db_data = curs.fetchall()
+                    if db_data and db_data[0][0] != '':
+                        user_doc += db_data[0][0] + '<br>'
+                    else:
+                        curs.execute(db_change('select data from other where name = "phrase_user_page_admin"'))
+                        db_data = curs.fetchall()
+                        if db_data and db_data[0][0] != '':
+                            user_doc += db_data[0][0] + '<br>'
+                else:
+                    curs.execute(db_change('select data from other where name = "phrase_user_page_admin"'))
+                    db_data = curs.fetchall()
+                    if db_data and db_data[0][0] != '':
+                        user_doc += db_data[0][0] + '<br>'
+            # E
+            
+            user_doc += '''
                 <div id="get_user_info"></div>
                 <script>load_user_info("''' + user_name + '''");</script>
                 <hr class="main_hr">

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev22)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev23)",
         "c_ver" : "3500112",
         "s_ver" : "3500110"
     }