Merge pull request #215 from eReuse/bugfix/minor-ui-changes
Bugfix/minor UI changes
This commit is contained in:
commit
a7d5a3917d
|
@ -53,7 +53,7 @@
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a class="dropdown-item d-flex align-items-center" href="pages-faq.html">
|
<a class="dropdown-item d-flex align-items-center" href="https://help.usody.com/" target="_blank">
|
||||||
<i class="bi bi-question-circle"></i>
|
<i class="bi bi-question-circle"></i>
|
||||||
<span>Need Help?</span>
|
<span>Need Help?</span>
|
||||||
</a>
|
</a>
|
||||||
|
@ -195,7 +195,11 @@
|
||||||
{% block messages %}
|
{% block messages %}
|
||||||
{% for level, message in get_flashed_messages(with_categories=true) %}
|
{% for level, message in get_flashed_messages(with_categories=true) %}
|
||||||
<div class="alert alert-{{ level}} alert-dismissible fade show" role="alert">
|
<div class="alert alert-{{ level}} alert-dismissible fade show" role="alert">
|
||||||
<i class="bi bi-{{ session['_message_icon'][level]}} me-1"></i>
|
{% if '_message_icon' in session %}
|
||||||
|
<i class="bi bi-{{ session['_message_icon'][level]}} me-1"></i>
|
||||||
|
{% else %}<!-- fallback if 3rd party libraries (e.g. flask_login.login_required) -->
|
||||||
|
<i class="bi bi-info-circle me-1"></i>
|
||||||
|
{% endif %}
|
||||||
{{ message }}
|
{{ message }}
|
||||||
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
<h1>Profile</h1>
|
<h1>Profile</h1>
|
||||||
<nav>
|
<nav>
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
<li class="breadcrumb-item"><a href="index.html">Home</a></li>
|
|
||||||
<li class="breadcrumb-item">Users</li>
|
<li class="breadcrumb-item">Users</li>
|
||||||
<li class="breadcrumb-item active">Profile</li>
|
<li class="breadcrumb-item active">Profile</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
@ -28,7 +27,7 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-xl-8">
|
<div class="col-xl-8 d-none"><!-- TODO (hidden until is implemented )-->
|
||||||
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body pt-3">
|
<div class="card-body pt-3">
|
||||||
|
|
|
@ -38,15 +38,15 @@
|
||||||
<div><!-- lot actions -->
|
<div><!-- lot actions -->
|
||||||
{% if lot.is_temporary %}
|
{% if lot.is_temporary %}
|
||||||
<span class="d-none" id="activeRemoveLotModal" data-bs-toggle="modal" data-bs-target="#btnRemoveLots"></span>
|
<span class="d-none" id="activeRemoveLotModal" data-bs-toggle="modal" data-bs-target="#btnRemoveLots"></span>
|
||||||
<a class="me-2" href="javascript:removeLot()">
|
|
||||||
<i class="bi bi-trash"></i> Remove Lot
|
|
||||||
</a>
|
|
||||||
<a class="me-2" href="javascript:newTrade('user_from')">
|
<a class="me-2" href="javascript:newTrade('user_from')">
|
||||||
<i class="bi bi-arrow-down-right"></i> Add supplier
|
<i class="bi bi-arrow-down-right"></i> Add supplier
|
||||||
</a>
|
</a>
|
||||||
<a href="javascript:newTrade('user_to')">
|
<a class="me-2" href="javascript:newTrade('user_to')">
|
||||||
<i class="bi bi-arrow-up-right"></i> Add receiver
|
<i class="bi bi-arrow-up-right"></i> Add receiver
|
||||||
</a>
|
</a>
|
||||||
|
<a class="text-danger" href="javascript:removeLot()">
|
||||||
|
<i class="bi bi-trash"></i> Delete Lot
|
||||||
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -241,7 +241,7 @@
|
||||||
{{ f }}
|
{{ f }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
<a href="javascript:$('#print_labels').submit()" class="dropdown-item">
|
<a href="javascript:$('#print_labels').submit()" class="dropdown-item">
|
||||||
<i class="bi bi-x"></i>
|
<i class="bi bi-printer"></i>
|
||||||
Print labels
|
Print labels
|
||||||
</a>
|
</a>
|
||||||
</form>
|
</form>
|
||||||
|
@ -261,7 +261,7 @@
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="{{ url_for('inventory.upload_snapshot') }}" class="dropdown-item">
|
<a href="{{ url_for('inventory.upload_snapshot') }}" class="dropdown-item">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<i class="bi bi-plus"></i>
|
<i class="bi bi-upload"></i>
|
||||||
Upload a new Snapshot
|
Upload a new Snapshot
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
@ -400,7 +400,7 @@
|
||||||
{% include "inventory/addDeviceslot.html" %}
|
{% include "inventory/addDeviceslot.html" %}
|
||||||
{% include "inventory/addDevicestag.html" %}
|
{% include "inventory/addDevicestag.html" %}
|
||||||
{% include "inventory/removeDeviceslot.html" %}
|
{% include "inventory/removeDeviceslot.html" %}
|
||||||
{% include "inventory/removelot.html" %}
|
{% include "inventory/lot_delete_modal.html" %}
|
||||||
{% include "inventory/actions.html" %}
|
{% include "inventory/actions.html" %}
|
||||||
{% include "inventory/allocate.html" %}
|
{% include "inventory/allocate.html" %}
|
||||||
{% include "inventory/data_wipe.html" %}
|
{% include "inventory/data_wipe.html" %}
|
||||||
|
|
|
@ -3,21 +3,21 @@
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
|
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h5 class="modal-title">Remove Lot</h5>
|
<h5 class="modal-title">Delete Lot</h5>
|
||||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
Are you sure that you want to remove lot <strong>{{ lot.name }}</strong>?
|
Are you sure that you want to delete lot <strong>{{ lot.name }}</strong>?
|
||||||
<p class="text-danger">
|
<p class="text-danger">
|
||||||
There are devices in this lot, are you sure you want to delete it?
|
This action cannot be undone.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
|
<button type="button" class="btn btn-secondary-outline" data-bs-dismiss="modal">Cancel</button>
|
||||||
<a href="{{ url_for('inventory.lot_del', id=lot.id)}}" type="button" class="btn btn-primary">
|
<a href="{{ url_for('inventory.lot_del', id=lot.id)}}" type="button" class="btn btn-danger">
|
||||||
Confirm
|
Delete it!
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
Reference in a new issue