diff options
Diffstat (limited to 'chimere/templates')
-rw-r--r-- | chimere/templates/blocks/bootstrap-modal.html | 2 | ||||
-rw-r--r-- | chimere/templates/chimere/blocks/share_bar.html | 3 | ||||
-rw-r--r-- | chimere/templates/chimere/main_map.html | 4 | ||||
-rw-r--r-- | chimere/templates/chimere/main_map_simple.html | 8 |
4 files changed, 13 insertions, 4 deletions
diff --git a/chimere/templates/blocks/bootstrap-modal.html b/chimere/templates/blocks/bootstrap-modal.html index 7ca02ce..3e8d45e 100644 --- a/chimere/templates/blocks/bootstrap-modal.html +++ b/chimere/templates/blocks/bootstrap-modal.html @@ -11,7 +11,7 @@ </div> <div class="modal-footer"> <button type="button" class="btn btn-secondary" data-dismiss="modal"> - {% trans "Cancel" %} + {% trans "Close" %} </button> {% if edit %}<button type="button" class="btn btn-primary"> {% trans "Edit" %} diff --git a/chimere/templates/chimere/blocks/share_bar.html b/chimere/templates/chimere/blocks/share_bar.html index 8829401..7ec2e58 100644 --- a/chimere/templates/chimere/blocks/share_bar.html +++ b/chimere/templates/chimere/blocks/share_bar.html @@ -14,7 +14,8 @@ {% for share_network in share_networks %} <li class='shared'> <a class='share_link share_id_{{share_network.0}}' - href='{{share_network.1}}' title="{{share_network.0}}"> + href='{{share_network.1}}' title="{{share_network.0}}"{% if share_network.3 %} + onclick='{{share_network.3}}' {% endif %}> <i class="fa {{share_network.2}}" aria-hidden="true"></i> </a> </li> diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html index d7f7d98..dc3a2aa 100644 --- a/chimere/templates/chimere/main_map.html +++ b/chimere/templates/chimere/main_map.html @@ -18,7 +18,7 @@ var area_name = "{{area_name}}"; // --> </script> -<script src="{{ STATIC_URL }}saclay/js/interface.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script> +<script src="{{ STATIC_URL }}saclay/js/interface.js?ver={{VERSION}}" type="text/javascript"></script> {% for css in extra_css %}<link rel="stylesheet" type="text/css" href="{{css}}" /> {% endfor %} @@ -86,6 +86,7 @@ {% endif %} {% display_news news_visible %} {{ block.super }} + {% block edit_blocks %} <div id='edit-button' class="action-button" data-toggle="modal" data-target="#modal-edit"> {% trans "Contribute" %} @@ -96,6 +97,7 @@ {% endwith %} {% bootstrap_modal "modal-default-message"%} + {% endblock %} <script type="text/javascript"> <!-- diff --git a/chimere/templates/chimere/main_map_simple.html b/chimere/templates/chimere/main_map_simple.html index 552d309..da302d1 100644 --- a/chimere/templates/chimere/main_map_simple.html +++ b/chimere/templates/chimere/main_map_simple.html @@ -4,7 +4,10 @@ {% 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'> @@ -12,9 +15,10 @@ <h2>{% trans "Categories"%}</h2> </a> <form method='post' name='frm_categories' id='frm_categories'> - <div id='categories' name='categories'></div> + <div id='categories'></div> </form> </div> + --> {% endblock %} {% block content %} <script type='text/javascript'><!-- @@ -22,3 +26,5 @@ // --></script> {{ block.super }} {% endblock %} +{% block edit_blocks %} +{% endblock %} |