diff --git a/RIGS/templates/calendar.html b/RIGS/templates/calendar.html index 3bb58ecb..25a33931 100644 --- a/RIGS/templates/calendar.html +++ b/RIGS/templates/calendar.html @@ -214,7 +214,7 @@
-
+
{% endblock %} diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html index a1401912..0b56690a 100644 --- a/RIGS/templates/event_detail.html +++ b/RIGS/templates/event_detail.html @@ -88,12 +88,9 @@
Event Details
{% if perms.RIGS.view_event %} -
-
Notes
-
-

{{ event.notes|linebreaksbr }}

-
-
+

Notes

+
+

{{ event.notes|linebreaksbr }}

{% endif %}
{% include 'item_table.html' %} diff --git a/RIGS/templates/event_print.xml b/RIGS/templates/event_print.xml index 308c0c34..13e073e7 100644 --- a/RIGS/templates/event_print.xml +++ b/RIGS/templates/event_print.xml @@ -33,12 +33,12 @@ - + - + @@ -87,7 +87,7 @@ {# logo positioned 42 from left, 33 from top #} - + TEC PA & Lighting @@ -97,7 +97,7 @@ info@nottinghamtec.co.uk Phone: (0115) 846 8720 - + [Page of ] @@ -106,7 +106,7 @@ [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}] - + @@ -114,7 +114,7 @@ - + [Page of ] @@ -127,7 +127,7 @@ - {% include 'event_print_page.xml" %} + {% include "event_print_page.xml" %} diff --git a/RIGS/templates/person_detail.html b/RIGS/templates/person_detail.html index 6df87e34..e1686022 100644 --- a/RIGS/templates/person_detail.html +++ b/RIGS/templates/person_detail.html @@ -4,75 +4,75 @@ {% block title %}Person | {{ object.name }}{% endblock %} {% block content %} -
- {% if not request.is_ajax %} -
-

Person | {{ object.name }}

-
- -
-
- Edit -
-
- {% endif %} -
-
-
Person Details
-
-
-
Name
-
{{ object.name }}
- -
Phone
-
{{ object.phone }}
- -
Email
-
{{ object.email }}
- -
Address
-
{{ object.address|linebreaksbr }}
- -
Notes
-
{{ object.notes|linebreaksbr }}
-
-
-
-
-
-
-
Associated Organisations
- -
-
-
- -
-
-
-
Associated Events
- {% with object.latest_events as events %} - {% include 'event_table.html' %} - {% endwith %} -
-
-
+
{% if not request.is_ajax %} -
-
-
- Edit -
- {% include 'partials/last_edited.html' with target="person_history" %} +
+

Person | {{ object.name }}

+
+ +
+
+ Edit
{% endif %} +
+
+
Person Details
+
+
+
Name
+
{{ object.name }}
+ +
Phone
+
{{ object.phone }}
+ +
Email
+
{{ object.email }}
+ +
Address
+
{{ object.address|linebreaksbr }}
+ +
Notes
+
{{ object.notes|linebreaksbr }}
+
+
+
+
+
+
+
Associated Organisations
+ +
+
+
+ +
+
+
+
Associated Events
+ {% with object.latest_events as events %} + {% include 'event_table.html' %} + {% endwith %} +
+
+
+{% if not request.is_ajax %} +
+
+
+ Edit +
+ {% include 'partials/last_edited.html' with target="person_history" %} +
+
+{% endif %} {% endblock %} {% if request.is_ajax %} diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html index b50b6ff1..51157954 100644 --- a/assets/templates/asset_list.html +++ b/assets/templates/asset_list.html @@ -42,22 +42,7 @@ New -
- - - - - - - - - - - - {% include 'partials/asset_list_table_body.html' %} - -
Asset IDDescriptionCategoryStatusQuick Links
-
+{% include 'partials/asset_list_table.html' %} {% if is_paginated %}
diff --git a/assets/templates/partials/asset_list_table.html b/assets/templates/partials/asset_list_table.html new file mode 100644 index 00000000..e33c3b7a --- /dev/null +++ b/assets/templates/partials/asset_list_table.html @@ -0,0 +1,36 @@ +
+ + + + + + + + + + + + {% for item in object_list %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
Asset IDDescriptionCategoryStatusQuick Links
{{ item.asset_id }}{{ item.description }}{{ item.category }}{{ item.status }} +
+ View + {% if perms.assets.change_asset %} + Edit + Duplicate + {% endif %} +
+
Nothing found
+
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html deleted file mode 100644 index fbcb9503..00000000 --- a/assets/templates/partials/asset_list_table_body.html +++ /dev/null @@ -1,22 +0,0 @@ -{% for item in object_list %} - - {{ item.asset_id }} - {{ item.description }} - {{ item.category }} - {{ item.status }} - -
- View - {% if perms.assets.change_asset %} - Edit - Duplicate - {% endif %} -
- - - {% empty %} - - - Nothing found - -{% endfor %} diff --git a/assets/templates/supplier_detail.html b/assets/templates/supplier_detail.html index a7889611..800196e9 100644 --- a/assets/templates/supplier_detail.html +++ b/assets/templates/supplier_detail.html @@ -1,73 +1,75 @@ -{% extends 'base_assets.html' %} +{% extends request.is_ajax|yesno:'base_ajax.html,base_assets.html' %} {% block title %}Supplier | {{ object.name }}{% endblock %} {% block content %}
- {% if not request.is_ajax %} -
-

Supplier | {{ object.name }}

-
- -
-
- Edit -
-
- {% endif %} -
-
-
Supplier Details
-
-
-
Name
-
{{ object.name }}
-
-
-
-
-
- -
-
-
-
Associated Assets
-
- - - - - - - - - - - - {% with object.assets.all as object_list %} - {% include 'partials/asset_list_table_body.html' %} - {% endwith %} - -
Asset IDDescriptionCategoryStatus
-
-
-
-
- - {% if not request.is_ajax %} -
-
-
- Edit -
- +
+

Supplier | {{ object.name }}

+
+
+
+ Edit
{% endif %} +
+
+
Supplier Details
+
+
+
Name
+
{{ object.name }}
+ +
Phone
+
{% if object.phone %}{% endif %}{{ object.phone }}{% if object.phone %}{% endif %}
+ +
Email
+
{% if object.email %}{% endif %}{{ object.email }}{% if object.email %}{% endif %}
+ +
Address
+
{{ object.address|linebreaksbr }}
+ +
Notes
+
{{ object.notes|linebreaksbr }}
+
+
+
+
+
+
+
Associated Assets
+ {% with object.assets.all as object_list %} + {% include 'partials/asset_list_table.html' %} + {% endwith %} +
+
+
+{% if not request.is_ajax %} +
+
+
+ Edit +
+ {% include 'partials/last_edited.html' with target="supplier_history" %} +
+
+{% endif %} {% endblock %} +{% if request.is_ajax %} +{% block footer %} +
+
+
+ Open Page + Edit +
+ {% include 'partials/last_edited.html' with target="supplier_history" %} +
+
+{% endblock %} +{% endif %}