diff options
Diffstat (limited to 'chimere/templates')
| -rw-r--r-- | chimere/templates/chimere/base.html | 3 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/actions.html | 45 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/categories.html | 6 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/footer.html | 4 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/map.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/multimedia_file.html | 1 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/share_bar.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail.html | 124 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail_description.html | 11 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail_popup.html | 63 | ||||
| -rw-r--r-- | chimere/templates/chimere/main_map.html | 9 | ||||
| -rw-r--r-- | chimere/templates/search/search.html | 12 | ||||
| -rw-r--r-- | chimere/templates/search/search_haystack.html | 2 |
13 files changed, 203 insertions, 81 deletions
diff --git a/chimere/templates/chimere/base.html b/chimere/templates/chimere/base.html index e4aa0d3..1e471d4 100644 --- a/chimere/templates/chimere/base.html +++ b/chimere/templates/chimere/base.html @@ -7,14 +7,15 @@ <link rel="stylesheet" href="{{ STATIC_URL }}font-awesome/css/font-awesome.min.css?ver=4.3.0" /> <link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.min.css?ver=3.3.7" /> <link rel="stylesheet" href="{{ STATIC_URL }}bootstrap-datepicker/css/bootstrap-datepicker.min.css?ver=1.6.4" /> +<link rel="stylesheet" href="{{ STATIC_URL }}responsiveslides/responsiveslides.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css?ver={{VERSION}}" /> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/print.css?ver={{VERSION}}" media='print'/> -<link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/styles.css?ver={{SACLAY_VERSION}}" /> {% for css in EXTRA_CSS %}<link rel="stylesheet" href="{{ css }}?ver={{SACLAY_VERSION}}" />{% endfor %} <link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/print.css?ver={{SACLAY_VERSION}}" media='print'/> <script src="{{ STATIC_URL }}bootstrap/popper.min.js?ver=3.3.7" type="text/javascript"></script> <script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js?ver=3.3.7" type="text/javascript"></script> <script src="{{ STATIC_URL }}bootstrap-datepicker/js/bootstrap-datepicker.min.js?ver=1.6.4" type="text/javascript"></script> +<script src="{{ STATIC_URL }}responsiveslides/responsiveslides.min.js" type="text/javascript"></script> {% if MOBILE %} <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/mobile.css?ver={{VERSION}}" /> <link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/mobile.css?ver={{SACLAY_VERSION}}" /> diff --git a/chimere/templates/chimere/blocks/actions.html b/chimere/templates/chimere/blocks/actions.html index 60649be..3ec9829 100644 --- a/chimere/templates/chimere/blocks/actions.html +++ b/chimere/templates/chimere/blocks/actions.html @@ -1,26 +1,25 @@ {% load i18n chimere_tags %} <div id="topbar"> - <ul id='action' class='action'> - <li id='action-carte' class='state-active'> - {% trans "Map" %} - </li> - <li id='action-participate'> - {% trans "Participate" %} - </li> - </ul> - <ul id='action-2' class='action'> - <li id='action-news'> - {% trans "News" %} - </li> - <li id='action-project' class='dyn-page'> - <a href='{% url "chimere:extra_page" "" "project"%}'>{% trans "The project" %}</a> - </li> - </ul> - <ul id='action-3' class='action'> - <li class='print-page'><a href='#'>{% trans "Print"%}</a></li> - <li class='share-list'> - {% share_bar %} - </li> - {%comment%}<li class='help-page'><a href='#'>{% trans "Help"%}</a></li>{%endcomment%} - </ul> + <div id="top-menu" class="row"> + <div class="col-md-2 action"> + <a href="{% url 'index' area_name %}"> + {% trans "Map" %} + </a> + </div> + <div class="col-md-2 action"> + <a href="{% url 'index' area_name %}"> + {% trans "Directory" %} + </a> + </div> + {% for page in extra_pages %} + <div class="col-md-2 action"> + <a href='{{page.url}}'> + {{page.name}} + </a> + </div> + {% endfor %} + <div class="col-md-6"> + <div id='search-box'></div> + </div> + </div> </div> diff --git a/chimere/templates/chimere/blocks/categories.html b/chimere/templates/chimere/blocks/categories.html index 0c9f6d1..0b2ac9b 100644 --- a/chimere/templates/chimere/blocks/categories.html +++ b/chimere/templates/chimere/blocks/categories.html @@ -6,11 +6,15 @@ <i class="triangle"></i> <label> {% trans category.name %} + <span class="control_image toggle_category" + id="maincategory_img_{{category.id}}" + alt="control"> + {% if category.selected %}-{% else %}+{% endif %} + </span> <i class="fa fa-check main-category-tick" data-category="{{category.pk}}" aria-hidden="true"></i> </label> - <img class="control_image toggle_category" id="maincategory_img_{{category.id}}" alt="control" src="{{ STATIC_URL }}saclay/images/{% if category.selected %}minus.png{% else %}plus.png{% endif %}" /> </span> <ul class='subcategories' id='maincategory_{{category.id}}'{% if not category.selected %} style='display:None'{% endif %}> {% for sub_category in lst_sub_categories %} diff --git a/chimere/templates/chimere/blocks/footer.html b/chimere/templates/chimere/blocks/footer.html index 994f12d..c341e96 100644 --- a/chimere/templates/chimere/blocks/footer.html +++ b/chimere/templates/chimere/blocks/footer.html @@ -1,3 +1,5 @@ {% load i18n %} -{% trans "This site uses Chimère"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> 2008-2017 <a href='http://www.chymeres.net/'>Chimère project</a> - {% trans "Map"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> <a href='http://openstreetmap.org/'>OpenStreetMap</a> +{% trans "This site uses Chimère"%} <img + src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> +2008-2018 <a href='http://www.chymeres.net/'>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/map.html b/chimere/templates/chimere/blocks/map.html index 262a4f4..179cc9a 100644 --- a/chimere/templates/chimere/blocks/map.html +++ b/chimere/templates/chimere/blocks/map.html @@ -33,7 +33,7 @@ $("#{{map_id}}").show(); "category_accordion": false, "category_plus": STATIC_URL + "saclay/images/plus.png", "category_minus": STATIC_URL + "saclay/images/minus.png", - "popupContentFull": true, + "popupContentFull": {{popupContentFull}}, "explicit_popup_hide": true, "map_layers": [{{js_map_layers|safe|escape}}], 'routing': {{routing}}, diff --git a/chimere/templates/chimere/blocks/multimedia_file.html b/chimere/templates/chimere/blocks/multimedia_file.html index 525702e..c8b8c81 100644 --- a/chimere/templates/chimere/blocks/multimedia_file.html +++ b/chimere/templates/chimere/blocks/multimedia_file.html @@ -29,4 +29,3 @@ {% endifequal %} {% endif %} {% endif %} -{% if multimedia_item.name %}<p class='legend'><strong>{{multimedia_item.name}}</strong></p>{% endif %} diff --git a/chimere/templates/chimere/blocks/share_bar.html b/chimere/templates/chimere/blocks/share_bar.html index 39caf59..eddef38 100644 --- a/chimere/templates/chimere/blocks/share_bar.html +++ b/chimere/templates/chimere/blocks/share_bar.html @@ -6,8 +6,6 @@ <ul class='share'> <li class='share-send'><a class='share_link share_id_{{share_networks.0.0}}{% if email_only %}_single{%endif%}' href='{{share_networks.0.1}}'><img src="{{share_network.0.2}}" alt="{{share_network.0.0}}"/></a></li> {% if not email_only %} - <li class="share-link-main"> - <a href="#">{% trans "Share" %}</a></li> {% for share_network in share_networks %} <li class='shared'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li> {% endfor %} diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html index c8fc902..1fa9bf8 100644 --- a/chimere/templates/chimere/detail.html +++ b/chimere/templates/chimere/detail.html @@ -1,55 +1,99 @@ {% load i18n sanitize chimere_tags %} -<a href='#' class='close_img'>{% trans "Close"%}</a> -<h4>{{ marker.name }}</h4> -<div id='detail_content'> +{% if color %} +<style> +#detail_footer a.current-detail-bg, #detail_footer a.current-detail-bg:link, +.current-detail-bg, a.current-detail-bg, a.current-detail-bg:link { + background-color: {{color}}; +} +</style>{% endif %} +<a href='#' class='close-img current-detail-bg'>×</a> +<div class="current-detail-bg" id="detail-header"> + <div class="row"> + {% if category.menu_icon.image %} + <div class="col-xs-2 detail-icon"> + <img src="{{category.menu_icon.image.url}}"> + </div> + {% elif category.icon.image %} + <div class="col-xs-2"> + <img src="{{category.icon.image.url}}"> + </div> + {% endif %} + <div class="col-xs-8"> + <p class="category-header"> + <strong>{{category.category}}</strong><br> + {{category.name}} + </p> + <h4>{{ marker.name }}</h4> + </div> + <div class="col-xs-2 share-icon"> + <a href="#" data-toggle="popover" title="{% trans 'Share'%}"> + <img src="{{STATIC_URL}}/chimere/img/share.svg"> + </a> + </div> + </div> +</div> + +<div id="share-bar-content"> + {% share_bar marker.name '' '' %} +</div> + +<div id='detail-content'> {% if marker.default_pictures or marker.default_pictures or marker.default_multimedia_items%} - <div class='small-gallery'> + <ul class="rslides"> {% for picture in marker.default_pictures %} - {% multimedia_render picture %} - {%endfor%} + <li> + <img src='{{picture.picture.url}}'/> + </li> + {% endfor %} {% for multimedia_item in marker.default_multimedia_items %} - {% multimedia_render multimedia_item %} + {% ifequal multimedia_item.multimedia_type.media_type 'I' %} + <li> + <img src='{{multimedia_item.url}}'/> + </li> + {% endifequal %} {%endfor%} - {% for item in marker.multimedia_items %} - {% multimedia_render item %} + </ul> + {% for multimedia_item in marker.default_multimedia_items %} + {% if multimedia_item.multimedia_type.media_type != 'I' %} + {% multimedia_render multimedia_item %} + {% endif %} {%endfor%} - </div> {%endif%} - <div> - {% if dated %} - <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}} - {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span> - {% endif %} - {% if marker.description %} - <div id='description_long_{{marker.pk}}' class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</div> - {% endif %} - {% for property in marker.getProperties %}{% if property.value %} - <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value or 'https://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div> - {%endif%}{% endfor %} - </div> -</div> -<div id='detail_footer'> - <div id='detail-action-bar'> - {%if routing_enabled%}<a class='detail_from' href='#'>{% trans "From" context "routing" %}</a> - | <a class='detail_step' href='#'>{% trans "Add step" context "routing" %}</a> - | <a class='detail_to' href='#'>{% trans "To" context "routing" %}</a> - {% endif %} + <div class="full-description"> + {% include "chimere/detail_description.html" %} </div> - <ul class='share'> - <li><a href="{{modif_by_email}}">{% trans "Propose a modification" %}</a></li> - <li class='sep'>–</li> - </ul> - {% share_bar marker.name '' '' %} - {% comment %} - <a href='{% if marker.route %}{% url "chimere:editroute-item" area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:edit-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'> + <div id='detail_footer'> + <div id='detail-action-bar'> + {%if routing_enabled%}<a class='detail_from' href='#'>{% trans "From" context "routing" %}</a> + | <a class='detail_step' href='#'>{% trans "Add step" context "routing" %}</a> + | <a class='detail_to' href='#'>{% trans "To" context "routing" %}</a> + {% endif %} + </div> + <a class="propose-modif current-detail-bg" + href='{% if marker.route %}{% url "chimere:editroute-item" area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:editmarker-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'> {% trans "Submit a modification" %} - </a> - {% endcomment %} + </a> + </div> + </div> -{% comment %} + <script language='javascript' type='text/javascript'> <!-- +$(function () { + $('.share-icon a').popover({placement: 'left'}); + $('.share-icon a').on("shown.bs.popover", function(){ + $('.share-icon .popover-content').html( + $("#share-bar-content").html() + ); + }); + $(".rslides").responsiveSlides({ + pager: true, + auto:false + }); + +}); +{% comment %} $('html').addClass('js-on'); $(function(){ $("a[rel^='prettyPhoto']").prettyPhoto({ @@ -59,5 +103,5 @@ $(function(){ }); // --> -</script> {% endcomment %} +</script> diff --git a/chimere/templates/chimere/detail_description.html b/chimere/templates/chimere/detail_description.html new file mode 100644 index 0000000..6dca8f5 --- /dev/null +++ b/chimere/templates/chimere/detail_description.html @@ -0,0 +1,11 @@ +{% load i18n sanitize %} +{% if dated %} +<p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}} + {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span> +{% endif %} +{% if marker.description %} +<div id='description_long_{{marker.pk}}'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</div> +{% endif %} +{% for property in marker.getProperties %}{% if property.value %} +<div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value or 'https://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div> +{%endif%}{% endfor %} diff --git a/chimere/templates/chimere/detail_popup.html b/chimere/templates/chimere/detail_popup.html new file mode 100644 index 0000000..64e261b --- /dev/null +++ b/chimere/templates/chimere/detail_popup.html @@ -0,0 +1,63 @@ +{% load i18n sanitize chimere_tags %} +<a href='#' class='close_img'>{% trans "Close"%}</a> +<h4>{{ marker.name }}</h4> +<div id='detail-content'> + {% if marker.default_pictures or marker.default_pictures or marker.default_multimedia_items%} + <div class='small-gallery'> + {% for picture in marker.default_pictures %} + {% multimedia_render picture %} + {%endfor%} + {% for multimedia_item in marker.default_multimedia_items %} + {% multimedia_render multimedia_item %} + {%endfor%} + {% for item in marker.multimedia_items %} + {% multimedia_render item %} + {%endfor%} + </div> + {%endif%} + <div> + {% if dated %} + <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}} + {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span> + {% endif %} + {% if marker.description %} + <div id='description_long_{{marker.pk}}' class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</div> + {% endif %} + {% for property in marker.getProperties %}{% if property.value %} + <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value or 'https://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div> + {%endif%}{% endfor %} + </div> +</div> +<div id='detail_footer'> + <div id='detail-action-bar'> + {%if routing_enabled%}<a class='detail_from' href='#'>{% trans "From" context "routing" %}</a> + | <a class='detail_step' href='#'>{% trans "Add step" context "routing" %}</a> + | <a class='detail_to' href='#'>{% trans "To" context "routing" %}</a> + {% endif %} + </div> + <ul class='share'> + <li><a href="{{modif_by_email}}">{% trans "Propose a modification" %}</a></li> + <li class='sep'>–</li> + </ul> + {% share_bar marker.name '' '' %} + {% comment %} + <a href='{% if marker.route %}{% url "chimere:editroute-item" area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:edit-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'> + {% trans "Submit a modification" %} + </a> + {% endcomment %} +</div> + +{% comment %} +<script language='javascript' type='text/javascript'> +<!-- +$('html').addClass('js-on'); +$(function(){ + $("a[rel^='prettyPhoto']").prettyPhoto({ + show_title: false, + social_tools: '' + }); + +}); +// --> +</script> +{% endcomment %} diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html index 0cc0be7..1e0b5d4 100644 --- a/chimere/templates/chimere/main_map.html +++ b/chimere/templates/chimere/main_map.html @@ -3,8 +3,6 @@ {% block extra_head %} {% head_jquery %} {% head_chimere %} -<script src="https://use.fontawesome.com/28dbea13a1.js"></script> -{% comment %}{% head_jme %}{% endcomment %} {% head_form %} <script src="{{ STATIC_URL }}saclay/js/jquery.form.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script> {% if has_search %} @@ -35,10 +33,10 @@ </div> <div id="sidebar-container"> <div class='sidebar-handler' id='sidebar-handler-hide'></div> + {% display_areas %} <div id='panel'> - {% display_areas %} <div id='map-panel'> - <div id='search-box'></div> + <div id='search-result'></div> <form action='.' method='post' name='frm_categories' id='frm_categories'> <div id='categories'>{# dynamic content #} </div> @@ -79,10 +77,9 @@ {% endif %} {% display_news news_visible %} {{ block.super }} - <div id='map-shadow'></div> <div id='edit-button' class="action-button" data-toggle="modal" data-target="#modal-edit"> - <i class="fa fa-plus" aria-hidden="true"></i> + {% trans "Contribute" %} </div> {% with title="Propose"|translate %} diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html index 67e08d9..6539700 100644 --- a/chimere/templates/search/search.html +++ b/chimere/templates/search/search.html @@ -31,12 +31,16 @@ var end_do_you_mean = "{% trans '?' %}"; {% else %} <form id='search-form' class='autocomplete-me'> - <input type="text" id="id_q" name="q" autocomplete="off"/> - <input type="hidden" id="id_area" name="area" value="{{area_name}}"/> - <button name='haystack-search' id='haystack-search' type='button' class="btn btn-default"><span class='action-label'>{% trans "Search" %} </span><span class="glyphicon glyphicon-search"></span></button> + <div> + <input type="text" id="id_q" name="q" autocomplete="off" + placeholder="{% trans 'Search...' %}"/> + <input type="hidden" id="id_area" name="area" value="{{area_name}}"/> + <button name='haystack-search' id='haystack-search' type='button' class="btn btn-default"> + <span class='action-label'>{% trans "Search" %} </span><i class="fa fa-search" aria-hidden="true"></i></button> + + </div> </form> <div id='spelling'></div> -<div id='search-result'></div> <script type='text/javascript'> no_result_message = "{% trans 'No exact match.' %}"; $(function(){ diff --git a/chimere/templates/search/search_haystack.html b/chimere/templates/search/search_haystack.html index 05ca407..9cf6b62 100644 --- a/chimere/templates/search/search_haystack.html +++ b/chimere/templates/search/search_haystack.html @@ -30,7 +30,7 @@ var end_do_you_mean = "{% trans '?' %}"; {% else %} <form id='search-form' class='autocomplete-me'> <input type="text" id="id_q" name="q" autocomplete="off"/> - <button name='haystack-search' id='haystack-search' type='button' class="btn btn-default"><span class='action-label'>{% trans "Search" %} </span><span class="glyphicon glyphicon-search"></span></button> + <button name='haystack-search' id='haystack-search' type='button' class="btn btn-default"><span class='action-label'>{% trans "Search" %} </span><i class="fa fa-search" aria-hidden="true"></i></button> </form> <div id='spelling'></div> <div id='search-result'></div> |