summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-11-30 18:45:30 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-11-30 18:45:30 +0100
commitb2b61af84a392007c7a271ec8dfe00da452e3d88 (patch)
treed90f9f21c6c7e87bdd2b38ec815f7f05848cbd64
parent2d344958c09b81ba8a804161efc78bdd0a6dbc8e (diff)
downloadChimère - projet Saclay-b2b61af84a392007c7a271ec8dfe00da452e3d88.tar.bz2
Chimère - projet Saclay-b2b61af84a392007c7a271ec8dfe00da452e3d88.zip
Display areas
-rw-r--r--static/saclay/css/styles.css10
-rw-r--r--templates/chimere/main_map.html27
2 files changed, 12 insertions, 25 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 9e0b990..1bdbed1 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -2200,3 +2200,13 @@ li.main_category li.subcategory > span > label{
padding: 5px 6px;
border-radius: 5px;
}
+
+#maps-lnk {
+ margin-bottom: 0.5em;
+}
+
+#maps-lnk .form-control,
+#maps-lnk .input-group-addon{
+ border-radius: 0;
+ border: 1px solid #eee;
+}
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 1690189..ded7627 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -29,32 +29,9 @@
{% block message_edit %}{% endblock %}
{% block sidebar %}
<div id="sidebar-container">
- <div class='sidebar-handler' id='sidebar-handler-hide'>
- </div>
- <div id='action-panel'{% if has_search %} class='three'{% endif %}>
- <ul id='map-actions' class='action'>
- <li id='action-categories' class='state-active'>
- <label>{% trans "Categories" %}</label>
- </li>{% if has_search %}<li id='action-search'>
- <label>{% trans "Search" context "menu" %}</label>
- </li>{% endif %}{% if itinerary_form %}
- <li id='action-routing'>
- <label>{% trans "Routing" context "menu"%}</label>
- </li>{% endif %}
- </ul>
- <ul id='edit-actions' class='action'>
- <li id='action-edit-marker' class='state-active'>
- <label>{% trans "Location" %}</label>
- </li>
- <li id='action-edit-route'>
- <label>{% trans "Wander" %}</label>
- </li>
- <li id='action-edit-event'>
- <label>{% trans "Event" %}</label>
- </li>
- </ul>
- </div>
+ <div class='sidebar-handler' id='sidebar-handler-hide'></div>
<div id='panel'>
+ {% display_areas %}
<div id='map-panel'>
<div id='search-box'></div>
<form action='.' method='post' name='frm_categories' id='frm_categories'>