Conflicts: client-barcode/freitagslib/network.pymaster
Sebastian Pipping
13 years ago
commit
028d03456f
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 158 KiB |
Binary file not shown.
@ -1,15 +0,0 @@
|
||||
django gibt tabellenstruktur vor
|
||||
|
||||
webinterface
|
||||
mit django
|
||||
fuer
|
||||
adminsistration
|
||||
user preferences
|
||||
kaufen
|
||||
undsoweiter
|
||||
d.h. voller funktionsumfang
|
||||
|
||||
|
||||
-- milestone 2
|
||||
touchinterface am kuehlschrank
|
||||
möglichst simpel
|
||||
@ -0,0 +1,54 @@
|
||||
<html><head><title>New Map</title><script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js" type="text/javascript"></script><script type="text/javascript">
|
||||
jQuery.noConflict();
|
||||
</script>
|
||||
<script src="http://vue.tufts.edu/htmlexport-includes/jquery.maphilight.min.js" type="text/javascript"></script><script src="http://vue.tufts.edu/htmlexport-includes/v3/tooltip.min.js" type="text/javascript"></script><script type="text/javascript">jQuery(function() {jQuery.fn.maphilight.defaults = {
|
||||
fill: false,
|
||||
fillColor: '000000',
|
||||
fillOpacity: 0.2,
|
||||
stroke: true,
|
||||
strokeColor: '282828',
|
||||
strokeOpacity: 1,
|
||||
strokeWidth: 4,
|
||||
fade: true,
|
||||
alwaysOn: false
|
||||
}
|
||||
jQuery('.example2 img').maphilight();
|
||||
});
|
||||
</script>
|
||||
<style type="text/css">
|
||||
#tooltip{
|
||||
position:absolute;
|
||||
border:1px solid #333;
|
||||
background:#f7f5d1;
|
||||
padding:2px 5px;
|
||||
color:#333;
|
||||
display:none;
|
||||
}
|
||||
</style>
|
||||
</head><body>
|
||||
<div class="example2"><img class="map" src="map.png" width="771.0" height="847.0" usemap="#vuemap"><map name="vuemap"> <area id="node0" shape="rect" coords="24,433,243,521"></area>
|
||||
<area class="tooltip" title="deprecated (json-)
|
||||
api from Konrad;
|
||||
used by the
|
||||
webinterface" id="node1" shape="rect" coords="429,26,515,66"></area>
|
||||
<area class="tooltip" title="new all-in-one
|
||||
REST-Api" id="node2" shape="rect" coords="424,113,521,152"></area>
|
||||
<area class="tooltip" title="/App/ for buyables
|
||||
like mate,kitkat" id="node3" shape="rect" coords="409,202,534,242"></area>
|
||||
<area class="tooltip" title="/App/ for login,
|
||||
register,settings" id="node4" shape="rect" coords="421,307,524,346"></area>
|
||||
<area class="tooltip" title="/App/ for
|
||||
moneytransfers" id="node5" shape="rect" coords="396,398,548,437"></area>
|
||||
<area class="tooltip" title="stores webstuff
|
||||
(images,css,js)" id="node6" shape="rect" coords="415,527,529,567"></area>
|
||||
<area class="tooltip" title="django-default" id="node7" shape="rect" coords="401,621,545,661"></area>
|
||||
<area class="tooltip" title="django-default
|
||||
(empty)" id="node8" shape="rect" coords="401,784,545,824"></area>
|
||||
<area class="tooltip" title="maps URLs to
|
||||
python-(views.py)
|
||||
functions " id="node9" shape="rect" coords="417,693,527,733"></area>
|
||||
<area id="node10" shape="rect" coords="695,486,745,518"></area>
|
||||
<area id="node11" shape="rect" coords="695,537,746,570"></area>
|
||||
<area id="node12" shape="rect" coords="702,595,737,627"></area>
|
||||
|
||||
</map></div></body></html>
|
||||
|
After Width: | Height: | Size: 104 KiB |
@ -0,0 +1,42 @@
|
||||
{% load thumbnail %}
|
||||
|
||||
{% if buyables %}
|
||||
<table class="showitem">
|
||||
<tbody>
|
||||
{% for buyable in buyables %}
|
||||
<tr>
|
||||
<td class="productImage">
|
||||
<a href="/store/show/{{ buyable.id }}"><img src="{% thumbnail buyable.image 64x64 %}"/></a>
|
||||
</td>
|
||||
<td class="name"><a href="/store/show/{{ buyable.id }}">{{ buyable.name }}</a></td>
|
||||
<td class="actions">
|
||||
{% if buyable.hasDeposit %}
|
||||
<a class="buyButton includingPrice" href="/store/buy/{{ buyable.id }}"
|
||||
title="Kaufen (Ohne Pfand)">
|
||||
<span><span>{{ buyable.price|floatformat:2 }} €</span></span>
|
||||
</a>
|
||||
|
||||
<a class="buyButton includingDeposit includingPrice"
|
||||
href="/store/buy/{{ buyable.id }}/with/deposit" title="Kaufen (Mit Pfand)">
|
||||
<span><span>{{ buyable.price|floatformat:2 }} € / {{ buyable.deposit|floatformat:2 }} €</span></span>
|
||||
</a>
|
||||
|
||||
<a class="buyButton onlyDeposit includingPrice"
|
||||
href="/store/buy/{{ buyable.id }}/only/deposit" title="Kaufen (Nur Pfand)">
|
||||
<span><span>{{ buyable.deposit|floatformat:2 }} €</span></span>
|
||||
</a>
|
||||
|
||||
{% else %}
|
||||
<a class="buyButton includingPrice" href="/store/buy/{{ buyable.id }}"
|
||||
title="Kaufen">
|
||||
<span><span>{{ buyable.price|floatformat:2 }} €</span></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% else %}
|
||||
<p>{{ default|default_if_none:"Noch keine gekauft" }}</p>
|
||||
{% endif %}
|
||||
@ -1,46 +1,8 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block "content" %}
|
||||
<div style="float:left; width=200;">
|
||||
<table class="showitem" width="864px" style="border-width:0px">
|
||||
{% for item in items %}
|
||||
<tr>
|
||||
<td width="64px">
|
||||
<a href="/store/show/{{ item.id }}"><img WIDTH=64 HEIGHT=64 src="{{ MEDIA_URL }}{{ item.image }}"></a>
|
||||
</td>
|
||||
<th width="200px" align="center">
|
||||
<span style="font-size: large">{{ item.name }}</span><br/>
|
||||
<a href="/store/show/{{ item.id }}">Details</a>
|
||||
</th>
|
||||
<td width="200px">
|
||||
<a class="button" href="/store/buy/{{ item.id }}/">Kaufen für {{ item.price|floatformat:2 }} €<br/>{% if item.hasDeposit %} (Ohne Pfand){% endif %}</a>
|
||||
</td>
|
||||
<td width="200px">
|
||||
{% if item.hasDeposit %}
|
||||
<a class="button" href="/store/buy/{{ item.id }}/with/deposit/">Kaufen für {{ item.price|floatformat:2 }} € <br/>+ {{ item.deposit|floatformat:2 }} € Pfand</a>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
<td width="200px">
|
||||
{% if item.hasDeposit %}
|
||||
<a class="button" href="/store/buy/{{ item.id }}/only/deposit/">Kaufen <br/>nur {{ item.deposit|floatformat:2 }} € Pfand</a>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% comment %}
|
||||
Buy <a href="/store/buy/{{ item.id }}/">it!</a>
|
||||
{% if item.hasDeposit %}
|
||||
<a href="/store/buy/{{ item.id }}/with/deposit/">it+deposit!</a>
|
||||
<a href="/store/buy/{{ item.id }}/only/deposit/"> only deposit!</a>
|
||||
{% endif %}
|
||||
</br> (
|
||||
{% for type in item.buyableType.all %}
|
||||
{{ type }}
|
||||
{% endfor %} )
|
||||
</div>{% endcomment %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
Sortieren nach <a href="/store/">Letzte Änderung</a> | <a href="?order=alphabet">Alphabet</a> | <a href="?order=price">Preis</a><br/>
|
||||
<div style="width:800px">
|
||||
{% include "buyables/product_list.html" with buyables=items %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@ -1,31 +1,29 @@
|
||||
{% load thumbnail %}
|
||||
|
||||
{% if buyables %}
|
||||
{% if removeWrapper == None %}
|
||||
<table width=100%>
|
||||
<table width=100% class="showitem">
|
||||
<tbody>
|
||||
{% endif %}
|
||||
{% for buyable in buyables %}
|
||||
<tr>
|
||||
<td class="productImage">
|
||||
<a href="/store/show/{{ buyable.buyable__id }}"><img src="{{ MEDIA_URL }}{{ buyable.buyable__image }}" /></a>
|
||||
<a href="/store/show/{{ buyable.buyable__id }}"><img src="{% thumbnail buyable.buyable__image 64x64 %}" /></a>
|
||||
</td>
|
||||
<td class="name"><span>{{ buyable.buyable__name }}</span> ({{ buyable.num_buys }} mal gekauft)</td>
|
||||
<td>
|
||||
<td class="name"><span>{{ buyable.buyable__name }}</span> {% if buyable.num_buys %}({{ buyable.num_buys }} mal gekauft){% endif %}</td>
|
||||
<td class="actions">
|
||||
{% if buyable.buyable__deposit > 0 %}
|
||||
<a class="buyButton" href="/store/buy/{{ buyable.buyable__id }}" title="Kaufen (Ohne Pfand)"><span>Kaufen (Ohne Pfand)</span></a>
|
||||
<a class="buyButton includingDeposit" href="/store/buy/{{ buyable.buyable__id }}/with/deposit" title="Kaufen (Mit Pfand)"><span>Kaufen (Mit Pfand)</span></a>
|
||||
<a class="buyButton includingPrice" href="/store/buy/{{ buyable.buyable__id }}" title="Kaufen (Ohne Pfand)"><span><span>{{ buyable.buyable__price|floatformat:2 }}€</span></span></a>
|
||||
<a class="buyButton includingDeposit includingPrice" href="/store/buy/{{ buyable.buyable__id }}/with/deposit" title="Kaufen (Mit Pfand)"><span><span>{{ buyable.buyable__price|floatformat:2 }} € / {{ buyable.buyable__deposit|floatformat:2 }}€</span></span></a>
|
||||
{% if includeDeposit %}
|
||||
<a class="buyButton onlyDeposit" href="/store/buy/{{ buyable.buyable__id }}/only/deposit" title="Kaufen (Nur Pfand)"><span>Kaufen (Nur Pfand)</span></a>
|
||||
<a class="buyButton onlyDeposit" href="/store/buy/{{ buyable.buyable__id }}/only/deposit" title="Kaufen (Nur Pfand)"><span><span>{{ buyable.buyable__deposit|floatformat:2 }}€</span></span></a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<a class="buyButton" href="/store/buy/{{ buyable.buyable__id }}" title="Kaufen"><span>Kaufen</span></a>
|
||||
<a class="buyButton" href="/store/buy/{{ buyable.buyable__id }}" title="Kaufen"><span><span>{{ buyable.buyable__price|floatformat:2 }}€</span></span></a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% if removeWrapper == None %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<p>{{ default|default_if_none:"Noch keine gekauft" }}</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<form method="post" action="/what/do/i/know">
|
||||
<form method="get" action="#">
|
||||
<input placeholder="Suche und kaufe..." class="autocomplete"
|
||||
type="search" name="search_term" value="Lade Daten..."
|
||||
disabled="disabled" />
|
||||
<input type="submit" value="Suchen" />
|
||||
</form>
|
||||
</form>
|
||||
|
||||
@ -0,0 +1 @@
|
||||
../docs/_build/html/
|
||||
Loading…
Reference in new issue