dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wiki.render_base(body)

Browse Source
This commit is contained in:
mdipierro
2013-01-09 15:41:21 -06:00
parent 9e9fde2e8f
commit f02676f264
3 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.09.12.49.10 Version 2.4.1-alpha.2+timestamp.2013.01.09.15.40.30
gluon/sqlhtml.py
+18 -13
View File
@@ -540,20 +540,25 @@ class UploadWidget(FormWidget):
requires = attr["requires"] requires = attr["requires"]
if requires == [] or isinstance(requires, IS_EMPTY_OR): if requires == [] or isinstance(requires, IS_EMPTY_OR):
inp = DIV(inp, '[', inp = DIV(inp,
A(current.T( SPAN('[',
UploadWidget.GENERIC_DESCRIPTION), _href=url), A(current.T(
'|', UploadWidget.GENERIC_DESCRIPTION), _href=url),
INPUT(_type='checkbox', '|',
_name=field.name + cls.ID_DELETE_SUFFIX, INPUT(_type='checkbox',
_id=field.name + cls.ID_DELETE_SUFFIX), _name=field.name + cls.ID_DELETE_SUFFIX,
LABEL(current.T(cls.DELETE_FILE), _id=field.name + cls.ID_DELETE_SUFFIX),
_for=field.name + cls.ID_DELETE_SUFFIX), LABEL(current.T(cls.DELETE_FILE),
']', br, image) _for=field.name + cls.ID_DELETE_SUFFIX,
_style='display:inline'),
']', _style='white-space:nowrap'),
br, image)
else: else:
inp = DIV(inp, '[', inp = DIV(inp,
A(cls.GENERIC_DESCRIPTION, _href=url), SPAN('[',
']', br, image) A(cls.GENERIC_DESCRIPTION, _href=url),
']', _style='white-space:nowrap'),
br, image)
return inp return inp
@classmethod @classmethod
gluon/tools.py
+12 -7
View File
@@ -4698,15 +4698,19 @@ class Expose(object):
class Wiki(object): class Wiki(object):
everybody = 'everybody' everybody = 'everybody'
rows_page = 25 rows_page = 25
def markmin_base(self,body):
def markmin_render(self, page): return MARKMIN(body, extra=self.extra,
html = MARKMIN(page.body, extra=self.extra,
url=True, environment=self.env, url=True, environment=self.env,
autolinks=lambda link: expand_one(link, {})).xml() autolinks=lambda link: expand_one(link, {})).xml()
html += DIV(_class='w2p_wiki_tags',
*[A(t.strip(), _href=URL(args='_search', vars=dict(q=t))) def render_tags(self, tags):
for t in page.tags or [] if t.strip()]).xml() return DIV(
return html _class='w2p_wiki_tags',
*[A(t.strip(), _href=URL(args='_search', vars=dict(q=t)))
for t in page.tags or [] if t.strip()])
def markmin_render(self, page):
return self.markmin_base(page.body) + self.render_tags(page.tags).xml()
def html_render(self, page): def html_render(self, page):
html = page.body html = page.body
@@ -4716,6 +4720,7 @@ class Wiki(object):
html = replace_autolinks(html, lambda link: expand_one(link, {})) html = replace_autolinks(html, lambda link: expand_one(link, {}))
# @{component:name} -> <script>embed component name</script> # @{component:name} -> <script>embed component name</script>
html = replace_components(html, self.env) html = replace_components(html, self.env)
html = html + self.render_tags(page.tags).xml()
return html return html
@staticmethod @staticmethod