Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'inventree:master' into matmair/issue2201

Browse Source
This commit is contained in:
Matthias Mair 2021-11-06 15:43:59 +01:00 committed by GitHub
commit 7cd04f289c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/static/css/inventree.css
View File

@ -134,6 +134,7 @@
.navbar { .navbar {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
background-color: var(--secondary-color); background-color: var(--secondary-color);
box-shadow: 0px 5px 5px rgb(0 0 0 / 5%);
} }
.navbar-brand { .navbar-brand {
@ -829,6 +830,7 @@ input[type="submit"] {
color: var(--bs-body-color); color: var(--bs-body-color);
background-color: var(--secondary-color); background-color: var(--secondary-color);
border-bottom: 1px solid var(--border-color); border-bottom: 1px solid var(--border-color);
box-shadow: 0px 5px 5px rgb(0 0 0 / 5%);
} }
.panel { .panel {

4
InvenTree/order/templates/order/sales_order_base.html
View File

@ -16,7 +16,7 @@
{% block thumbnail %} {% block thumbnail %}
<img class='part-thumb' <img class='part-thumb'
{% if order.customer.image %} {% if order.customer and order.customer.image %}
src="{{ order.customer.image.url }}" src="{{ order.customer.image.url }}"
{% else %} {% else %}
src="{% static 'img/blank_image.png' %}" src="{% static 'img/blank_image.png' %}"
@ -106,11 +106,13 @@ src="{% static 'img/blank_image.png' %}"
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{% if order.customer %}
<tr> <tr>
<td><span class='fas fa-building'></span></td> <td><span class='fas fa-building'></span></td>
<td>{% trans "Customer" %}</td> <td>{% trans "Customer" %}</td>
<td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html"%}</td> <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html"%}</td>
</tr> </tr>
{% endif %}
{% if order.customer_reference %} {% if order.customer_reference %}
<tr> <tr>
<td><span class='fas fa-hashtag'></span></td> <td><span class='fas fa-hashtag'></span></td>

2
InvenTree/part/templates/part/category.html
View File

@ -29,7 +29,7 @@
<span class='fas fa-bell icon-green'></span> <span class='fas fa-bell icon-green'></span>
</button> </button>
{% else %} {% else %}
<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to nofications for this category" %}'> <button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to notifications for this category" %}'>
<span id='category-star-icon' class='fa fa-bell-slash'/> <span id='category-star-icon' class='fa fa-bell-slash'/>
</button> </button>
{% endif %} {% endif %}

4
InvenTree/part/templates/part/part_base.html
View File

@ -24,7 +24,7 @@
{% endif %} {% endif %}
{% if starred_directly %} {% if starred_directly %}
<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "You are subscribed to nofications for this part" %}'> <button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "You are subscribed to notifications for this part" %}'>
<span id='part-star-icon' class='fas fa-bell icon-green'/> <span id='part-star-icon' class='fas fa-bell icon-green'/>
</button> </button>
{% elif starred %} {% elif starred %}
@ -32,7 +32,7 @@
<span class='fas fa-bell icon-green'></span> <span class='fas fa-bell icon-green'></span>
</button> </button>
{% else %} {% else %}
<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to nofications for this part" %}'> <button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to notifications for this part" %}'>
<span id='part-star-icon' class='fa fa-bell-slash'/> <span id='part-star-icon' class='fa fa-bell-slash'/>
</button> </button>
{% endif %} {% endif %}

2
InvenTree/templates/js/translated/barcode.js
View File

@ -257,7 +257,7 @@ function barcodeDialog(title, options={}) {
$(modal).modal({ $(modal).modal({
backdrop: 'static', backdrop: 'static',
keyboard: false, keyboard: user_settings.FORMS_CLOSE_USING_ESCAPE,
}); });
if (options.preShow) { if (options.preShow) {