diff options
| author | Martin <devnull@localhost> | 2012-08-14 23:49:26 +0200 |
|---|---|---|
| committer | Martin <devnull@localhost> | 2012-08-14 23:49:26 +0200 |
| commit | 71289d9b0fb4046326c2c70e034aa78ac2cd1b97 (patch) | |
| tree | 03dca96408af1b8e494ac7409a6df5bff0bcd0ea /templates | |
| parent | a4f9f5bb5a2c1453e96778f898ec150fde5ff56e (diff) | |
| parent | 25a73c4ab7a23d87621c0d90b9c26c69361e8a6a (diff) | |
| download | troggle-71289d9b0fb4046326c2c70e034aa78ac2cd1b97.tar.gz troggle-71289d9b0fb4046326c2c70e034aa78ac2cd1b97.tar.bz2 troggle-71289d9b0fb4046326c2c70e034aa78ac2cd1b97.zip | |
Merge
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave_entrances.html | 4 | ||||
| -rw-r--r-- | templates/editentrance.html | 2 | ||||
| -rw-r--r-- | templates/prospecting.html | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/cave_entrances.html b/templates/cave_entrances.html index b61d1ab..3a75a02 100644 --- a/templates/cave_entrances.html +++ b/templates/cave_entrances.html @@ -7,7 +7,7 @@ {{ ent.entrance_letter|safe }} {% if ent.entrance.name %} {{ ent.entrance.name|safe }} - {% endif %}<a href="{% url editentrance ent.entrance.slug %}">Edit</a> + {% endif %}<a href="{% url editentrance cave.slug ent.entrance.slug %}">Edit</a> <dl> {% if ent.entrance.marking %} <dt>Marking</dt><dd>{{ ent.entrance.marking_val|safe }}</dd> @@ -67,5 +67,5 @@ </ul> {% endif %}</p> -<a href="{% url newentrance %}">New Entrance</a> +<a href="{% url newentrance cave.slug %}">New Entrance</a> </div> diff --git a/templates/editentrance.html b/templates/editentrance.html index 3b0e12b..e772a11 100644 --- a/templates/editentrance.html +++ b/templates/editentrance.html @@ -10,7 +10,7 @@ {% endblock %} {% block content %} <form action="" method="post">{% csrf_token %} - <table>{{ form }}</table> + <table>{{entletter}}{{ form }}</table> {{ versionControlForm }} <p><input type="submit" value="Submit" /></p> </form> diff --git a/templates/prospecting.html b/templates/prospecting.html index c329e5c..0d7a0d6 100644 --- a/templates/prospecting.html +++ b/templates/prospecting.html @@ -14,7 +14,7 @@ {% for name, area in areas %} <h2>{{name|safe}}</h2> <table border=\"1\" width="100%"> - <col><col><col><col><col><col><col><col><col width="35%"> + <col><col><col><col><col><col><col><col><col width="45%"> <thead> <tr><th>Cave Number</th><th>Name</th><th>Finished</th><th>Survey<br>Data</th><th>Survey<br>Drawn</th><th>Marked</th><th>Photo</th><th>Position</th><th>Location</th></tr> </thead> @@ -31,7 +31,7 @@ <td>{{ cave.caveandentrance_set.all.0.entrance.has_photo }} </td> <td>{{ cave.caveandentrance_set.all.0.entrance.find_location }}</td> <td>{% if cave.caveandentrance_set.all.0.entrance.location_description %}Location: {{ cave.caveandentrance_set.all.0.entrance.location_description|safe }}{% endif %} - {% if cave.caveandentrance_set.all.0.entrance.map_description %}Map: {{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}{% endif %} + {% if cave.caveandentrance_set.all.0.entrance.map_description %}Map: {{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}{% endif %} {% if cave.caveandentrance_set.all.0.entrance.approach %}Approach: {{ cave.caveandentrance_set.all.0.entrance.approach|safe }}{% endif %}</td> </tr> {% else %} |