diff options
| author | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2008-11-23 22:37:53 +0000 |
|---|---|---|
| committer | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2008-11-23 22:37:53 +0000 |
| commit | 4f3c2faf2844c23167c6b79cc6536b7257356d7b (patch) | |
| tree | 91787bb07bbd3a978430502e97adae7c9fb1bad4 /templates | |
| parent | 6f97020d6b56f19d37a0941b299e68b2e8837d68 (diff) | |
| download | Chimère-4f3c2faf2844c23167c6b79cc6536b7257356d7b.tar.bz2 Chimère-4f3c2faf2844c23167c6b79cc6536b7257356d7b.zip | |
Displaying details differently. Adding a news system.
git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@3 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 2 | ||||
| -rw-r--r-- | templates/detail.html | 9 | ||||
| -rw-r--r-- | templates/main_map.html | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/templates/base.html b/templates/base.html index 3f4e0ac..191d95d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,3 +1,4 @@ +{% load i18n %} <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -24,6 +25,7 @@ <div id="content"> {% block content %}{% endblock %} </div> + <div id='footer'>{% trans "This site uses Chimère"%} - Copyright © 2008 <a href='http://redmine.peacefrogs.net/projects/show/chimere'>Chimère project</a></div> </body> </html> diff --git a/templates/detail.html b/templates/detail.html index 465d775..f8ef21d 100644 --- a/templates/detail.html +++ b/templates/detail.html @@ -1,7 +1,10 @@ {% load i18n %} -<h3>{{marker.name}}</h3> -<div>{%trans marker.subcategory.name%}</div> +<h2>{{ marker.name }}</h2> +<div id='detail_content'> +{%trans marker.subcategory.name%} {% if marker.picture %}<img src='{{media_path}}{{marker.picture}}' alt='{{marker.name}}'/>{%endif%} <div>{% for property in marker.getProperties %} <p id='{{property.propertymodel.getNamedId}}'>{{ property.value }}</p> -{% endfor %}</div>
\ No newline at end of file +{% endfor %}</div> +</div> +<div id='detail_footer'><a href='javascript:hideDetail();'>{% trans "Close" %}</a></div>
\ No newline at end of file diff --git a/templates/main_map.html b/templates/main_map.html index 3f43131..df422ee 100644 --- a/templates/main_map.html +++ b/templates/main_map.html @@ -12,10 +12,8 @@ </ul> </form> </div> -<div id='detail'> -<h2>{% trans "Detail" %}</h2> -<div id='detail_content'> -</div> +<div id='detail'{% if detail_content%} style="display:block;"{% endif %}> +{{ detail_content }} </div>{% endblock %} {% block content %}<div id='map'></div> <script type='text/javascript'><!-- |