rework filters to avoid conflict in editing vs showing all
- Legacy-Id: 8436
This commit is contained in:
parent
31f687b343
commit
7e60f910d4
|
@ -458,6 +458,19 @@ def format_snippet(text):
|
|||
return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s</div>' % (snippet, full))
|
||||
return full
|
||||
|
||||
@register.filter
|
||||
def format_editable_snippet(text,link):
|
||||
full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(text)))))
|
||||
snippet = truncatewords_html(full, 25)
|
||||
if snippet != full:
|
||||
return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s' % (format_editable(snippet,link),format_editable(full,link)) )
|
||||
else:
|
||||
return format_editable(full,link)
|
||||
|
||||
@register.filter
|
||||
def format_editable(text,link):
|
||||
return mark_safe(u'<a class="editlink" href="%s">%s</a>' % (link,text))
|
||||
|
||||
@register.filter
|
||||
def textify(text):
|
||||
text = re.sub("</?b>", "*", text)
|
||||
|
|
|
@ -30,9 +30,12 @@
|
|||
<tr>
|
||||
<td>Abstract:</td>
|
||||
<td>
|
||||
<a {% if not snapshot and can_manage_material %} class="editlink" href="{% url "material_edit" name=doc.name action="abstract" name=doc.name %}"{% endif %}>
|
||||
{% if not snapshot and can_manage_material %}
|
||||
{% url "material_edit" name=doc.name action="abstract" as editurl %}
|
||||
{{ doc.abstract | format_editable_snippet:editurl }}
|
||||
{% else %}
|
||||
{{ doc.abstract | format_snippet }}
|
||||
</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
|
Loading…
Reference in a new issue