2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00

same treatment for html

This commit is contained in:
Matthias 2021-05-06 14:33:03 +02:00
parent f2b0717d10
commit a77d9d9de7
51 changed files with 103 additions and 103 deletions

View File

@ -86,7 +86,7 @@
} }
); );
}); });
$("#btn-order-parts").click(function() { $("#btn-order-parts").click(function() {
launchModalForm("/order/purchase-order/order-parts/", { launchModalForm("/order/purchase-order/order-parts/", {
data: { data: {
@ -94,7 +94,7 @@
}, },
}); });
}); });
{% endif %} {% endif %}
{% endblock %} {% endblock %}

View File

@ -230,5 +230,5 @@ src="{% static 'img/blank_image.png' %}"
} }
); );
}); });
{% endblock %} {% endblock %}

View File

@ -17,9 +17,9 @@
<div class='col-sm-6'> <div class='col-sm-6'>
</div> </div>
<hr> <hr>
<div id='button-toolbar'> <div id='button-toolbar'>
<div class='button-toolbar container-fluid' style='float: right;'> <div class='button-toolbar container-fluid' style='float: right;'>
<div class='btn-group'> <div class='btn-group'>
@ -66,7 +66,7 @@
<script type='text/javascript'> <script type='text/javascript'>
function loadOrderEvents(calendar) { function loadOrderEvents(calendar) {
var start = startDate(calendar); var start = startDate(calendar);
var end = endDate(calendar); var end = endDate(calendar);
@ -85,7 +85,7 @@
var prefix = '{% settings_value "BUILDORDER_REFERENCE_PREFIX" %}'; var prefix = '{% settings_value "BUILDORDER_REFERENCE_PREFIX" %}';
for (var idx = 0; idx < response.length; idx++) { for (var idx = 0; idx < response.length; idx++) {
var order = response[idx]; var order = response[idx];
var date = order.creation_date; var date = order.creation_date;
@ -155,7 +155,7 @@ $('#view-calendar').click(function() {
$(".fixed-table-pagination").hide(); $(".fixed-table-pagination").hide();
$(".columns-right").hide(); $(".columns-right").hide();
$(".search").hide(); $(".search").hide();
$("#build-order-calendar").show(); $("#build-order-calendar").show();
$("#view-list").show(); $("#view-list").show();
}); });
@ -164,7 +164,7 @@ $("#view-list").click(function() {
// Hide the calendar view, show the list view // Hide the calendar view, show the list view
$("#build-order-calendar").hide(); $("#build-order-calendar").hide();
$("#view-list").hide(); $("#view-list").hide();
$(".fixed-table-pagination").show(); $(".fixed-table-pagination").show();
$(".columns-right").show(); $(".columns-right").show();
$(".search").show(); $(".search").show();

View File

@ -17,7 +17,7 @@
</li> </li>
{% if build.active %} {% if build.active %}
<li class='list-group-item {% if tab == "allocate" %}active{% endif %}' title='{% trans "Allocate Stock" %}'> <li class='list-group-item {% if tab == "allocate" %}active{% endif %}' title='{% trans "Allocate Stock" %}'>
<a href='{% url "build-allocate" build.id %}'> <a href='{% url "build-allocate" build.id %}'>
<span class='fas fa-tools'></span> <span class='fas fa-tools'></span>

View File

@ -20,11 +20,11 @@
<hr> <hr>
<form method='POST'> <form method='POST'>
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form }}
<hr> <hr>
<button type="submit" class='btn btn-default'>{% trans "Save" %}</button> <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
</form> </form>
{{ form.media }} {{ form.media }}

View File

@ -75,5 +75,5 @@
{% endblock %} {% endblock %}
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}
{% endblock %} {% endblock %}

View File

@ -6,7 +6,7 @@
{% trans "Are you sure you want to delete the following Manufacturer Parts?" %} {% trans "Are you sure you want to delete the following Manufacturer Parts?" %}
</div> </div>
{% for part in parts %} {% for part in parts %}
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}
@ -17,7 +17,7 @@
<table class='table table-striped table-condensed'> <table class='table table-striped table-condensed'>
<tr> <tr>
<input type='hidden' name='manufacturer-part-{{ part.id}}' value='manufacturer-part-{{ part.id }}'/> <input type='hidden' name='manufacturer-part-{{ part.id}}' value='manufacturer-part-{{ part.id }}'/>
<td> <td>
{% include "hover_image.html" with image=part.part.image %} {% include "hover_image.html" with image=part.part.image %}
{{ part.part.full_name }} {{ part.part.full_name }}

