Skip to content

Commit

Permalink
fix: make responsive forms for inventory and facilities pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@saladgg
saladgg committed Sep 3, 2021
1 parent 271bc24 commit 87ee6f6
Show file tree
Hide file tree
Showing 10 changed files with 2,090 additions and 1,704 deletions.
3,449 changes: 1,919 additions & 1,530 deletions fahari/static/css/project.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fahari/static/css/project.min.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions fahari/static/sass/project.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ $red: #b94a48;
margin: auto !important;
}

.row.align-header {
.row.align-page-content {
display: grid !important;
}

.dropdown-menu.show {
max-width: 80%;
max-width: 80%;
}
2 changes: 1 addition & 1 deletion fahari/templates/common/facility_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% if perms.common.change_facility %}
<div class="row">
<div class="col-xl-10 col-lg-10 col-md-10 col-sm-12">
<div class="row align-header">
<div class="row align-page-content">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %} {% if perms.common.delete_facility %}
Expand Down
2 changes: 1 addition & 1 deletion fahari/templates/common/facilityuser_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<div class="row">
<div class="col-xl-10 col-lg-10 col-md-10 col-sm-12">
<div class="row align-header">
<div class="row align-page-content">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %} {% if perms.common.delete_facilityuser %}
Expand Down
2 changes: 1 addition & 1 deletion fahari/templates/common/system_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<div class="row">
<div class="col-xl-10 col-lg-10 col-md-10 col-sm-12">
<div class="row align-header">
<div class="row align-page-content">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %} {% if perms.common.delete_system %}
Expand Down
74 changes: 37 additions & 37 deletions fahari/templates/ops/commodity_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,46 @@
{% block content %}
<a href="{% url 'ops:commodities' %}">&larr; Back</a>
{% if perms.common.change_system %}
<div class="row">
<div class="col-xl-10 col-lg-12 col-md-9 col-sm-10">
<div class="card shadow my-2">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %}
{% if perms.common.delete_system %}
<a href="{% url 'ops:commodity_delete' object.pk %}" class="btn btn-danger btn-icon-split">
<span class="icon text-white-50">
<i class="fas fa-trash"></i>
</span>
<span class="text">Delete Commodity</span>
</a>
{% endif %}
{% endif %}
</div>
</div>
<div class="card-body p-0">
<div class="row">
<div class="col-lg-2 d-none d-lg-block">
</div>
<div class="col-lg-6">
<div class="p-5">
<div class="text-left">
<h1 class="h4 text-gray-900 mb-4">
{% if object.pk %}
Edit Commodity
{% else %}
Create Commodity
{% endif %}
</h1>
</div>
{% crispy form %}
</div>
</div>
</div>
</div>

<div class="row">
<div class="col-xl-10 col-lg-10 col-md-10 col-sm-12">
<div class="row align-page-content">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %}
{% if perms.common.delete_system %}
<a href="{% url 'ops:commodity_delete' object.pk %}" class="btn btn-danger btn-icon-split">
<span class="icon text-white-50">
<i class="fas fa-trash"></i>
</span>
<span class="text">Delete Commodity</span>
</a>
{% endif %}
{% endif %}
</div>
</div>

<div class="row d-block">
<div class="col-lg-2"></div>
<div class="col-lg-8 center-form">
<div class="p-lg-5 p-xs-1 p-sm-1">
<div class="text-left">
<h1 class="h4 text-gray-900 mb-4">
{% if object.pk %}
Edit Commodity
{% else %}
Create Commodity
{% endif %}
</h1>
</div>
{% crispy form %}
</div>
</div>
</div>
</div>
</div>
</div>

{% else %}
<p>You do not have permission to edit commodities.</p>
{% endif %}
Expand Down
86 changes: 39 additions & 47 deletions fahari/templates/ops/facilitysystem_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,45 @@

{% extends "base.html" %}
{% load crispy_forms_tags %}
{% block title %}
Register/Amend Facility System
{% endblock title %}
{% block content %}
{% extends "base.html" %} {% load crispy_forms_tags %} {% block title %}
Register/Amend Facility System {% endblock title %} {% block content %}
<a href="{% url 'ops:versions' %}">&larr; Back</a>
{% if perms.ops.change_facilitysystem %}
<div class="row">
<div class="col-xl-10 col-lg-12 col-md-9 col-sm-10">
<div class="card shadow my-2">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %}
{% if perms.ops.delete_facilitysystem %}
<a href="{% url 'ops:version_delete' object.pk %}" class="btn btn-danger btn-icon-split">
<span class="icon text-white-50">
<i class="fas fa-trash"></i>
</span>
<span class="text">Delete Version</span>
</a>
{% endif %}
{% endif %}
</div>
</div>
<div class="card-body p-0">
<div class="row">
<div class="col-lg-2 d-none d-lg-block">
</div>
<div class="col-lg-6">
<div class="p-5">
<div class="text-left">
<h1 class="h4 text-gray-900 mb-4">
{% if object.pk %}
Edit Version
{% else %}
Create Version
{% endif %}
</h1>
</div>
{% crispy form %}
</div>
</div>
</div>
</div>

