summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chimere/static/chimere/css/styles.css21
-rw-r--r--chimere/templates/chimere/base.html4
-rw-r--r--chimere/templates/chimere/main_map.html4
-rw-r--r--chimere/templates/chimere/main_map_simple.html30
-rw-r--r--chimere/views.py2
5 files changed, 25 insertions, 36 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 8b99aba..0984258 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -4294,3 +4294,24 @@ li.main_category li.subcategory > span > label{
margin-bottom: 110px;
}
}
+
+.simple-body .layer-switcher,
+.simple-body #maps-lnk, .simple-body #edit-button{
+ display:none;
+}
+.simple-body #main-map,
+.simple-body #detail-header,
+.simple-body #detail #detail-content,
+.simple-body #sidebar {
+ top: 0;
+}
+.simple-body #content {
+ margin-top: 0;
+}
+
+.simple-body #detail{
+ top: 119px;
+}
+.simple-body div#panel {
+ margin-top: 0;
+}
diff --git a/chimere/templates/chimere/base.html b/chimere/templates/chimere/base.html
index 4a8085f..55766f6 100644
--- a/chimere/templates/chimere/base.html
+++ b/chimere/templates/chimere/base.html
@@ -25,6 +25,8 @@
<link rel="stylesheet" href="{{ css_area }}?ver={{VERSION}}" />{% endif %}
{{extra_media}}
{% endblock %}
+
+{% block body_class %}{% if simple %} class='simple-body'{% endif %}{% endblock %}
{% block header %}
<noscript>
<div id="no-js-message">
@@ -32,7 +34,7 @@
</div>
</noscript>
{% block actions %}
- {% include "chimere/blocks/actions.html" %}
+ {% if not simple %} {% include "chimere/blocks/actions.html" %} {% endif %}
{% endblock %}
{% endblock %}
{% block content %}
diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html
index dc3a2aa..c87d84e 100644
--- a/chimere/templates/chimere/main_map.html
+++ b/chimere/templates/chimere/main_map.html
@@ -79,9 +79,7 @@
</a>
</div>{% endif %}
<a href='#' id='permalink'><span class='fa fa-chimere-action fa-bookmark'></span></a>
- {% if simple %}
- {% display_welcome 0 %}
- {%else%}
+ {% if not simple %}
{% display_welcome news_visible %}
{% endif %}
{% display_news news_visible %}
diff --git a/chimere/templates/chimere/main_map_simple.html b/chimere/templates/chimere/main_map_simple.html
deleted file mode 100644
index da302d1..0000000
--- a/chimere/templates/chimere/main_map_simple.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "chimere/main_map.html" %}
-{% load i18n %}
-{% block body_class %}class='simple'{% endblock %}
-{% block body_id %}id='simple'{% endblock %}
-{% block menu %}{# no menu in simple mode #}{% endblock %}
-{% block message_edit %}{% endblock %}
-{% block header %}
-{% endblock %}
-{% block sidebar %}
-<!--
- <div class='sidebar-handler' id='sidebar-handler-hide'>
- </div>
- <div id='panel'>
- <a>
- <h2>{% trans "Categories"%}</h2>
- </a>
- <form method='post' name='frm_categories' id='frm_categories'>
- <div id='categories'></div>
- </form>
- </div>
- -->
-{% endblock %}
-{% block content %}
- <script type='text/javascript'><!--
- var simple = true;
- // --></script>
- {{ block.super }}
-{% endblock %}
-{% block edit_blocks %}
-{% endblock %}
diff --git a/chimere/views.py b/chimere/views.py
index 1a13ea6..24af8b3 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -242,8 +242,6 @@ def index(request, area_name=None, default_area=None, simple=False,
if request.GET and "simple" in request.GET:
simple = True
response_dct['simple'] = simple
- if simple:
- tpl = 'chimere/main_map_simple.html'
if get_response:
return tpl, response_dct
return render(request, tpl, response_dct)