|
@@ -768,14 +768,7 @@ class class_do_render_namumark:
|
|
|
if file_bgcolor != '':
|
|
if file_bgcolor != '':
|
|
|
file_bgcolor = 'background:' + self.get_tool_css_safe(file_bgcolor) + ';'
|
|
file_bgcolor = 'background:' + self.get_tool_css_safe(file_bgcolor) + ';'
|
|
|
|
|
|
|
|
- if file_out == 0:
|
|
|
|
|
- file_onclick = 'onclick="javascript:document.location.pathname=\'/w/file:' + url_pas(link_main_org) + '.' + url_pas(link_extension) + '\'"'
|
|
|
|
|
- file_style = 'cursor: pointer;'
|
|
|
|
|
- else:
|
|
|
|
|
- file_onclick = ''
|
|
|
|
|
- file_style = ''
|
|
|
|
|
-
|
|
|
|
|
- file_end = '<img ' + file_onclick + ' style="' + file_width + file_height + file_align_style + file_bgcolor + file_style + '" alt="' + link_sub + '" src="' + link_main + '">'
|
|
|
|
|
|
|
+ file_end = '<img style="' + file_width + file_height + file_align_style + file_bgcolor + '" alt="' + link_sub + '" src="' + link_main + '">'
|
|
|
if file_align == 'center':
|
|
if file_align == 'center':
|
|
|
file_end = '<div style="text-align:center;">' + file_end + '</div>'
|
|
file_end = '<div style="text-align:center;">' + file_end + '</div>'
|
|
|
|
|
|
|
@@ -793,7 +786,10 @@ class class_do_render_namumark:
|
|
|
file_pass = 1
|
|
file_pass = 1
|
|
|
|
|
|
|
|
if file_pass == 1:
|
|
if file_pass == 1:
|
|
|
- data_name = self.get_tool_data_storage(file_end, '', link_data_full)
|
|
|
|
|
|
|
+ if file_out == 0:
|
|
|
|
|
+ data_name = self.get_tool_data_storage('<a title="' + link_sub + '" href="/w/file:' + url_pas(link_main_org) + '.' + url_pas(link_extension) + '">' + file_end, '</a>', link_data_full)
|
|
|
|
|
+ else:
|
|
|
|
|
+ data_name = self.get_tool_data_storage('<a title="' + link_sub + '" href="' + link_main + '">' + file_end, '</a>', link_data_full)
|
|
|
else:
|
|
else:
|
|
|
data_name = self.get_tool_data_storage('', '', link_data_full)
|
|
data_name = self.get_tool_data_storage('', '', link_data_full)
|
|
|
|
|
|
|
@@ -1779,6 +1775,10 @@ class class_do_render_namumark:
|
|
|
# <render_n> restore
|
|
# <render_n> restore
|
|
|
self.render_data = self.get_tool_data_restore(self.render_data)
|
|
self.render_data = self.get_tool_data_restore(self.render_data)
|
|
|
|
|
|
|
|
|
|
+ # a fix
|
|
|
|
|
+ # def do_render_last_a_link(match):
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
# add toc
|
|
# add toc
|
|
|
def do_render_last_toc(match):
|
|
def do_render_last_toc(match):
|
|
|
data = match.group(1)
|
|
data = match.group(1)
|