diff options
19 files changed, 93 insertions, 66 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index fbc2704..e9c03ad 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -1,21 +1,18 @@ /* color definition */ -a, a:link, a:visited, legend{ - color: #5b80b2; -} - -.errorlist, +a, a:link, a:visited, legend, +#footer .map-footer a, #footer .map-footer a:link, +#footer .map-footer a:visited, .errorlist, .detail_footer a, #categories li#display_submited, -.simple .cloud h2 { +.simple .cloud h2{ color:#54c200; } -h2, -#action li, -#action li a, -#action li li a, -#welcome_button a, .ui-widget-header, +h2, .action li, .action li a, +.action li li a, +#footer a, #footer a:link, #footer a:visited, .ui-widget-header, +a#welcome_button, a:visited#welcome_button, a:link#welcome_button, .olControlPermalink a { color:#fff; } @@ -24,8 +21,8 @@ h4{ color:#5e1e68; } -#action li.ui-state-active a, -#action li li.ui-state-active a{ +.action li.ui-state-active a, +.action li li.ui-state-active a{ color:#333; } @@ -33,7 +30,7 @@ h4{ body, h2, h3, .ui-widget-header, -#action li.selected, +.action li.selected, #welcome_button, .olControlPermalink{ background-color:#4ea30d; @@ -43,7 +40,7 @@ body, h2, h3, background-image:None; } -fieldset, #action li, #content, +fieldset, .action li, #content, #map-footer, #panel, #areas, #welcome, #detail, .detail_footer a, #map, .window{ @@ -58,14 +55,16 @@ div.warning{ background-color:transparent; } -#action li.selected{ +.action li.selected, +#welcome_button, +.olControlPermalink{ border:1px solid #54c200; } #areas, #detail, #map, div.warning, #content, -#action li.selected, +.action li.selected, #panel, #map-footer{ border:1px solid #327e04; } @@ -107,8 +106,9 @@ fieldset, #content, #panel, */ /**/ -.draggable h2{ - cursor:move; +html, body{ + margin:0; + padding:0; } body{ @@ -135,6 +135,10 @@ h2{ position: relative; } +.draggable h2{ + cursor:move; +} + h4{ font-weight:normal; font-style:italic; @@ -154,48 +158,55 @@ fieldset{ display:block; } -ul#action{ +#page_title{ position:absolute; - z-index:5; + top:6px; + right:20px; + font-weight:bold; + font-size:30px; + color:#fff; +} + +#topbar{ + z-index:0; +} + +ul.action{ list-style-type:none; - top:20px; - left:80px; margin:0; - padding:3px; - padding-left:0; + padding:12px; + padding-bottom:0; } -#action li{ +.action li{ font-weight:normal; display:inline; padding:3px 7px; + margin:0; margin-right:6px; } -#action a{ +.action a{ text-decoration:None; } -#action li ul{ - margin:14px 12px; - position:absolute; - width:600px; -} - #content{ - margin:4px; - margin-top:14px; + z-index:3; padding:20px; - padding-top:46px; } #footer{ + margin:5px; text-align:center; } -#map-footer{ - position:absolute; +#footer img{ + vertical-align:bottom; +} + +#footer .map-footer{ z-index:5; + position:absolute; bottom:5px; right:5px; padding:2px; @@ -321,13 +332,12 @@ ul#share li{ position:absolute; margin:0px; padding:0px; - height:98%; + height:93%; margin:0; padding:0; - top:8px; - bottom:8px; - left:8px; - right:8px; + top:40px; + left:0px; + right:0px; z-index:0; } @@ -448,7 +458,7 @@ p.warning{ z-index:4; } -#welcome_button a{ +a#welcome_button{ font-size:14px; text-align:center; text-decoration:none; @@ -458,10 +468,11 @@ p.warning{ .olControlPermalink { display: block; position: absolute; - bottom:12px; - left:20px; + bottom:14px; + left:28px; width:180px; font-size:small; + font-size:80%; text-align:center; } diff --git a/chimere/static/chimere/img/copyleft.png b/chimere/static/chimere/img/copyleft.png Binary files differnew file mode 100644 index 0000000..088a76b --- /dev/null +++ b/chimere/static/chimere/img/copyleft.png diff --git a/chimere/static/chimere/img/east-mini.png b/chimere/static/chimere/img/east-mini.png Binary files differindex 0707567..9dab325 100644 --- a/chimere/static/chimere/img/east-mini.png +++ b/chimere/static/chimere/img/east-mini.png diff --git a/chimere/static/chimere/img/layer-switcher-maximize.png b/chimere/static/chimere/img/layer-switcher-maximize.png Binary files differindex 8d7bb16..33368db 100644 --- a/chimere/static/chimere/img/layer-switcher-maximize.png +++ b/chimere/static/chimere/img/layer-switcher-maximize.png diff --git a/chimere/static/chimere/img/north-mini.png b/chimere/static/chimere/img/north-mini.png Binary files differindex a8a0b40..21573ae 100644 --- a/chimere/static/chimere/img/north-mini.png +++ b/chimere/static/chimere/img/north-mini.png diff --git a/chimere/static/chimere/img/pan-panel.png b/chimere/static/chimere/img/pan-panel.png Binary files differnew file mode 100644 index 0000000..681c74e --- /dev/null +++ b/chimere/static/chimere/img/pan-panel.png diff --git a/chimere/static/chimere/img/slider.png b/chimere/static/chimere/img/slider.png Binary files differindex 23afd57..5f1c4a1 100644 --- a/chimere/static/chimere/img/slider.png +++ b/chimere/static/chimere/img/slider.png diff --git a/chimere/static/chimere/img/south-mini.png b/chimere/static/chimere/img/south-mini.png Binary files differindex 6c4ac8a..c9168df 100644 --- a/chimere/static/chimere/img/south-mini.png +++ b/chimere/static/chimere/img/south-mini.png diff --git a/chimere/static/chimere/img/west-mini.png b/chimere/static/chimere/img/west-mini.png Binary files differindex db5f420..082cb5f 100644 --- a/chimere/static/chimere/img/west-mini.png +++ b/chimere/static/chimere/img/west-mini.png diff --git a/chimere/static/chimere/img/zoom-minus-mini.png b/chimere/static/chimere/img/zoom-minus-mini.png Binary files differindex f9b63ab..86940e2 100644 --- a/chimere/static/chimere/img/zoom-minus-mini.png +++ b/chimere/static/chimere/img/zoom-minus-mini.png diff --git a/chimere/static/chimere/img/zoom-panel.png b/chimere/static/chimere/img/zoom-panel.png Binary files differnew file mode 100644 index 0000000..b01bc3b --- /dev/null +++ b/chimere/static/chimere/img/zoom-panel.png diff --git a/chimere/static/chimere/img/zoom-plus-mini.png b/chimere/static/chimere/img/zoom-plus-mini.png Binary files differindex eecf2eb..b7f466a 100644 --- a/chimere/static/chimere/img/zoom-plus-mini.png +++ b/chimere/static/chimere/img/zoom-plus-mini.png diff --git a/chimere/static/chimere/img/zoom-world-mini.png b/chimere/static/chimere/img/zoom-world-mini.png Binary files differindex 2159dde..8454391 100644 --- a/chimere/static/chimere/img/zoom-world-mini.png +++ b/chimere/static/chimere/img/zoom-world-mini.png diff --git a/chimere/templates/chimere/base.html b/chimere/templates/chimere/base.html index cc1c767..a09b5fc 100644 --- a/chimere/templates/chimere/base.html +++ b/chimere/templates/chimere/base.html @@ -2,11 +2,23 @@ {% load chimere_tags %} {% block extra_head %} {% head %} + <style> + .olControlPanPanel div { + background-image: url({{STATIC_URL}}/chimere/img/pan-panel.png); + } + + .olControlZoomPanel div { + background-image: url({{STATIC_URL}}/chimere/img/zoom-panel.png); + } + </style> {% endblock %} {% block header %} - {% block actions %} - {% include "chimere/blocks/actions.html" %} - {% endblock %} + {% block page_title %} + {% include "chimere/blocks/page_title.html" %} + {% endblock %} + {% block actions %} + {% include "chimere/blocks/actions.html" %} + {% endblock %} {% endblock %} {% block content %} {% block top %}{% endblock %} diff --git a/chimere/templates/chimere/blocks/actions.html b/chimere/templates/chimere/blocks/actions.html index 8e2e1d6..517afb1 100644 --- a/chimere/templates/chimere/blocks/actions.html +++ b/chimere/templates/chimere/blocks/actions.html @@ -1,20 +1,20 @@ <div id="topbar"> - <ul id='action'> + <ul id='action' class='action'> {% for action, subactions in actions %} - <li class='ui-widget ui-button ui-state-default ui-corner-all {% ifequal action.id action_selected.0 %} ui-state-active{% endifequal %}'> - <a href='{{extra_url}}{{ action.path }}' onclick='saveExtent();'>{{ action.label }}</a> - {% ifequal action.id action_selected.0 %} - {% if subactions %} - <ul> - {% for subaction in subactions %} - <li{% ifequal subaction.id action_selected.1 %} class='selected'{% endifequal %}> - <a href='{{extra_url}}{{ subaction.path }}' onclick='saveExtent();'>{{ subaction.label }}</a> - </li> - {% endfor %} - </ul> - {% endif %} - {% endifequal %} + <li class='ui-widget ui-button ui-state-default ui-corner-all {% ifequal action.id action_selected.0 %} ui-state-active{% endifequal %}'> + <a href='{{extra_url}}{{ action.path }}' onclick='saveExtent();'>{{ action.label }}</a> + </li> + {% endfor %} + </ul> + <ul id='action-2' class='action'> + {% for action, subactions in actions %} + {% ifequal action.id action_selected.0 %}{% if subactions %} + {% for subaction in subactions %} + <li class='ui-widget ui-button ui-state-default ui-corner-all{% ifequal subaction.id action_selected.1 %} ui-state-active{% endifequal %}'> + <a href='{{extra_url}}{{ subaction.path }}' onclick='saveExtent();'>{{ subaction.label }}</a> </li> {% endfor %} + {% endif %}{% endifequal %} + {% endfor %} </ul> </div> diff --git a/chimere/templates/chimere/blocks/footer.html b/chimere/templates/chimere/blocks/footer.html index 1665640..f2961c3 100644 --- a/chimere/templates/chimere/blocks/footer.html +++ b/chimere/templates/chimere/blocks/footer.html @@ -1,3 +1,3 @@ {% load i18n %} -{% trans "This site uses Chimère"%} - © 2008-2010 <a href='http://blog.peacefrogs.net/nim/chimere/'>Chimère project</a> - {% trans "Map"%} © <a href='http://openstreetmap.org/'>OpenStreetMap</a> +{% trans "This site uses Chimère"%} - <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> 2008-2012 <a href='http://blog.peacefrogs.net/nim/chimere/'>Chimère project</a> - {% trans "Map"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> <a href='http://openstreetmap.org/'>OpenStreetMap</a> diff --git a/chimere/templates/chimere/blocks/page_title.html b/chimere/templates/chimere/blocks/page_title.html new file mode 100644 index 0000000..c95d9f8 --- /dev/null +++ b/chimere/templates/chimere/blocks/page_title.html @@ -0,0 +1,2 @@ +{% load i18n %} +<span id='page_title'>Chimère</span> diff --git a/chimere/templates/chimere/blocks/welcome.html b/chimere/templates/chimere/blocks/welcome.html index 7cd7159..939e5f0 100644 --- a/chimere/templates/chimere/blocks/welcome.html +++ b/chimere/templates/chimere/blocks/welcome.html @@ -1,7 +1,6 @@ {% load i18n %} {% load sanitize %} -<button class='ui-widget ui-button ui-state-default' id='welcome_button' onclick=''> - {% trans "Welcome message"%}</button> +<a href='#' id='welcome_button'>{% trans "Welcome message"%}</a> <script type='text/javascript'> function display_welcome(){$("#welcome").dialog({title:"{% trans "News"%}"});} $("#welcome_button").bind('click', display_welcome); diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html index 7d20fd7..b79e41d 100644 --- a/chimere/templates/chimere/main_map.html +++ b/chimere/templates/chimere/main_map.html @@ -25,3 +25,6 @@ $("#map").chimere(chimere_init_options); // --></script> {% endblock %} +{% block footer %} + <p class='map-footer'>{% include "chimere/blocks/footer.html" %}</p> +{% endblock %} |
