Many more changes related to tablesorter.

 - Legacy-Id: 19702

Author: larseggert

ietf/dbtemplate/templates/dbtemplate/template_edit.html

@@ -39,7 +39,7 @@ <h2>Edit template content</h2>
 
 
 
-        <button class="btn btn-default" type="submit">Save changes</button>
+        <button class="btn btn-primary" type="submit">Save changes</button>
 
 
     </form>

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('<div class="snippet">%s<button class="btn btn-xs btn-default show-all"><span class="bi bi-caret-down"></span></button></div><div class="hidden full">%s</div>' % (snippet, full))
+        return mark_safe('<div class="snippet">%s<button class="btn btn-sm btn-primary show-all"><i class="bi bi-caret-down"></i></button></div><div class="hidden full">%s</div>' % (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('<a class="btn btn-default btn-xs" href="%s">Edit</a>' % (urlreverse(url_name, args=args, kwargs=kwargs)))
+    return mark_safe('<a class="btn btn-primary btn-sm" role="button" href="%s">Edit</a>' % (urlreverse(url_name, args=args, kwargs=kwargs)))
 
 @register.filter
 def textify(text):

ietf/doc/tests.py

@@ -2103,19 +2103,19 @@ def test_view_document_meetings(self):
         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)
         response = self.client.get(url)
         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')"))
 

ietf/liaisons/widgets.py

@@ -37,8 +37,8 @@ def render(self, name, value, **kwargs):
         if value and isinstance(value, QuerySet):
             for attachment in value:
                 html += '<a class="initialAttach" href="%s">%s</a>&nbsp' % (conditional_escape(attachment.document.get_href()), conditional_escape(attachment.document.title))
-                html += '<a class="btn btn-default btn-xs" href="{}">Edit</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk}))
-                html += '<a class="btn btn-default btn-xs" href="{}">Delete</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk}))
+                html += '<a class="btn btn-primary btn-sm" href="{}">Edit</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk}))
+                html += '<a class="btn btn-primary btn-sm" href="{}">Delete</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk}))
                 html += '<br />'
         else:
             html += 'No files attached'

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 {

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)

ietf/templates/base.html

@@ -123,7 +123,7 @@
 
         {% block js %}{% endblock js %}
         {% if debug %}
-            <script src="{% static 'ietf/js/datatables.js' %}"></script>
+            <script src="{% static 'ietf/js/list.js' %}"></script>
         {% endif %}
     </body>
 

ietf/templates/community/manage_list.html

@@ -36,7 +36,7 @@ <h2>Individual documents</h2>
                             <form method="post" id="remove_document_{{d.pk}}">
                                 {% csrf_token %}
                                 <input type="hidden" name="document" value="{{ d.pk }}">
-                                <button class="btn btn-danger btn-xs" name="action" value="remove_document">Remove</button>
+                                <button class="btn btn-danger btn-sm" name="action" value="remove_document">Remove</button>
                             </form>
                         </td>
                     </tr>
@@ -91,7 +91,7 @@ <h2>Search rules</h2>
                             <form method="post">
                                 {% csrf_token %}
                                 <input type="hidden" name="rule" value="{{ rule.pk }}">
-                                <button class="btn btn-danger btn-xs" name="action" value="remove_rule">Remove</button>
+                                <button class="btn btn-danger btn-sm" name="action" value="remove_rule">Remove</button>
                             </form>
                         </td>
                     </tr>

ietf/templates/debug.html

@@ -9,7 +9,7 @@
             <p>
                 {{ sql_queries|length }} queries ({{ sql_queries|timesum }}s)
                 {% if sql_queries|length != 0 %}
-                    <a class="btn btn-primary btn-xs"
+                    <a class="btn btn-primary btn-sm"
                         onclick="$('#debug-query-table').toggleClass('hide');">Show</a>
                 {% endif %}
             </p>
@@ -36,7 +36,7 @@
                                 <td>
                                     {{ query.loc }}
                                     {% if query.origin %}
-                                        <button type="button" class="btn btn-primary btn-xs" data-bs-toggle="modal" data-bs-target="#modal-{{forloop.counter}}" >Origin</button>
+                                        <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal-{{forloop.counter}}" >Origin</button>
                                     {% endif %}
                                     <div class="modal fade" id="modal-{{forloop.counter}}" tabindex="-1" role="dialog" aria-labelledby="modal-title-{{forloop.counter}}">
                                         <div class="modal-dialog modal-max" role="document">

ietf/templates/doc/add_comment.html

@@ -8,19 +8,17 @@
 
 {% block content %}
     {% origin %}
-    <h1>Add comment<br><small>{{ doc }}</small></h1>
+    <h1>Add comment<br><small class="text-muted">{{ doc }}</small></h1>
 
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <p class="help-block">The comment will be added to the history trail.</p>
 
-
-
-        <button type="submit" class="btn btn-primary">Submit</button>
-        <a class="btn btn-primary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
+        {% bootstrap_button button_type="submit" content="Submit" %}
+        <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
 
 
     </form>
 
-{% endblock %}
+{% endblock %}