inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 21:45:39 +00:00
Code Activity

Merge branch 'inventree:master' into plugin-2037

Browse Source
This commit is contained in:
Matthias Mair
2021-09-24 00:32:22 +02:00
committed by GitHub
parent 95480559f5 39cab4690d
commit acc4d8d9e8
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/templates/js/translated/part.js
View File

@ -768,7 +768,7 @@ function partGridTile(part) {
var html = `
<div class='col-sm-3 card'>
<div class='panel panel-default panel-inventree'>
<div class='panel panel-default panel-inventree product-card-panel'>
<div class='panel-heading'>
<a href='/part/${part.pk}/'>
<b>${part.full_name}</b>
@ -1007,7 +1007,7 @@ function loadPartTable(table, url, options={}) {
// Force a new row every 4 columns, to prevent visual issues
if ((index > 0) && (index % 4 == 0) && (index < data.length)) {
html += `</div><div class='row'>`;
html += `</div><div class='row full-height'>`;
}
html += partGridTile(row);

10
InvenTree/templates/navbar.html
View File

@ -89,11 +89,7 @@
<a class='dropdown-toggle' data-toggle='dropdown' href="#">
{% if user.is_staff %}
{% if not system_healthy %}
{% if not django_q_running %}
<span class='fas fa-exclamation-triangle icon-red'></span>
{% else %}
<span class='fas fa-exclamation-triangle icon-orange'></span>
{% endif %}
{% elif not up_to_date %}
<span class='fas fa-info-circle icon-green'></span>
{% endif %}
@ -114,11 +110,7 @@
{% if system_healthy or not user.is_staff %}
<span class='fas fa-server'></span>
{% else %}
{% if not django_q_running %}
<span class='fas fa-server icon-red'></span>
{% else %}
<span class='fas fa-server icon-orange'></span>
{% endif %}
<span class='fas fa-server icon-red'></span>
{% endif %}
</span> {% trans "System Information" %}
</a></li>