arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-21 23:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'asset-assetforms' of https://github.com/nottinghamtec/PyRIGS into asset-assetforms

Browse Source
This commit is contained in:
Matthew Smith
2019-10-08 01:34:01 +01:00
parent fe1541acbf d30bd9850d
commit f8a9062b8e
2 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
assets/templates/asset_list.html
View File

@@ -8,45 +8,48 @@
<h1 class="text-center">Asset List</h1> <h1 class="text-center">Asset List</h1>
</div> </div>
<form id="asset-search-form" method="get"> <form id="asset-search-form" method="get" class="form-inline pull-right">
{% csrf_token %} {% csrf_token %}
<div class="input-group"> <div class="input-group pull-right" style="width: auto;">
<input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}"> <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}" style="width: 250px">
<label for="asset_id" class="sr-only">Asset ID/Description:</label> <label for="asset_id" class="sr-only">Asset ID/Description:</label>
<span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span> <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
</div> </div>
<div class="form-group"> <br>
<label for="cat">Category:</label> <div style="margin-top: 1em;" class="pull-right">
<select name="cat" class="form-control"> <div class="form-group">
<option value="">None</option> <label for="cat" class="sr-only">Category</label>
{% for name in categories %} <select name="cat" class="form-control">
{% if name.name == category_select %} <option value="" class="text-muted">(category)</option>
<option selected> {% for name in categories %}
{% else %} {% if name.name == category_select %}
<option> <option selected>
{% endif %} {% else %}
{{ name }} <option>
</option> {% endif %}
{% endfor %} {{ name }}
</select> </option>
</div> {% endfor %}
<div class="form-group"> </select>
<label for="status">Status:</label> </div>
<select name="status" class="form-control"> <div class="form-group">
<option value="">None</option> <label for="status" class="sr-only">Status</label>
{% for name in statuses %} <select name="status" class="form-control">
{% if name.name == status_select %} <option value="">(status)</option>
<option selected> {% for name in statuses %}
{% else %} {% if name.name == status_select %}
<option> <option selected>
{% endif %} {% else %}
{{ name }} <option>
</option> {% endif %}
{% endfor %} {{ name }}
</select> </option>
</div> {% endfor %}
<!---TODO: Auto filter whenever an option is selected, instead of using a button --> </select>
<button type="submit" class="btn btn-default">Filter</button> </div>
<!---TODO: Auto filter whenever an option is selected, instead of using a button -->
<button type="submit" class="btn btn-default">Filter</button>
</div>
</form> </form>
<table class="table"> <table class="table">

8
assets/templates/partials/asset_list_table_body.html
View File

@@ -11,10 +11,10 @@
text-muted text-muted
{% endif %} {% endif %}
"> ">
<td><a href="{% url 'asset_detail' item.pk %}">{{ item.asset_id }}</a></td> <td style="vertical-align: middle;"><a href="{% url 'asset_detail' item.pk %}">{{ item.asset_id }}</a></td>
<td>{{ item.description }}</td> <td style="vertical-align: middle;">{{ item.description }}</td>
<td>{{ item.category }}</td> <td style="vertical-align: middle;">{{ item.category }}</td>
<td>{{ item.status }}</td> <td style="vertical-align: middle;">{{ item.status }}</td>
<td> <td>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a type="button" class="btn btn-default btn-sm" href="{% url 'asset_detail' item.pk %}"><i class="glyphicon glyphicon-eye-open"></i> View</a> <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_detail' item.pk %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>