diff --git a/biscuit/core/static/js/main.js b/biscuit/core/static/js/main.js deleted file mode 100644 index a523a322d4a40421bb55ddcfb4db604911a06d78..0000000000000000000000000000000000000000 --- a/biscuit/core/static/js/main.js +++ /dev/null @@ -1,28 +0,0 @@ -$(document).ready( function () { - $('table.datatable').each(function (index) { - $(this).DataTable({ - "paging": false - }); - }); - - $('*:not(a, span)[data-poload]').each(function() { - $(this).find('a, span').attr('data-poload', $(this).attr('data-poload')); - $(this).removeAttr('data-poload'); - }); - - $('*[data-poload]').popover({ - html: true, - animation: true, - placement: 'auto', - contianer: 'body', - trigger: 'hover' - }).on("inserted.bs.popover", function() { - var trigger_el = $(this); - var popover_id = trigger_el.attr("aria-describedby"); - var popover_el = $('#' + popover_id); - - $.get(trigger_el.data('poload'), function(d) { - popover_el.html(d); - }); - }); -}); diff --git a/biscuit/core/templates/core/base.html b/biscuit/core/templates/core/base.html index c87fe544e7a25d15dada319a14cffaca5b817936..477168e381033798d18429c638669a923bee22cb 100644 --- a/biscuit/core/templates/core/base.html +++ b/biscuit/core/templates/core/base.html @@ -17,7 +17,6 @@ {% block bootstrap4_extra_script %} {% include_js "DataTables" %} {% include_js "DataTables-Bootstrap4" %} - <script type="text/javascript" src="{% static 'js/main.js' %}" /></script> {% endblock %} {% block bootstrap4_content %} diff --git a/biscuit/core/templates/core/person_card.html b/biscuit/core/templates/core/person_card.html deleted file mode 100644 index b0476e768c803e7aeff33ed086ae221683ae9180..0000000000000000000000000000000000000000 --- a/biscuit/core/templates/core/person_card.html +++ /dev/null @@ -1,21 +0,0 @@ -{# -*- engine:django -*- #} - -{% load static cropping %} - -<div class="card shadow"> - <div class="card-header">{{ person.first_name }} {{ person.last_name }}</div> - <div class="card-body"> - <div class="row no-gutters"> - <div class="col-sm"> - {% if person.photo %} - <img class="person-img" src="{% cropped_thumbnail person 'photo_cropping' max_size='300x400' %}" alt="{{ person.first_name }} {{ person.last_name }}" /> - {% else %} - <img class="person-img" src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" /> - {% endif %} - </div> - <div class="col-sm"> - <p class="card-text">{{ person.date_of_birth|date }}</p> - </div> - </div> - </div> -</div> diff --git a/biscuit/core/urls.py b/biscuit/core/urls.py index 1654982eb007266be149bdbfceb119aa177fdea9..9b2e88cfd2009ae6157d0e74e57275661aa90de4 100644 --- a/biscuit/core/urls.py +++ b/biscuit/core/urls.py @@ -22,12 +22,11 @@ urlpatterns = [ path("persons", views.persons, name="persons"), path("persons/accounts", views.persons_accounts, name="persons_accounts"), path("person", views.person, name="person"), - path("person/<int:id_>", views.person, {"template": "full"}, name="person_by_id"), - path("person/<int:id_>/card", views.person, {"template": "card"}, name="person_by_id_card"), + path("person/<int:id_>", views.person, name="person_by_id"), path("person/<int:id_>/edit", views.edit_person, name="edit_person_by_id"), path("groups", views.groups, name="groups"), path("group/create", views.edit_group, name="create_group"), - path("group/<int:id_>", views.group, {"template": "full"}, name="group_by_id"), + path("group/<int:id_>", views.group, name="group_by_id"), path("group/<int:id_>/edit", views.edit_group, name="edit_group_by_id"), path("", views.index, name="index"), path("maintenance-mode/", include("maintenance_mode.urls")), diff --git a/biscuit/core/views.py b/biscuit/core/views.py index 507bc3439df41bd91c05635f75c952fe54acd87c..ce364c2de193e1853a649ec143820c857971cf91 100644 --- a/biscuit/core/views.py +++ b/biscuit/core/views.py @@ -41,7 +41,7 @@ def persons(request: HttpRequest) -> HttpResponse: @login_required -def person(request: HttpRequest, id_: int, template: str) -> HttpResponse: +def person(request: HttpRequest, id_: int) -> HttpResponse: context = {} # Get person and check access @@ -61,11 +61,11 @@ def person(request: HttpRequest, id_: int, template: str) -> HttpResponse: RequestConfig(request).configure(groups_table) context["groups_table"] = groups_table - return render(request, "core/person_%s.html" % template, context) + return render(request, "core/person_full.html" % context) @login_required -def group(request: HttpRequest, id_: int, template: str) -> HttpResponse: +def group(request: HttpRequest, id_: int) -> HttpResponse: context = {} # Get group and check if it exist @@ -96,7 +96,7 @@ def group(request: HttpRequest, id_: int, template: str) -> HttpResponse: RequestConfig(request).configure(owners_table) context["owners_table"] = owners_table - return render(request, "core/group_%s.html" % template, context) + return render(request, "core/group_full.html" % context) @login_required