diff options
| author | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2008-11-24 19:16:20 +0000 |
|---|---|---|
| committer | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2008-11-24 19:16:20 +0000 |
| commit | db8e84ed8da6ffdb45c22b72d8fd890d80187323 (patch) | |
| tree | ced66810336def6b1e38d9782f091360b8f86dc8 /templates | |
| parent | 6990a6a363f8bbf0aeca40a4b57865d4556ef349 (diff) | |
| download | Chimère-db8e84ed8da6ffdb45c22b72d8fd890d80187323.tar.bz2 Chimère-db8e84ed8da6ffdb45c22b72d8fd890d80187323.zip | |
Update of styles - Changing (again) the way details are displayed
git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@5 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 2 | ||||
| -rw-r--r-- | templates/detail.html | 3 | ||||
| -rw-r--r-- | templates/main_map.html | 9 | ||||
| -rw-r--r-- | templates/welcome.html | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/templates/base.html b/templates/base.html index 191d95d..da27cd2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -25,7 +25,9 @@ <div id="content"> {% block content %}{% endblock %} </div> + {% block footer %} <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> + {% endblock %} </body> </html> diff --git a/templates/detail.html b/templates/detail.html index f8ef21d..03ffe25 100644 --- a/templates/detail.html +++ b/templates/detail.html @@ -6,5 +6,4 @@ <div>{% for property in marker.getProperties %} <p id='{{property.propertymodel.getNamedId}}'>{{ property.value }}</p> {% endfor %}</div> -</div> -<div id='detail_footer'><a href='javascript:hideDetail();'>{% trans "Close" %}</a></div>
\ No newline at end of file +</div>
\ No newline at end of file diff --git a/templates/main_map.html b/templates/main_map.html index df422ee..c7b9e2f 100644 --- a/templates/main_map.html +++ b/templates/main_map.html @@ -12,10 +12,13 @@ </ul> </form> </div> -<div id='detail'{% if detail_content%} style="display:block;"{% endif %}> -{{ detail_content }} -</div>{% endblock %} +<div id='detail'> +</div> +{{welcome}}{% endblock %} {% block content %}<div id='map'></div> <script type='text/javascript'><!-- init(); // --> </script>{% endblock %} +{% block footer %} + <div id='map-footer'><a href='javascript:show("welcome");'>{% trans "Welcome message"%}</a> - {% trans "This site uses Chimère"%} - Copyright © 2008 <a href='http://redmine.peacefrogs.net/projects/show/chimere'>Chimère project</a></div> +{% endblock %} diff --git a/templates/welcome.html b/templates/welcome.html index d9825cf..8d15f8e 100644 --- a/templates/welcome.html +++ b/templates/welcome.html @@ -1,4 +1,5 @@ {% load i18n %} +<div id='welcome' {% if not display %}style='display:None'{%endif%}> <h2>{% trans "Welcome to Chimère"%}</h2> <div id='detail_content'> <p>{% trans "This is the default message. You can overload it by modifying the file welcome.html in the template directory of Chimère. Below this message all news message will be displayed. You can add them in administration pages."%}</p> @@ -11,4 +12,5 @@ {%endfor%} </div>{%endif%} </div> -<div id='detail_footer'><a href='javascript:hideDetail();'>{% trans "Close" %}</a></div>
\ No newline at end of file +<div id='detail_footer'><a href='javascript:hide("welcome");'>{% trans "Close" %}</a></div> +</div>
\ No newline at end of file |