inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 13:15:43 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2279

Browse Source
This commit is contained in:
Matthias Mair
2022-01-07 00:08:17 +01:00
committed by GitHub
parent 5c4c9bfaed 8597ae89b6
commit 978018e284
44 changed files with 9747 additions and 9267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/templates/InvenTree/settings/mixins/settings.html
View File

@@ -1,7 +1,10 @@
{% load i18n %}
{% load plugin_extras %}
<h4>{% trans "Settings" %}</h4>
<div class='panel-heading'>
<h4>{% trans "Settings" %}</h4>
</div>
{% plugin_globalsettings plugin_key as plugin_settings %}
<table class='table table-striped table-condensed'>

6
InvenTree/templates/InvenTree/settings/mixins/urls.html
View File

@@ -1,7 +1,9 @@
{% load i18n %}
{% load inventree_extras %}
<h4>{% trans "URLs" %}</h4>
<div class='panel-heading'>
<h4>{% trans "URLs" %}</h4>
</div>
{% define plugin.base_url as base %}
<p>{% blocktrans %}The Base-URL for this plugin is <a href="/{{ base }}" target="_blank"><strong>{{ base }}</strong></a>.{% endblocktrans %}</p>
@@ -18,7 +20,7 @@
<tr>
<td>{{key}}</td>
<td>{{entry.1}}</td>
<td><a class="btn btn-primary btn-small" href="/{{ base }}{{entry.1}}" target="_blank">{% trans 'open in new tab' %}</a></td>
<td><a class="btn btn-primary btn-small" href="/{{ base }}{{entry.1}}" target="_blank">{% trans 'Open in new tab' %}</a></td>
</tr>
{% endif %}{% endfor %}
</tbody>

2
InvenTree/templates/InvenTree/settings/plugin.html
View File

@@ -70,7 +70,7 @@
{% if mixin_list %}
{% for mixin in mixin_list %}
<a class='sidebar-selector' id='select-plugin-{{plugin_key}}' data-bs-parent="#sidebar">
<span class='badge bg-dark badge-right'>{% blocktrans with name=mixin.human_name %}has {{name}}{% endblocktrans %}</span>
<span class='badge bg-dark badge-right'>{{ mixin.human_name }}</span>
</a>
{% endfor %}
{% endif %}

9
InvenTree/templates/InvenTree/settings/plugin_settings.html
View File

@@ -67,7 +67,10 @@
</div>
{% if plugin.is_package == False %}
<p>{% trans 'The code information is pulled from the latest git commit for this plugin. It might not reflect official version numbers or information but the actual code running.' %}</p>
<div class='alert alert-block alert-info'>
{% trans 'The code information is pulled from the latest git commit for this plugin. It might not reflect official version numbers or information but the actual code running.' %}
</div>
{% endif %}
</div>
<div class="col">
@@ -124,8 +127,8 @@
</div>
</div>
{% mixin_enabled plugin 'globalsettings' as globalsettings %}
{% if globalsettings %}
{% mixin_enabled plugin 'settings' as settings %}
{% if settings %}
{% include 'InvenTree/settings/mixins/settings.html' %}
{% endif %}