View File

@ -33,6 +33,6 @@
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}
{% endblock %} {% endblock %}

View File

@ -53,7 +53,7 @@ $('#supplier-create').click(function () {
}); });
$("#supplier-part-delete").click(function() { $("#supplier-part-delete").click(function() {
var selections = $("#supplier-table").bootstrapTable("getSelections"); var selections = $("#supplier-table").bootstrapTable("getSelections");
var parts = []; var parts = [];

View File

@ -24,7 +24,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% if company.is_supplier or company.is_manufacturer %} {% if company.is_supplier or company.is_manufacturer %}
<li class='list-group-item {% if tab == "supplier_parts" %}active{% endif %}' title='{% trans "Supplied Parts" %}'> <li class='list-group-item {% if tab == "supplier_parts" %}active{% endif %}' title='{% trans "Supplied Parts" %}'>
<a href='{% url "company-detail-supplier-parts" company.id %}'> <a href='{% url "company-detail-supplier-parts" company.id %}'>

View File

@ -18,11 +18,11 @@
{% if editing %} {% if editing %}
<form method='POST'> <form method='POST'>
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form }}
<hr> <hr>
<button type="submit" class='btn btn-default'>{% trans "Save" %}</button> <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
</form> </form>
{{ form.media }} {{ form.media }}
@ -43,5 +43,5 @@ $("#edit-notes").click(function() {
location.href = "{% url 'company-notes' company.id %}?edit=1"; location.href = "{% url 'company-notes' company.id %}?edit=1";
}); });
{% endif %} {% endif %}
{% endblock %} {% endblock %}

View File

@ -12,7 +12,7 @@
{% for part in parts %} {% for part in parts %}
<tr> <tr>
<input type='hidden' name='supplier-part-{{ part.id}}' value='supplier-part-{{ part.id }}'/> <input type='hidden' name='supplier-part-{{ part.id}}' value='supplier-part-{{ part.id }}'/>
<td> <td>
{% include "hover_image.html" with image=part.part.image %} {% include "hover_image.html" with image=part.part.image %}
{{ part.part.full_name }} {{ part.part.full_name }}

View File

@ -43,6 +43,6 @@
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}
{% endblock %} {% endblock %}

View File

@ -19,7 +19,7 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
<table class='table table-striped table-condensed po-table' id='purchase-order-table' data-toolbar='#button-bar'> <table class='table table-striped table-condensed po-table' id='purchase-order-table' data-toolbar='#button-bar'>
</table> </table>

View File

@ -90,7 +90,7 @@ $('#price-break-table').inventreeTable({
html += makeIconButton('fa-trash-alt icon-red', 'button-price-break-delete', row.pk, '{% trans "Delete price break" %}'); html += makeIconButton('fa-trash-alt icon-red', 'button-price-break-delete', row.pk, '{% trans "Delete price break" %}');
html += `</div>`; html += `</div>`;
return html; return html;
} }
}, },

View File

