Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'feature/htmx'
Roland Geider2ab7e8ca4b85
diff --cc package.jsonindex c273bc834,e7b5a1127..21c6ec39f--- a/package.json+++ b/package.json@@@ -10,9 -10,12 +10,10 @@@},"homepage": "https://github.com/wger-project/wger","dependencies": {+ "htmx.org": "^2.0.3",- "Sortable": "RubaXa/Sortable#1.15.3","bootstrap": "5.3.3","components-font-awesome": "5.9.0",- "d3": "^7.9.0",- "datatables": "^1.10.18",+ "datatables.net-bs5": "^2.1.8","devbridge-autocomplete": "^1.4.11","jquery": "^3.7.1","masonry-layout": "^4.2.2",diff --cc wger/core/templates/template.htmlindex c47702e64,cbba76db8..4b370adb9--- a/wger/core/templates/template.html+++ b/wger/core/templates/template.html@@@ -67,7 -67,9 +67,8 @@@{% compress js %}<script src="{% static 'yarn/jquery/dist/jquery.js' %}"></script><script src="{% static 'yarn/bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>- <script src="{% static 'yarn/Sortable/Sortable.min.js' %}"></script><script src="{% static 'yarn/d3/dist/d3.js' %}"></script>+ <script src="{% static 'yarn/htmx.org/dist/htmx.min.js' %}"></script><script src="{% static 'yarn/popper.js/dist/umd/popper.js' %}"></script><script src="{% static 'yarn/devbridge-autocomplete/dist/jquery.autocomplete.min.js' %}"></script>diff --cc wger/manager/templates/schedule/view.htmlindex 959111422,27c89d78b..ce80e30e2--- a/wger/manager/templates/schedule/view.html+++ b/wger/manager/templates/schedule/view.html@@@ -65,16 -110,31 +65,29 @@@</td>{% if is_owner %}<td style="min-width: 6em;">- <span class="editoptions">- <a href="{% url 'manager:step:edit' step.id %}"- title="{% translate 'Edit' %}"- class="wger-modal-dialog">- <span class="{% fa_class 'edit' %}"></span></a>- <a href="{% url 'manager:step:delete' step.id %}"- title="{% translate 'Delete' %}"- class="wger-modal-dialog">- <span class="{% fa_class 'trash' %}"></span></a>- </span>+ <span class="editoptions">- <span title="{% translate 'Move me' %}"- class="dragndrop-handle {% fa_class 'bars' %}"></span>+ <a+ href="{% url 'manager:step:edit' step.id %}"+ class="{{ css_class }}"+ hx-get="{% url 'manager:step:edit' step.id %}"+ hx-target="#ajax-info-content"+ data-bs-toggle="modal"+ data-bs-target="#wger-ajax-info"+ >+ <span class="{% fa_class 'edit' %}"></span>+ </a>++ <a+ href="{% url 'manager:step:delete' step.id %}"+ class="{{ css_class }}"+ hx-get="{% url 'manager:step:delete' step.id %}"+ hx-target="#ajax-info-content"+ data-bs-toggle="modal"+ data-bs-target="#wger-ajax-info"+ >+ <span class="{% fa_class 'trash' %}"></span>+ </a>+ </span></td>{% endif %}<td>