Browse Source

외부 링크 아이콘 변경 추가

https://github.com/openNAMU/openNAMU/issues/1702
잉여개발기 (SPDV) 2 năm trước cách đây
mục cha
commit
d6e4857e48
2 tập tin đã thay đổi với 14 bổ sung3 xóa
  1. 1 1
      route/filter_all_add.py
  2. 13 2
      route/tool/func_render_namumark.py

+ 1 - 1
route/filter_all_add.py

@@ -113,7 +113,7 @@ def filter_all_add(tool, name = None):
                     <hr class="main_hr">
                     <input value="''' + html.escape(value[1]) + '''" type="text" name="link">
                     <hr class="main_hr">
-                    ''' + load_lang('icon') + ''' (HTML)
+                    ''' + load_lang('icon') + ''' (''' + ('HTML' if tool == 'inter_wiki' else load_lang('html_or_link')) + ''') (''' + load_lang('link') + ' EX' + ''' : /image/Test.svg)
                     <hr class="main_hr">
                     <input value="''' + html.escape(value[2]) + '''" type="text" name="icon">
                 '''

+ 13 - 2
route/tool/func_render_namumark.py

@@ -1114,16 +1114,27 @@ class class_do_render_namumark:
                         pass
 
                     link_inter_icon = ''
+                    link_class = 'opennamu_link_out'
 
                     self.curs.execute(db_change("select html, plus_t from html_filter where kind = 'outer_link' and plus = ?"), [domain])
                     db_data = self.curs.fetchall()
                     if db_data:
                         if db_data[0][1] != '':
-                            link_inter_icon = db_data[0][1]
+                            if re.search(r'<|>', db_data[0][1]):
+                                link_inter_icon = db_data[0][1]
+                                link_class = 'opennamu_link_inter'
+                            else:
+                                if self.get_tool_data_restore(link_sub).find('"' + db_data[0][1] + '"') != -1:
+                                    link_inter_icon = ''
+                                    link_class = 'opennamu_link_inter'
+                                else:
+                                    link_inter_icon = '<img src="' + db_data[0][1] + '">'
+                                    link_class = 'opennamu_link_inter'
                         else:
                             link_inter_icon = db_data[0][0] + ':'
+                            link_class = 'opennamu_link_inter'
 
-                    data_name = self.get_tool_data_storage('<a class="' + ('opennamu_link_inter' if link_inter_icon != '' else 'opennamu_link_out') + '" target="_blank" title="' + link_title + '" href="' + link_main + '">' + link_inter_icon + link_sub_storage, '</a>', link_data_full)
+                    data_name = self.get_tool_data_storage('<a class="' + link_class + '" target="_blank" title="' + link_title + '" href="' + link_main + '">' + link_inter_icon + link_sub_storage, '</a>', link_data_full)
                     self.render_data = re.sub(link_regex, lambda x : ('<' + data_name + '>' + link_sub + '</' + data_name + '>'), self.render_data, 1)
                 # in link
                 else: