ui changes in usermanagemment

This commit is contained in:
Faheedkhan 2025-06-17 14:45:58 +03:00
parent 82090ff820
commit c7bd1d7761
9 changed files with 14 additions and 48 deletions

View File

@ -12,7 +12,7 @@
<div class="row mt-4"> <div class="row mt-4">
<div class="d-flex justify-content-between mb-2"> <div class="d-flex justify-content-between mb-2">
<h3 class=""><i class="fa-solid fa-book"></i> {% trans "Audit Log Dashboard" %}</h3> <h3 class=""><i class="fas fa-right-to-bracket me-2"></i> {% trans "Audit Log Dashboard" %}</h3>
</div> </div>
<!-- Log Type Tabs --> <!-- Log Type Tabs -->
@ -55,7 +55,7 @@
<div class="d-flex"> <div class="d-flex">
{% include 'partials/pagination.html' with q='loginEvents' %} {% include 'partials/pagination.html' with q='loginEvents' %}
</div> </div>
</div> </div>
{% else %} {% else %}
<p>No authentication audit events found.</p> <p>No authentication audit events found.</p>

View File

@ -12,7 +12,7 @@
<div class="row mt-4"> <div class="row mt-4">
<div class="d-flex justify-content-between mb-2"> <div class="d-flex justify-content-between mb-2">
<h3 class=""><i class="fa-solid fa-book"></i> {% trans "Audit Log Dashboard" %}</h3> <h3 class=""><i class="fas fa-history me-2"></i>{% trans "Audit Log Dashboard" %}</h3>
</div> </div>
<!-- Log Type Tabs --> <!-- Log Type Tabs -->

View File

@ -12,7 +12,7 @@
<div class="row mt-4"> <div class="row mt-4">
<div class="d-flex justify-content-between mb-2"> <div class="d-flex justify-content-between mb-2">
<h3 class=""><i class="fa-solid fa-book"></i> {% trans "Audit Log Dashboard" %}</h3> <h3 class=""><i class="fas fa-file-alt me-2"></i> {% trans "Audit Log Dashboard" %}</h3>
</div> </div>
<!-- Log Type Tabs --> <!-- Log Type Tabs -->

View File