<div class="row">
<div class="col-xl-10 col-lg-10 col-md-10 col-sm-12">
<div class="row align-page-content">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %} {% if perms.ops.delete_facilitysystem %}
<a
href="{% url 'ops:version_delete' object.pk %}"
class="btn btn-danger btn-icon-split"
>
<span class="icon text-white-50">
<i class="fas fa-trash"></i>
</span>
<span class="text">Delete Version</span>
</a>
{% endif %} {% endif %}
</div>
</div>

<div class="row d-block">
<div class="col-lg-2"></div>
<div class="col-lg-8 center-form">
<div class="p-lg-5 p-xs-1 p-sm-1">
<div class="text-left">
<h1 class="h4 text-gray-900 mb-4">
{% if object.pk %} Edit Version {% else %} Create Version
{%endif %}
</h1>
</div>
{% crispy form %}
</div>
</div>
</div>
</div>
</div>
</div>

{% else %}
<p>You do not have permission to edit system versions.</p>
{% endif %}
{% endblock content %}
<p>You do not have permission to edit system versions.</p>
{% endif %} {% endblock content %}
99 changes: 52 additions & 47 deletions fahari/templates/ops/facilitysystemticket_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

{% extends "base.html" %}
{% load crispy_forms_tags %}
{% block title %}
Expand All @@ -7,56 +6,62 @@
{% block content %}
<a href="{% url 'ops:tickets' %}">&larr; Back</a>
{% if perms.ops.change_facilitysystemticket %}
<div class="row">
<div class="col-xl-10 col-lg-12 col-md-9 col-sm-10">
<div class="card shadow my-2">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %}
{% if perms.ops.delete_facilitysystemticket %}
<a href="{% url 'ops:ticket_delete' object.pk %}" class="btn btn-danger btn-icon-split">
<span class="icon text-white-50">
<i class="fas fa-trash"></i>
</span>
<span class="text">Delete Ticket</span>
</a>
{% endif %}

{% if perms.ops.can_resolve_ticket and not object.is_resolved %}
<a href="{% url 'ops:ticket_resolve' object.pk %}" class="btn btn-secondary btn-icon-split">
<span class="icon text-white-50">
<i class="fas fa-thumbs-up"></i>
</span>
<span class="text">Resolve Ticket</span>
</a>
{% endif %}
{% endif %}
</div>
</div>
<div class="card-body p-0">
<div class="row">
<div class="col-lg-2 d-none d-lg-block">
</div>
<div class="col-lg-6">
<div class="p-5">
<div class="text-left">
<h1 class="h4 text-gray-900 mb-4">
{% if object.pk %}
Edit Ticket
{% else %}
Create Ticket
{% endif %}
</h1>
</div>
{% crispy form %}
</div>
</div>
</div>
</div>

<div class="row">
<div class="col-xl-10 col-lg-10 col-md-10 col-sm-12">
<div class="row align-page-content">
<div class="card-header">
<div class="toolbar float-right">
{% if object.pk %}
{% if perms.ops.delete_facilitysystemticket %}
<a href="{% url 'ops:ticket_delete' object.pk %}" class="btn btn-danger btn-icon-split">
<span class="icon text-white-50">
<i class="fas fa-trash"></i>
</span>
<span class="text">Delete Ticket</span>
</a>
{% endif %}

{% if perms.ops.can_resolve_ticket and not object.is_resolved %}
<a href="{% url 'ops:ticket_resolve' object.pk %}" class="btn btn-secondary btn-icon-split">
<span class="icon text-white-50">
<i class="fas fa-thumbs-up"></i>
</span>
<span class="text">Resolve Ticket</span>
</a>
{% endif %}
{% endif %}
</div>
</div>

<div class="row d-block">
<div class="col-lg-2"></div>
<div class="col-lg-8 col-xs-10 center-form">
<div class="p-lg-5 p-xs-1 p-sm-1">
<div class="text-left">
<h1 class="h4 text-gray-900 mb-4">
{% if object.pk %}
Edit Ticket
{% else %}
Create Ticket
{% endif %}
</h1>
</div>
{% crispy form %}
</div>
</div>
</div>
</div>
</div>
</div>






{% else %}
<p>You do not have permission to edit tickets.</p>
{% endif %}
{% endblock content %}
Loading complete
Loading

0 comments on commit 87ee6f6

Please sign in to comment.