diff --git a/ietf/dbtemplate/templates/dbtemplate/template_edit.html b/ietf/dbtemplate/templates/dbtemplate/template_edit.html
index f0c3b53c7..d53a0e416 100644
--- a/ietf/dbtemplate/templates/dbtemplate/template_edit.html
+++ b/ietf/dbtemplate/templates/dbtemplate/template_edit.html
@@ -39,7 +39,7 @@
-
+
diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index 05e6fdcb0..5d5a210c9 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -426,13 +426,13 @@ def format_snippet(text, trunc_words=25):
full = keep_spacing(collapsebr(linebreaksbr(mark_safe(sanitize_fragment(text)))))
snippet = truncatewords_html(full, trunc_words)
if snippet != full:
- return mark_safe('%s
%s
' % (snippet, full))
+ return mark_safe('%s
%s
' % (snippet, full))
return full
@register.simple_tag
def doc_edit_button(url_name, *args, **kwargs):
"""Given URL name/args/kwargs, looks up the URL just like "url" tag and returns a properly formatted button for the document material tables."""
- return mark_safe('Edit' % (urlreverse(url_name, args=args, kwargs=kwargs)))
+ return mark_safe('Edit' % (urlreverse(url_name, args=args, kwargs=kwargs)))
@register.filter
def textify(text):
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index 633a6e55c..8bcc5b1c7 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -2103,9 +2103,9 @@ class DocumentMeetingTests(TestCase):
self.assertEqual(response.status_code, 200)
q = PyQuery(response.content)
self.assertTrue(q('#addsessionsbutton'))
- self.assertEqual(1,len(q("#inprogressmeets a.btn-default:contains('Remove document')")))
- self.assertEqual(1,len(q("#futuremeets a.btn-default:contains('Remove document')")))
- self.assertEqual(1,len(q("#pastmeets a.btn-default:contains('Remove document')")))
+ self.assertEqual(1,len(q("#inprogressmeets a.btn-primary:contains('Remove document')")))
+ self.assertEqual(1,len(q("#futuremeets a.btn-primary:contains('Remove document')")))
+ self.assertEqual(1,len(q("#pastmeets a.btn-primary:contains('Remove document')")))
self.assertEqual(1,len(q("#pastmeets a.btn-warning:contains('Remove document')")))
self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
@@ -2113,9 +2113,9 @@ class DocumentMeetingTests(TestCase):
self.assertEqual(response.status_code, 200)
q = PyQuery(response.content)
self.assertTrue(q('#addsessionsbutton'))
- self.assertEqual(1,len(q("#inprogressmeets a.btn-default:contains('Remove document')")))
- self.assertEqual(1,len(q("#futuremeets a.btn-default:contains('Remove document')")))
- self.assertEqual(1,len(q("#pastmeets a.btn-default:contains('Remove document')")))
+ self.assertEqual(1,len(q("#inprogressmeets a.btn-primary:contains('Remove document')")))
+ self.assertEqual(1,len(q("#futuremeets a.btn-primary:contains('Remove document')")))
+ self.assertEqual(1,len(q("#pastmeets a.btn-primary:contains('Remove document')")))
self.assertTrue(q('#pastmeets'))
self.assertFalse(q("#pastmeets a.btn-warning:contains('Remove document')"))
diff --git a/ietf/liaisons/widgets.py b/ietf/liaisons/widgets.py
index 9581679b2..fe0f15e36 100644
--- a/ietf/liaisons/widgets.py
+++ b/ietf/liaisons/widgets.py
@@ -37,8 +37,8 @@ class ShowAttachmentsWidget(Widget):
if value and isinstance(value, QuerySet):
for attachment in value:
html += '%s ' % (conditional_escape(attachment.document.get_href()), conditional_escape(attachment.document.title))
- html += 'Edit '.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk}))
- html += 'Delete '.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk}))
+ html += 'Edit '.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk}))
+ html += 'Delete '.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk}))
html += '
'
else:
html += 'No files attached'
diff --git a/ietf/static/css/list.scss b/ietf/static/css/list.scss
index 47f551ac6..4aedb2c5c 100644
--- a/ietf/static/css/list.scss
+++ b/ietf/static/css/list.scss
@@ -6,7 +6,6 @@
table .sort {
white-space: nowrap;
- padding-right: .5em;
cursor: pointer;
}
@@ -18,6 +17,7 @@ table .sort:hover {
table .sort:before {
font-family: 'bootstrap-icons';
content: '\f127';
+ padding-right: .25em;
}
table .sort.asc:before {
diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js
index 1aa758d7d..f906fc1f5 100644
--- a/ietf/static/js/list.js
+++ b/ietf/static/js/list.js
@@ -6,10 +6,10 @@ function text_sort(a, b, options) {
return dummy.utils.naturalSort.caseInsensitive($($.parseHTML(a.values()[options.valueName]))
.text()
.trim()
- .replaceAll(/\w+/g, ' '), $($.parseHTML(b.values()[options.valueName]))
+ .replaceAll(/\s+/g, ' '), $($.parseHTML(b.values()[options.valueName]))
.text()
.trim()
- .replaceAll(/\w+/g, ' '));
+ .replaceAll(/\s+/g, ' '));
}
$(document)
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index b8f6812c8..bf23056de 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -123,7 +123,7 @@
{% block js %}{% endblock js %}
{% if debug %}
-
+
{% endif %}
diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html
index 1fc6fe6e9..3c9312c11 100644
--- a/ietf/templates/community/manage_list.html
+++ b/ietf/templates/community/manage_list.html
@@ -36,7 +36,7 @@