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

Move "Company" view to new two-column template

Browse Source
This commit is contained in:
Oliver Walters 2020-04-22 09:01:52 +10:00
parent 79ea744280
commit 808a636484
3 changed files with 108 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
InvenTree/company/templates/company/company_base.html
View File

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "two_column.html" %}
{% load static %}
{% load i18n %}
@ -7,12 +7,7 @@
InvenTree | {% trans "Company" %} - {{ company.name }}
{% endblock %}
{% block content %}
<div class="row">
<div class="col-sm-6">
<div class="media">
<div class='media-left'>
{% block thumbnail %}
<div class='dropzone' id='company-thumb'>
<img class="part-thumb"
{% if company.image %}
@ -21,8 +16,9 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
src="{% static 'img/blank_image.png' %}"
{% endif %}/>
</div>
</div>
<div class='media-body'>
{% endblock %}
{% block page_data %}
<h3>{{ company.name }}</h3>
<p>{{ company.description }}</p>
<div class='btn-group'>
@ -38,10 +34,10 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
<span class='glyphicon glyphicon-trash'/>
</button>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
{% endblock %}
{% block page_details %}
<h4>{% trans "Company Details" %}</h4>
<table class="table">
<col width='25'>
{% if company.website %}
@ -80,27 +76,10 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
</tr>
{% endif %}
</table>
</div>
</div>
<hr>
<div class='container-fluid'>
{% block details %}
{% endblock %}
</div>
{% endblock %}
{% block js_load %}
{{ block.super }}
<script type='text/javascript' src="{% static 'script/inventree/stock.js' %}"></script>
{% endblock %}
{% block js_ready %}
{{ block.super }}
$('#company-edit').click(function() {
launchModalForm(

1
InvenTree/templates/base.html
View File

@ -107,6 +107,7 @@ InvenTree
<script type='text/javascript' src="{% static 'script/inventree/filters.js' %}"></script>
<script type='text/javascript' src="{% static 'script/inventree/tables.js' %}"></script>
<script type='text/javascript' src="{% static 'script/inventree/build.js' %}"></script>
<script type='text/javascript' src="{% static 'script/inventree/stock.js' %}"></script>
<script type='text/javascript' src="{% static 'script/inventree/modals.js' %}"></script>
<script type='text/javascript' src="{% static 'script/inventree/order.js' %}"></script>
<script type='text/javascript' src="{% static 'script/inventree/company.js' %}"></script>

42
InvenTree/templates/two_column.html Normal file
View File

@ -0,0 +1,42 @@
{% extends "base.html" %}
{% load static %}
{% load i18n %}
{% block content %}
<div class='row'>
<div class='col-sm-6'>
<div class='media-left'>
{% block thumbnail %}
<!-- Image goes here -->
{% endblock %}
</div>
<div class='media-body'>
{% block page_data %}
<!-- Data next to image goes here -->
{% endblock %}
</div>
</div>
<div class='col-sm-6'>
{% block page_details %}
<!-- Right column data goes here -->
{% endblock %}
</div>
</div>
<hr>
<div class='container-fluid'>
{% block details %}
<!-- Particular page detail views go here -->
{% endblock %}
</div>
{% endblock %}
{% block js_ready %}
{{ block.super }}
{% endblock %}