@ -26,11 +26,9 @@
} }
#djl-vendor-card-widget{ #djl-vendor-card-widget{
height:30rem;
max-height:30rem;
} }
</style> </style>
{% endblock %} {% endblock %}
@ -39,12 +37,14 @@
<div class="row g-4" > <div class="row g-4" >
<!-- Left Sidebar --> <!-- Left Sidebar -->
<div class="col-lg-4"> <div class="col-lg-4">
<div class="card shadow-sm"> <div class="card shadow-sm" >
<div class="card-body"> <div class="card-body">
{% include 'bill/includes/card_bill.html' with bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %} {% include 'bill/includes/card_bill.html' with bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %}
<hr class="my-4"> <hr class="my-4">
{% include 'django_ledger/vendor/includes/card_vendor.html' with vendor=bill.vendor %} {% include 'django_ledger/vendor/includes/card_vendor.html' with vendor=bill.vendor %}
<div class="d-grid mt-4">
<div class="d-grid mt-8">
<a href="{% url 'django_ledger:bill-list' entity_slug=view.kwargs.entity_slug %}" <a href="{% url 'django_ledger:bill-list' entity_slug=view.kwargs.entity_slug %}"
class="btn btn-phoenix-primary"> class="btn btn-phoenix-primary">
<i class="fas fa-arrow-left me-1"></i> {% trans 'Bill List' %} <i class="fas fa-arrow-left me-1"></i> {% trans 'Bill List' %}
@ -151,7 +151,7 @@
<th class="sort white-space-nowrap align-middle" scope="col">{% trans 'PO' %}</th> <th class="sort white-space-nowrap align-middle" scope="col">{% trans 'PO' %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="list" id="project-list-table-body">
{% for bill_item in itemtxs_qs %} {% for bill_item in itemtxs_qs %}
<tr> <tr>
<td class="align-middle white-space-nowrap"> <td class="align-middle white-space-nowrap">
@ -257,7 +257,7 @@
<h5 class="mb-0">{% trans 'Bill Transactions' %}</h5> <h5 class="mb-0">{% trans 'Bill Transactions' %}</h5>
</div> </div>
</div> </div>
<div class="card-body px-0 pt-0 pb-2"> <div class="card-body px-0 pt-0 pb-2 table-responsive">
{% transactions_table bill %} {% transactions_table bill %}
</div> </div>
</div> </div>

View File

@ -27,7 +27,7 @@
<div class="col-auto"> <div class="col-auto">
{% if perms.django_ledger.change_customermodel %} {% if perms.django_ledger.change_customermodel %}
<a href="{% url 'customer_update' customer.slug %}" class="btn btn-sm btn-phoenix-warning"><span class="fa-solid fa-pen-to-square me-2"></span>{{_("Update")}}</a> <a href="{% url 'customer_update' customer.slug %}" class="btn btn-sm btn-phoenix-primary"><span class="fa-solid fa-pen-to-square me-2"></span>{{_("Update")}}</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>

View File

@ -62,7 +62,7 @@
</tr> </tr>
{% empty %} {% empty %}
<tr> <tr>
<td>{% trans "No Permissions" %}</td> <td>{% trans "No User" %}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

View File

@ -32,7 +32,7 @@
<div class="text-danger">{{ error }}</div> <div class="text-danger">{{ error }}</div>
{% endfor %} {% endfor %}
<div class="d-flex mb-3"> <div class="d-flex mb-3">
<a href="{% url 'group_detail' group.pk %}" class="btn btn-phoenix-primary me-2 px-6"><i class="fa-solid fa-ban"></i> {% trans "Cancel"|capfirst %}</a> <a href="{% url 'group_detail' group.pk %}" class="btn btn-phoenix-primary me-2 "><i class="fa-solid fa-ban"></i> {% trans "Cancel"|capfirst %}</a>
<button class="btn btn-phoenix-primary" type="submit"> <button class="btn btn-phoenix-primary" type="submit">
<i class="fa-solid fa-floppy-disk"></i> <i class="fa-solid fa-floppy-disk"></i>
{{ _("Save") }} {{ _("Save") }}

View File

@ -106,9 +106,6 @@
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
<<<<<<< HEAD
<button type="submit" class="btn btn-phoenix-primary">Add New Item To Inventory</button>
=======
<div class="row g-4 mt-4"> <div class="row g-4 mt-4">
<div class="col"> <div class="col">
<p class="fs-5 mb-2">{% trans 'Exterior Colors' %}</p> <p class="fs-5 mb-2">{% trans 'Exterior Colors' %}</p>
@ -143,6 +140,5 @@
</div> </div>
</div> </div>
<button type="submit" class="btn btn-primary mt-5">Add New Item To Inventory</button> <button type="submit" class="btn btn-primary mt-5">Add New Item To Inventory</button>
>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
</form> </form>
{% endblock content %} {% endblock content %}

View File

@ -58,13 +58,8 @@ document.addEventListener('DOMContentLoaded', function() {
<h4 class="h6 mb-1">{% trans 'Contract' %}</h4> <h4 class="h6 mb-1">{% trans 'Contract' %}</h4>
<p class="mb-0">{{ po_model.ce_model.estimate_number }}</p> <p class="mb-0">{{ po_model.ce_model.estimate_number }}</p>
</div> </div>
<<<<<<< HEAD
<a href="{% url 'django_ledger:customer-estimate-detail' entity_slug=view.kwargs.entity_slug ce_pk=po_model.ce_model_id %}" <a href="{% url 'django_ledger:customer-estimate-detail' entity_slug=view.kwargs.entity_slug ce_pk=po_model.ce_model_id %}"
class="btn btn-sm btn-phoenix-info ms-auto"> class="btn btn-sm btn-phoenix-info ms-auto">
=======
<a href="{% url 'estimate_detail' po_model.ce_model_id %}"
class="btn btn-sm btn-outline-info ms-auto">
>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
{% trans 'View Contract' %} {% trans 'View Contract' %}
</a> </a>
</div> </div>
@ -197,7 +192,6 @@ document.addEventListener('DOMContentLoaded', function() {
onclick="showPOModal('Fulfill PO', '{% url 'po-action-mark-as-fulfilled' entity_slug po_model.pk %}', 'Mark As Fulfilled')"> onclick="showPOModal('Fulfill PO', '{% url 'po-action-mark-as-fulfilled' entity_slug po_model.pk %}', 'Mark As Fulfilled')">
<i class="fas fa-truck me-2"></i>{% trans 'Mark as Fulfilled' %} <i class="fas fa-truck me-2"></i>{% trans 'Mark as Fulfilled' %}
</button> </button>
<<<<<<< HEAD
<button class="btn btn-phoenix-danger" <button class="btn btn-phoenix-danger"
onclick="showPOModal('Cancel PO', '{% url 'po-action-mark-as-canceled' entity_slug po_model.pk %}', 'Mark As Cancelled')"> onclick="showPOModal('Cancel PO', '{% url 'po-action-mark-as-canceled' entity_slug po_model.pk %}', 'Mark As Cancelled')">
<i class="fas fa-ban me-2"></i>{% trans 'Cancel' %} <i class="fas fa-ban me-2"></i>{% trans 'Cancel' %}
@ -225,30 +219,6 @@ document.addEventListener('DOMContentLoaded', function() {
<i class="fas fa-window-close me-2"></i>{% trans 'Cancel' %} <i class="fas fa-window-close me-2"></i>{% trans 'Cancel' %}
</button> </button>
{% modal_action_v2 bill po_model.get_mark_as_canceled_url po_model.get_mark_as_canceled_message po_model.get_mark_as_canceled_html_id %} {% modal_action_v2 bill po_model.get_mark_as_canceled_url po_model.get_mark_as_canceled_message po_model.get_mark_as_canceled_html_id %}
=======
{% endif %}
{# Danger Action Buttons #}
{% if po_model.can_delete %}
<button class="btn btn-outline-danger"
onclick="showPOModal('Cancel PO', '{% url 'po-delete' entity_slug po_model.pk %}', 'Mark As Cancelled')">
<i class="fas fa-ban me-2"></i>{% trans 'Delete' %}
</button>
{% endif %}
{% if po_model.can_void %}
<button class="btn btn-outline-danger"
onclick="showPOModal('Void PO', '{% url 'po-action-mark-as-void' entity_slug po_model.pk %}', 'Mark As Void')">
<i class="fas fa-times-circle me-2"></i>{% trans 'Void' %}
</button>
{% endif %}
{% if po_model.can_cancel %}
<button class="btn btn-outline-danger"
onclick="showPOModal('Cancel PO', '{% url 'po-action-mark-as-canceled' entity_slug po_model.pk %}', 'Mark As Cancelled')">
<i class="fas fa-ban me-2"></i>{% trans 'Cancel' %}
</button>
>>>>>>> 90fea4d25623ba4dd0f6fd2390e23b40857b6dff
{% endif %} {% endif %}
</div> </div>
</div> </div>