summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-03-26 19:15:18 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-03-26 19:15:18 +0100
commit733f965a2716aaa0730103ee66752ad466005abf (patch)
tree885ed317eccaabdffd36e4e322b5fad7572b9666
parent11e2f5a9663482a48d8aa0a82f53739914b8d0ad (diff)
parentb2ee80b151a8b04dd4f0c1599aa0b274d2386f9b (diff)
downloadChimère - projet de référence-733f965a2716aaa0730103ee66752ad466005abf.tar.bz2
Chimère - projet de référence-733f965a2716aaa0730103ee66752ad466005abf.zip
Merge branch 'master' into carteouverte
Conflicts: chimere_example_static/chimere/css/extra-styles.css
-rw-r--r--chimere_example_static/chimere/css/extra-styles.css25
-rw-r--r--templates/chimere/blocks/actions.html52
-rw-r--r--templates/chimere/main_map.html4
3 files changed, 48 insertions, 33 deletions
diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css
index 2fa64fa..bd58162 100644
--- a/chimere_example_static/chimere/css/extra-styles.css
+++ b/chimere_example_static/chimere/css/extra-styles.css
@@ -124,7 +124,7 @@ label.labelSpan.olButton{
#panel{
max-height:none;
- right:0;
+ left:0;
bottom:0;
border:0 transparent;
border-left:1px solid #E7E7E7;
@@ -336,8 +336,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
@media (min-width: 1552px) {
#maps-lnk label,
- #contact-lnk .lbl,
- #rss-lnk .lbl{
+ #contact-lnk .lbl{
display:inline;
}
}
@@ -358,8 +357,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
}
@media (max-width: 767px) {
- #news-lnk .lbl, #simple_button-lnk .lbl, #maps-lnk label, #contact-lnk .lbl,
- #rss-lnk .lbl{
+ #news-lnk .lbl, #simple_button-lnk .lbl, #maps-lnk label, #contact-lnk .lbl{
display:inline-block;
}
.selection-sep{
@@ -387,7 +385,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
.show-hide-panel{
position:absolute;
- right: 400px;
+ left: 400px;
top: 0;
bottom: 0;
background-color:#eee;
@@ -404,10 +402,11 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
position:absolute;
left:2px;
top:200px;
+ color:#449506;
}
#show-panel{
- right:0;
+ left:0;
display:none;
}
@@ -429,6 +428,17 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
}
}
+#content .olControlSimplePanZoom{
+ top: 18px !important;
+ left: auto !important;
+ right:50px !important;
+}
+
+#content #main-map .olControlLayerSwitcher {
+ left: auto !important;
+ right:50px !important;
+}
+
/* logos */
.logos{
@@ -515,4 +525,3 @@ div#assos-div{
bottom:0;
padding:15px;
}
-
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index 7b8ba5e..44ae223 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -6,23 +6,25 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="."><span class='fa fa-globe'></span></a>
</div>
<div class="navbar-collapse collapse">
- <ul class="nav navbar-nav">
+
+ <div class='navbar-left'>
+ <ul class="nav nav-pills">
{% for action, subactions in actions %}
- <li id='{{action.id}}-lnk'{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}>
- <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>
- <span class='fa fa-chimere-action fa-chimere-{{action.id}}'></span>
- <span class='lbl'>{{ action.label }}</span>
- </a>
- </li>
+ {% ifequal action.id action_selected.0 %}{% if subactions %}
+ {% for subaction in subactions %}
+ <li{% ifequal subaction.id action_selected.1 %} class='active'{% endifequal %}>
+ <a href='{{ subaction.url }}' onclick='saveExtent();'>{{ subaction.label }}</a>
+ </li>
+ {% endfor %}
+ {% endif %}{% endifequal %}
{% endfor %}
- </ul>
- <div class='tabbable navbar-right'>
- <ul class="nav nav-pills">
{% if is_map %}
- <li class='selection-sep'> </li>
+ <li id='categories-lnk'{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'><span class='fa fa-chimere-action fa-check-circle-o'></span> {% trans "Categories "%}</a></li>
+ {% if has_search %}
+ <li id='search-lnk' class='active'><a href='#search-box' data-toggle='panel'><span class="glyphicon glyphicon-search"></span> {% trans "Search" %}</a></li>
+ {% endif %}
{% if areas_visible %}
<li id='maps-lnk'><span class='fa fa-chimere-action fa-chimere-maps'></span>{% display_areas %}</li>
<li id='permalink-lnk'><span class='fa fa-chimere-action fa-bookmark'></span><span id='permalink'></span></li>
@@ -32,22 +34,26 @@
</li>
{% endif %}
<li class='selection-sep'> </li>
- <li id='categories-lnk'{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'><span class='fa fa-chimere-action fa-check-circle-o'></span> {% trans "Categories "%}</a></li>
- {% if has_search %}
- <li id='search-lnk' class='active'><a href='#search-box' data-toggle='panel'><span class="glyphicon glyphicon-search"></span> {% trans "Search" %}</a></li>
- {% endif %}
{% endif %}
+ </ul>
+ </div>
+
+ <div class='navbar-right'>
+
+ <ul class="nav navbar-nav">
+ <li class='selection-sep'> </li>
{% for action, subactions in actions %}
- {% ifequal action.id action_selected.0 %}{% if subactions %}
- {% for subaction in subactions %}
- <li{% ifequal subaction.id action_selected.1 %} class='active'{% endifequal %}>
- <a href='{{ subaction.url }}' onclick='saveExtent();'>{{ subaction.label }}</a>
- </li>
- {% endfor %}
- {% endif %}{% endifequal %}
+ <li id='{{action.id}}-lnk'{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}>
+ <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>
+ <span class='fa fa-chimere-action fa-chimere-{{action.id}}'></span>
+ <span class='lbl'>{{ action.label }}</span>
+ </a>
+ </li>
{% endfor %}
</ul>
+
</div>
+
</div>
</div>
</div>
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index e41b019..9f57ad5 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -13,8 +13,8 @@
{% block message_edit %}{% endblock %}
{% block sidebar %}
{% display_welcome %}
- <div class='show-hide-panel' id='hide-panel'><span class='fa fa-arrow-circle-right'></span></div>
- <div class='show-hide-panel' id='show-panel'><span class='fa fa-arrow-circle-left'></span></div>
+ <div class='show-hide-panel' id='hide-panel'><span class='fa fa-arrow-circle-left'></span></div>
+ <div class='show-hide-panel' id='show-panel'><span class='fa fa-arrow-circle-right'></span></div>
<div id='panel' class='navbar-default'>
<form id="frm_categories"><div id='categories'></div></form>
<div id='search-box' class='ui-widget ui-corner-all'></div>