Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch

# Conflicts:
#	parts/static/script.js
This commit is contained in:
2018-11-12 17:31:56 +01:00
59 changed files with 18 additions and 17 deletions
+6 -6
View File
@@ -18,15 +18,15 @@
<p>Looking for a place to store your obsolete ICs discontinued years ago? Just toss them anywhere and mark that location here!</p>
<table id="results">
<tr>
<th id="id">ID</th>
<th id="id">Container</th>
<th id="location">Location name</th>
<th id="mapURL">Map URL</th>
<th id="mapURL">ID</th>
</tr>
{% for location in locations %}
<tr>
<td>{{location['id']}}</td>
<td>{{location['container']}}</td>
<td>{{location['name']}}</td>
<td>{{location['map']}}</td>
<td>{{location['id']}}</td>
</tr>
{% endfor %}
</table>
@@ -41,8 +41,8 @@
<tr><td>MAP</td></tr>
<tr><td>
<select class="pinfo-input" onchange="update_clickable_map()" name="mapfile-input" id="mapfile-input">
{% for mapfile in mapfiles %}
<option value="{{mapfile}}" {% if mapfile==defaultMapfile %}selected="true"{% endif %}>{{mapfile}}</option>
{% for container in containers %}
<option value="{{container['id']}}">{{container['name']}}</option>
{% endfor %}
</select>
</td></tr>