diff --git a/tasks/templates/tasks/base.djhtml b/tasks/templates/tasks/base.djhtml new file mode 100644 index 0000000..7487695 --- /dev/null +++ b/tasks/templates/tasks/base.djhtml @@ -0,0 +1,30 @@ + + + + + + + + + + {% block title %}{% endblock %} + + + + +
+ {% block content %}{% endblock %} +
+ + + + + + diff --git a/tasks/templates/tasks/index.djhtml b/tasks/templates/tasks/index.djhtml new file mode 100644 index 0000000..840cee4 --- /dev/null +++ b/tasks/templates/tasks/index.djhtml @@ -0,0 +1,27 @@ +{% extends "./base.djhtml" %} + +{% block title %} RecMaint {% endblock %} + +{% block content %} +

Tools

+ {% if tools %} + + {% else %} +

No tools are available.

+ {% endif %} + +

Tasks

+ {% if tasks %} + + {% else %} +

No tasks are available.

+ {% endif %} +{% endblock %} diff --git a/tasks/templates/tasks/index.html b/tasks/templates/tasks/index.html deleted file mode 100644 index 12faf37..0000000 --- a/tasks/templates/tasks/index.html +++ /dev/null @@ -1,21 +0,0 @@ -

Tools

-{% if tools %} - -{% else %} -

No tools are available.

-{% endif %} - -

Tasks

-{% if tasks %} - -{% else %} -

No tasks are available.

-{% endif %} diff --git a/tasks/templates/tasks/notificationEmail.txt b/tasks/templates/tasks/notificationEmail.txt.dtl similarity index 100% rename from tasks/templates/tasks/notificationEmail.txt rename to tasks/templates/tasks/notificationEmail.txt.dtl diff --git a/tasks/templates/tasks/taskDetail.djhtml b/tasks/templates/tasks/taskDetail.djhtml new file mode 100644 index 0000000..0d84f5b --- /dev/null +++ b/tasks/templates/tasks/taskDetail.djhtml @@ -0,0 +1,37 @@ +{% extends "./base.djhtml" %} + +{% block title %} {{ tool.name }} - {{ task.name }} | RecMaint {% endblock %} + +{% block content %} + + +

Next scheduled time: {{ task.next_recurrence|date }}

+

Overdue: {{ task.is_overdue }}

+ +
+ {% csrf_token %} + {{ form }} + +
+ + + + + + + + {% for event in events %} + + + + + + {% endfor %} +
Date User Notes
{{ event.date }} {{ event.user }} {{ event.notes }}
+{% endblock %} diff --git a/tasks/templates/tasks/taskDetail.html b/tasks/templates/tasks/taskDetail.html deleted file mode 100644 index 481b61c..0000000 --- a/tasks/templates/tasks/taskDetail.html +++ /dev/null @@ -1,25 +0,0 @@ -

{{ tool }}

-

{{ task.name }}

-

Next scheduled time: {{ task.next_recurrence|date }}

-

Overdue: {{ task.is_overdue }}

- -
- {% csrf_token %} - {{ form }} - -
- - - - - - - - {% for event in events %} - - - - - - {% endfor %} -
Date User Notes
{{ event.date }} {{ event.user }} {{ event.notes }}
diff --git a/tasks/templates/tasks/toolDetail.djhtml b/tasks/templates/tasks/toolDetail.djhtml new file mode 100644 index 0000000..06193f7 --- /dev/null +++ b/tasks/templates/tasks/toolDetail.djhtml @@ -0,0 +1,18 @@ +{% extends "./base.djhtml" %} + +{% block title %} {{ tool }} {% endblock %} + +{% block content %} + + + +{% endblock %} diff --git a/tasks/templates/tasks/toolDetail.html b/tasks/templates/tasks/toolDetail.html deleted file mode 100644 index 6c025fe..0000000 --- a/tasks/templates/tasks/toolDetail.html +++ /dev/null @@ -1,6 +0,0 @@ -

{{ tool }}

- - -{% for task in tasks %} -
  • {{ task.name }}
    • -{% endfor %} diff --git a/tasks/views.py b/tasks/views.py index e12b2fc..de03d88 100644 --- a/tasks/views.py +++ b/tasks/views.py @@ -12,7 +12,7 @@ def index(request): 'tools': Tool.objects.all(), 'tasks': Task.objects.all(), } - return render(request, 'tasks/index.html', context) + return render(request, 'tasks/index.djhtml', context) def toolDetail(request, asset_tag): @@ -22,7 +22,7 @@ def toolDetail(request, asset_tag): 'tool': tool, 'tasks': tasks, } - return render(request, 'tasks/toolDetail.html', context) + return render(request, 'tasks/toolDetail.djhtml', context) def taskDetail(request, asset_tag, task_slug): @@ -48,4 +48,4 @@ def taskDetail(request, asset_tag, task_slug): 'events': events, 'form': form, } - return render(request, 'tasks/taskDetail.html', context) + return render(request, 'tasks/taskDetail.djhtml', context)