diff options
Diffstat (limited to '')
3 files changed, 35 insertions, 23 deletions
diff --git a/ctrack/caf/templates/caf/applicablesystem_detail.html b/ctrack/caf/templates/caf/applicablesystem_detail.html index 725435e..698ee4e 100644 --- a/ctrack/caf/templates/caf/applicablesystem_detail.html +++ b/ctrack/caf/templates/caf/applicablesystem_detail.html @@ -5,13 +5,19 @@ {% block title %}{{ object.name }}{% endblock %} {% block content %} - <div class="container"> + <div class="container mt-3"> <div class="row"> - <div class="col-sm-12"> - <h3>{{ object.name }}</h3> - <h5>Description</h5> - <p>{{ object.description }}</p> - <p>Contained within CAF: to <a href="{% url "caf:detail" object.caf.pk %}">{{ object.caf }}</a></p> + <div class="col-sm-12 pl-0 my-2"> + <div class="row"> + <h4>{{ object.name }}</h4> + </div> + <div class="row"> + <h5>Description</h5> + </div> + <div class="row"> + <p>{{ object.description }}</p> + <p>Contained within CAF: to <a href="{% url "caf:detail" object.caf.pk %}">{{ object.caf }}</a></p> + </div> </div> </div> </div> diff --git a/ctrack/caf/templates/caf/caf_detail.html b/ctrack/caf/templates/caf/caf_detail.html index 7b7fc6d..aef275d 100644 --- a/ctrack/caf/templates/caf/caf_detail.html +++ b/ctrack/caf/templates/caf/caf_detail.html @@ -62,17 +62,26 @@ <div class="col-md-12 my-2"> <div class="card bg-light"> <div class="card-body"> - <div class="card-title text-muted">Applicable Systems <a + <div class="card-title text-muted">NIS Systems <a href="{% url "caf:as_create_from_caf" object.pk %}" class="btn btn-primary btn-sm float-right">Add - new...</a></small></div> + new...</a></div> <div> <table class="table table-responsive"> - {% for system in systems %} - <tr> - <td><strong>{{ system.name }}</strong></td> - <td>{{ system.description }}</td> - </tr> - {% endfor %} + {% if systems|length > 0 %} + {% for system in systems %} + <tr> + <td><a href="{% url "caf:ass_detail" system.id %}">{{ system.name }}</a></td> + <td>{{ system.description }}<br> + <a href="{% url "caf:detail" system.caf.pk %}" class="small"> + {{ system.caf }} + </a> <span class="text-muted"> | <a href="#" class="small">Edit System</a></span> + </td> + </tr> + {% endfor %} + {% else %} + <a class="btn btn-primary" href="{% url "caf:create_from_org" object.slug %}" role="button">Add + new...</a> + {% endif %} </table> </div> </div> diff --git a/ctrack/organisations/templates/organisations/organisation_detail.html b/ctrack/organisations/templates/organisations/organisation_detail.html index 4d16c29..daec5a9 100644 --- a/ctrack/organisations/templates/organisations/organisation_detail.html +++ b/ctrack/organisations/templates/organisations/organisation_detail.html @@ -69,21 +69,19 @@ <div class="col-md-12 my-2"> <div class="card bg-light"> <div class="card-body"> - <div class="card-title">NIS Systems</div> - <div class="card-text"> - <div class="table-responsive"> + <div class="card-title">NIS Systems <a + href="{% url "caf:as_create_from_caf" object.pk %}" class="btn btn-primary btn-sm float-right">Add + new...</a></div> + <div class="table table-responsive"> <table class="table"> {% if applicable_systems|length > 0 %} {% for ass in applicable_systems %} <tr> - <td><strong>{{ ass.name }}</strong></td> + <td><a href="{% url "caf:ass_detail" ass.id %}">{{ ass.name }}</a></td> <td>{{ ass.description }}<br> <a href="{% url "caf:detail" ass.caf.pk %}" class="small"> {{ ass.caf }} - </a> <span class="text-muted">|</span> <a href="{% url "caf:ass_detail" ass.pk %}" - class="small">System - Detail</a> - <span class="text-muted">|</span> <a href="#" class="small">Edit System</a> + </a> <span class="text-muted"> | <a href="#" class="small">Edit System</a></span> </td> </tr> {% endfor %} @@ -93,7 +91,6 @@ {% endif %} </table> </div> - </div> </div> </div> </div> |