@ -44,7 +44,7 @@ $("#new-attachment").click(function() {
$("#attachment-table").on('click', '.attachment-edit-button', function() { $("#attachment-table").on('click', '.attachment-edit-button', function() {
var button = $(this); var button = $(this);
var url = `/order/purchase-order/attachment/${button.attr('pk')}/edit/`; var url = `/order/purchase-order/attachment/${button.attr('pk')}/edit/`;
launchModalForm(url, { launchModalForm(url, {

View File

@ -193,11 +193,11 @@ $("#po-table").inventreeTable({
}); });
}, },
sorter: function(valA, valB, rowA, rowB) { sorter: function(valA, valB, rowA, rowB) {
if (rowA.received == 0 && rowB.received == 0) { if (rowA.received == 0 && rowB.received == 0) {
return (rowA.quantity > rowB.quantity) ? 1 : -1; return (rowA.quantity > rowB.quantity) ? 1 : -1;
} }
var progressA = parseFloat(rowA.received) / rowA.quantity; var progressA = parseFloat(rowA.received) / rowA.quantity;
var progressB = parseFloat(rowB.received) / rowB.quantity; var progressB = parseFloat(rowB.received) / rowB.quantity;

View File

@ -83,7 +83,7 @@
var title = `${prefix}${order.reference} - ${order.supplier_detail.name}`; var title = `${prefix}${order.reference} - ${order.supplier_detail.name}`;
var color = '#4c68f5'; var color = '#4c68f5';
if (order.complete_date) { if (order.complete_date) {
color = '#25c235'; color = '#25c235';
} else if (order.overdue) { } else if (order.overdue) {
@ -143,7 +143,7 @@ $('#view-calendar').click(function() {
$(".columns-right").hide(); $(".columns-right").hide();
$(".search").hide(); $(".search").hide();
$('#filter-list-salesorder').hide(); $('#filter-list-salesorder').hide();
$("#purchase-order-calendar").show(); $("#purchase-order-calendar").show();
$("#view-list").show(); $("#view-list").show();
}); });
@ -152,7 +152,7 @@ $("#view-list").click(function() {
// Hide the calendar view, show the list view // Hide the calendar view, show the list view
$("#purchase-order-calendar").hide(); $("#purchase-order-calendar").hide();
$("#view-list").hide(); $("#view-list").hide();
$(".fixed-table-pagination").show(); $(".fixed-table-pagination").show();
$(".columns-right").show(); $(".columns-right").show();
$(".search").show(); $(".search").show();

View File

@ -51,13 +51,13 @@ $("#new-so-line").click(function() {
{% if order.status == SalesOrderStatus.PENDING %} {% if order.status == SalesOrderStatus.PENDING %}
function showAllocationSubTable(index, row, element) { function showAllocationSubTable(index, row, element) {
// Construct a table showing stock items which have been allocated against this line item // Construct a table showing stock items which have been allocated against this line item
var html = `<div class='sub-table'><table class='table table-striped table-condensed' id='allocation-table-${row.pk}'></table></div>`; var html = `<div class='sub-table'><table class='table table-striped table-condensed' id='allocation-table-${row.pk}'></table></div>`;
element.html(html); element.html(html);
var lineItem = row; var lineItem = row;
var table = $(`#allocation-table-${row.pk}`); var table = $(`#allocation-table-${row.pk}`);
table.bootstrapTable({ table.bootstrapTable({
@ -70,7 +70,7 @@ function showAllocationSubTable(index, row, element) {
title: '{% trans "Quantity" %}', title: '{% trans "Quantity" %}',
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var text = ''; var text = '';
if (row.serial != null && row.quantity == 1) { if (row.serial != null && row.quantity == 1) {
text = `{% trans "Serial Number" %}: ${row.serial}`; text = `{% trans "Serial Number" %}: ${row.serial}`;
} else { } else {
@ -91,10 +91,10 @@ function showAllocationSubTable(index, row, element) {
field: 'buttons', field: 'buttons',
title: '{% trans "Actions" %}', title: '{% trans "Actions" %}',
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var html = "<div class='btn-group float-right' role='group'>"; var html = "<div class='btn-group float-right' role='group'>";
var pk = row.pk; var pk = row.pk;
{% if order.status == SalesOrderStatus.PENDING %} {% if order.status == SalesOrderStatus.PENDING %}
html += makeIconButton('fa-edit icon-blue', 'button-allocation-edit', pk, '{% trans "Edit stock allocation" %}'); html += makeIconButton('fa-edit icon-blue', 'button-allocation-edit', pk, '{% trans "Edit stock allocation" %}');
html += makeIconButton('fa-trash-alt icon-red', 'button-allocation-delete', pk, '{% trans "Delete stock allocation" %}'); html += makeIconButton('fa-trash-alt icon-red', 'button-allocation-delete', pk, '{% trans "Delete stock allocation" %}');
@ -248,11 +248,11 @@ $("#so-lines-table").inventreeTable({
var A = rowA.fulfilled; var A = rowA.fulfilled;
var B = rowB.fulfilled; var B = rowB.fulfilled;
{% endif %} {% endif %}
if (A == 0 && B == 0) { if (A == 0 && B == 0) {
return (rowA.quantity > rowB.quantity) ? 1 : -1; return (rowA.quantity > rowB.quantity) ? 1 : -1;
} }
var progressA = parseFloat(A) / rowA.quantity; var progressA = parseFloat(A) / rowA.quantity;
var progressB = parseFloat(B) / rowB.quantity; var progressB = parseFloat(B) / rowB.quantity;
@ -271,7 +271,7 @@ $("#so-lines-table").inventreeTable({
var html = `<div class='btn-group float-right' role='group'>`; var html = `<div class='btn-group float-right' role='group'>`;
var pk = row.pk; var pk = row.pk;
if (row.part) { if (row.part) {
var part = row.part_detail; var part = row.part_detail;
@ -284,13 +284,13 @@ $("#so-lines-table").inventreeTable({
if (part.purchaseable) { if (part.purchaseable) {
html += makeIconButton('fa-shopping-cart', 'button-buy', row.part, '{% trans "Purchase stock" %}'); html += makeIconButton('fa-shopping-cart', 'button-buy', row.part, '{% trans "Purchase stock" %}');
} }
if (part.assembly) { if (part.assembly) {
html += makeIconButton('fa-tools', 'button-build', row.part, '{% trans "Build stock" %}'); html += makeIconButton('fa-tools', 'button-build', row.part, '{% trans "Build stock" %}');
} }
} }
html += makeIconButton('fa-edit icon-blue', 'button-edit', pk, '{% trans "Edit line item" %}'); html += makeIconButton('fa-edit icon-blue', 'button-edit', pk, '{% trans "Edit line item" %}');
html += makeIconButton('fa-trash-alt icon-red', 'button-delete', pk, '{% trans "Delete line item " %}'); html += makeIconButton('fa-trash-alt icon-red', 'button-delete', pk, '{% trans "Delete line item " %}');

View File

@ -141,7 +141,7 @@ $('#view-calendar').click(function() {
$(".columns-right").hide(); $(".columns-right").hide();
$(".search").hide(); $(".search").hide();
$('#filter-list-salesorder').hide(); $('#filter-list-salesorder').hide();
$("#sales-order-calendar").show(); $("#sales-order-calendar").show();
$("#view-list").show(); $("#view-list").show();
}); });
@ -150,7 +150,7 @@ $("#view-list").click(function() {
// Hide the calendar view, show the list view // Hide the calendar view, show the list view
$("#sales-order-calendar").hide(); $("#sales-order-calendar").hide();
$("#view-list").hide(); $("#view-list").hide();
$(".fixed-table-pagination").show(); $(".fixed-table-pagination").show();
$(".columns-right").show(); $(".columns-right").show();
$(".search").show(); $(".search").show();

View File

@ -46,5 +46,5 @@
part: {{ part.id }}, part: {{ part.id }},
} }
}); });
{% endblock %} {% endblock %}

View File

@ -198,7 +198,7 @@
}) })
$("#part-export").click(function() { $("#part-export").click(function() {
var url = "{% url 'part-export' %}?category={{ category.id }}"; var url = "{% url 'part-export' %}?category={{ category.id }}";
location.href = url; location.href = url;

View File

@ -262,5 +262,5 @@
}, },
); );
}); });
{% endblock %} {% endblock %}

View File

@ -58,7 +58,7 @@
}); });
$("#manufacturer-part-delete").click(function() { $("#manufacturer-part-delete").click(function() {
var selections = $("#manufacturer-table").bootstrapTable("getSelections"); var selections = $("#manufacturer-table").bootstrapTable("getSelections");
var parts = []; var parts = [];

View File

@ -20,12 +20,12 @@
{% if editing %} {% if editing %}
<form method='POST'> <form method='POST'>
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form }}
<hr> <hr>
<button type="submit" class='btn btn-default'>{% trans "Save" %}</button> <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
</form> </form>
{{ form.media }} {{ form.media }}

View File

@ -49,7 +49,7 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% endblock %} {% endblock %}

View File

@ -151,7 +151,7 @@
<td>{% decimal allocated %}</td> <td>{% decimal allocated %}</td>
</tr> </tr>
{% endif %} {% endif %}
{% if not part.is_template %} {% if not part.is_template %}
{% if part.assembly %} {% if part.assembly %}
<tr> <tr>
@ -177,11 +177,11 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class='panel panel-default panel-inventree'> <div class='panel panel-default panel-inventree'>
<div class='panel-heading'> <div class='panel-heading'>
<h4> <h4>
{% block heading %} {% block heading %}
@ -272,7 +272,7 @@
function onSelectImage(response) { function onSelectImage(response) {
// Callback when the image-selection modal form is displayed // Callback when the image-selection modal form is displayed
// Populate the form with image data (requested via AJAX) // Populate the form with image data (requested via AJAX)
$("#modal-form").find("#image-select-table").bootstrapTable({ $("#modal-form").find("#image-select-table").bootstrapTable({
pagination: true, pagination: true,
pageSize: 25, pageSize: 25,
@ -301,9 +301,9 @@
} }
}); });
} }
{% if roles.part.change %} {% if roles.part.change %}
{% settings_value "INVENTREE_DOWNLOAD_FROM_URL" as allow_download %} {% settings_value "INVENTREE_DOWNLOAD_FROM_URL" as allow_download %}
{% if allow_download %} {% if allow_download %}
$("#part-image-url").click(function() { $("#part-image-url").click(function() {

View File

@ -11,7 +11,7 @@
<form method='post' action='' class='js-modal-form' enctype='multipart/form-data'> <form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
{% csrf_token %} {% csrf_token %}
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
<input id='image-input' name='image' type='hidden' value="{{ part.image }}"> <input id='image-input' name='image' type='hidden' value="{{ part.image }}">
<table id='image-select-table' class='table table-striped table-condensed table-img-grid'> <table id='image-select-table' class='table table-striped table-condensed table-img-grid'>

View File

@ -4,10 +4,10 @@
{% block form %} {% block form %}
<form method="post" action='' class='js-modal-form' enctype="multipart/form-data"> <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
<label class='control-label'>Parts</label> <label class='control-label'>Parts</label>
<p class='help-block'>{% trans "Set category for the following parts" %}</p> <p class='help-block'>{% trans "Set category for the following parts" %}</p>
<table class='table table-striped'> <table class='table table-striped'>
<tr> <tr>
<th>{% trans "Part" %}</th> <th>{% trans "Part" %}</th>
@ -36,8 +36,8 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% crispy form %} {% crispy form %}
</form> </form>
{% endblock %} {% endblock %}

View File

@ -11,7 +11,7 @@
{% block category_content %} {% block category_content %}
<div class='panel panel-default panel-inventree'> <div class='panel panel-default panel-inventree'>
<div class='panel-heading'> <div class='panel-heading'>
<h4>{% trans "Subcategories" %}</h4> <h4>{% trans "Subcategories" %}</h4>
</div> </div>

View File

@ -62,7 +62,7 @@
}); });
$("#supplier-part-delete").click(function() { $("#supplier-part-delete").click(function() {
var selections = $("#supplier-table").bootstrapTable("getSelections"); var selections = $("#supplier-table").bootstrapTable("getSelections");
var parts = []; var parts = [];

View File

@ -98,7 +98,7 @@ content: "v{{report_revision}} - {{ date.isoformat }}";
<div class='details-image'> <div class='details-image'>
<img class='part-image' src="{% part_image part %}"> <img class='part-image' src="{% part_image part %}">
</div> </div>
<div class='details-container'> <div class='details-container'>
<table class='details-table'> <table class='details-table'>

View File

@ -13,7 +13,7 @@
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-size: 75%; font-size: 75%;
{% endblock %} {% endblock %}
@top-left { @top-left {
{% block top_left %} {% block top_left %}
{% endblock %} {% endblock %}
@ -98,7 +98,7 @@
{% block page_content %} {% block page_content %}
{% endblock %} {% endblock %}
</div> </div>
<div class='footer'> <div class='footer'>
{% block footer_content %} {% block footer_content %}
{% endblock %} {% endblock %}

View File

@ -35,7 +35,7 @@
{% endif %} {% endif %}
<table class='table table-condensed table-striped' id='track-table' data-toolbar='#table-toolbar'> <table class='table table-condensed table-striped' id='track-table' data-toolbar='#table-toolbar'>
</table> </table>
{% endblock %} {% endblock %}
{% block js_ready %} {% block js_ready %}

View File

@ -124,7 +124,7 @@
</div> </div>
<div class='btn-group action-buttons' role='group'> <div class='btn-group action-buttons' role='group'>
{% if barcodes %} {% if barcodes %}
<!-- Barcode actions menu --> <!-- Barcode actions menu -->
<div class='btn-group'> <div class='btn-group'>

View File

@ -32,7 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='test-result-table'></table> <table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='test-result-table'></table>
{% endblock %} {% endblock %}

View File

@ -163,10 +163,10 @@
submit_text: '{% trans "Export" %}', submit_text: '{% trans "Export" %}',
success: function(response) { success: function(response) {
var url = "{% url 'stock-export' %}"; var url = "{% url 'stock-export' %}";
url += "?format=" + response.format; url += "?format=" + response.format;
url += "&cascade=" + response.cascade; url += "&cascade=" + response.cascade;
{% if location %} {% if location %}
url += "&location={{ location.id }}"; url += "&location={{ location.id }}";
{% endif %} {% endif %}
@ -224,9 +224,9 @@
} }
}); });
}); });
$('#print-label').click(function() { $('#print-label').click(function() {
var locs = [{{ location.pk }}]; var locs = [{{ location.pk }}];
printStockLocationLabels(locs); printStockLocationLabels(locs);
@ -254,7 +254,7 @@
} }
}); });
}); });
loadStockTable($("#stock-table"), { loadStockTable($("#stock-table"), {
buttons: [ buttons: [
'#stock-options', '#stock-options',

View File

@ -31,7 +31,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if item.child_count > 0 %} {% if item.child_count > 0 %}

View File

@ -10,7 +10,7 @@
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
<input type='hidden' name='stock_action' value='{{ stock_action }}'/> <input type='hidden' name='stock_action' value='{{ stock_action }}'/>
<table class='table table-condensed table-striped' id='stock-table'> <table class='table table-condensed table-striped' id='stock-table'>
<tr> <tr>
<th>{% trans "Stock Item" %}</th> <th>{% trans "Stock Item" %}</th>
@ -44,7 +44,7 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% crispy form %} {% crispy form %}
</form> </form>

View File

@ -32,7 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='sublocation-table'></table> <table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='sublocation-table'></table>
</div> </div>

View File

@ -84,7 +84,7 @@ function addHeaderAction(label, title, icon, options) {
// Connect a callback to the table // Connect a callback to the table
$(`#table-${label}`).on('load-success.bs.table', function() { $(`#table-${label}`).on('load-success.bs.table', function() {
var count = $(`#table-${label}`).bootstrapTable('getData').length; var count = $(`#table-${label}`).bootstrapTable('getData').length;
$(`#badge-${label}`).html(count); $(`#badge-${label}`).html(count);
if (count > 0) { if (count > 0) {

View File

@ -91,7 +91,7 @@
$("#search-item-list").children('li').each(function() { $("#search-item-list").children('li').each(function() {
$(this).removeClass('index-action-selected'); $(this).removeClass('index-action-selected');
}); });
// Add css class to the action we are interested in // Add css class to the action we are interested in
$(`#search-item-${label}`).addClass('index-action-selected'); $(`#search-item-${label}`).addClass('index-action-selected');
}); });
@ -215,7 +215,7 @@
var name = row.part_detail.full_name; var name = row.part_detail.full_name;
html = imageHoverIcon(thumb) + renderLink(name, url); html = imageHoverIcon(thumb) + renderLink(name, url);
return html; return html;
} }
}, },
@ -355,6 +355,6 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}

View File

@ -37,7 +37,7 @@
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}
{# Convert dropdown to select2 format #} {# Convert dropdown to select2 format #}
$(document).ready(function() { $(document).ready(function() {
attachSelect('#category-select'); attachSelect('#category-select');
@ -103,7 +103,7 @@
var button = $(this); var button = $(this);
var url = "/part/category/{{ category.pk }}/parameters/" + button.attr('pk') + "/delete/"; var url = "/part/category/{{ category.pk }}/parameters/" + button.attr('pk') + "/delete/";
launchModalForm(url, { launchModalForm(url, {
success: function() { success: function() {
$("#param-table").bootstrapTable('refresh'); $("#param-table").bootstrapTable('refresh');

View File

@ -113,7 +113,7 @@
var button = $(this); var button = $(this);
var url = "/part/parameter/template/" + button.attr('pk') + "/delete/"; var url = "/part/parameter/template/" + button.attr('pk') + "/delete/";
launchModalForm(url, { launchModalForm(url, {
success: function() { success: function() {
$("#param-table").bootstrapTable('refresh'); $("#param-table").bootstrapTable('refresh');

View File

@ -19,7 +19,7 @@
{% include "InvenTree/settings/tabs.html" %} {% include "InvenTree/settings/tabs.html" %}
{% endblock %} {% endblock %}
</div> </div>
<div class='settings-content'> <div class='settings-content'>
<h3> <h3>
{% block subtitle %} {% block subtitle %}

View File

@ -79,26 +79,26 @@
</div> </div>
<div class='inventree-navs'> <div class='inventree-navs'>
<div class='sidenav sidenav-left' id='sidenav-left'> <div class='sidenav sidenav-left' id='sidenav-left'>
{% block sidenav %} {% block sidenav %}
<!-- Sidenav code here --> <!-- Sidenav code here -->
{% endblock %} {% endblock %}
</div> </div>
<div class='sidenav sidenav-right' id='sidenav-right'> <div class='sidenav sidenav-right' id='sidenav-right'>
{% block menubar %} {% block menubar %}
<!-- Menubar code here --> <!-- Menubar code here -->
{% endblock %} {% endblock %}
</div> </div>
<div class="container container-fluid inventree-content" id='inventree-content'> <div class="container container-fluid inventree-content" id='inventree-content'>
{% block content %} {% block content %}
<!-- Each view fills in here.. --> <!-- Each view fills in here.. -->
{% endblock %} {% endblock %}
</div> </div>
{% block post_content %} {% block post_content %}
{% endblock %} {% endblock %}
@ -173,7 +173,7 @@ $(document).ready(function () {
{% endblock %} {% endblock %}
inventreeDocReady(); inventreeDocReady();
showCachedAlerts(); showCachedAlerts();
{% if barcodes %} {% if barcodes %}

View File

@ -20,10 +20,10 @@
<form method="post" action='' class='js-modal-form' enctype="multipart/form-data"> <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% block form_data %} {% block form_data %}
{% endblock %} {% endblock %}
{% crispy form %} {% crispy form %}
</form> </form>

View File

@ -55,7 +55,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-question-dialog'> <div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-question-dialog'>
<div class='modal-dialog'> <div class='modal-dialog'>

View File

@ -37,7 +37,7 @@
<!-- <!--
Background Image Attribution: https://unsplash.com/photos/Ixvv3YZkd7w Background Image Attribution: https://unsplash.com/photos/Ixvv3YZkd7w
--> -->
<div class='main body-wrapper login-screen'> <div class='main body-wrapper login-screen'>
<div class='login-container'> <div class='login-container'>
@ -66,7 +66,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="div_id_password" class="form-group"> <div id="div_id_password" class="form-group">
<label for="id_password" class="control-label requiredField">{% trans "Password" %}<span class="asteriskField">*</span></label> <label for="id_password" class="control-label requiredField">{% trans "Password" %}<span class="asteriskField">*</span></label>
<div class='controls'> <div class='controls'>
@ -78,15 +78,15 @@
</div> </div>
</div> </div>
</div> </div>
{% if form.errors %} {% if form.errors %}
<div class='login-error'> <div class='login-error'>
<b>{% trans "Username / password combination is incorrect" %}</b> <b>{% trans "Username / password combination is incorrect" %}</b>
</div> </div>
{% endif %} {% endif %}
<hr> <hr>
<button class='pull-right btn btn-primary login-button' type="submit">{% trans "Login" %}</button> <button class='pull-right btn btn-primary login-button' type="submit">{% trans "Login" %}</button>
</form> </form>

View File

@ -62,5 +62,5 @@
</div> </div>
</div> </div>
</div> </div>
</body> </body>

View File

@ -11,7 +11,7 @@
{% block header_panel %} {% block header_panel %}
<div class='panel panel-default panel-inventree'> <div class='panel panel-default panel-inventree'>
{% block header_pre_content %} {% block header_pre_content %}
{% endblock %} {% endblock %}