diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/chimere/base.html | 18 | ||||
-rw-r--r-- | templates/chimere/blocks/categories.html | 7 | ||||
-rw-r--r-- | templates/chimere/blocks/map.html | 4 | ||||
-rw-r--r-- | templates/chimere/blocks/map_menu.html | 14 | ||||
-rw-r--r-- | templates/chimere/blocks/share_bar.html | 3 | ||||
-rw-r--r-- | templates/chimere/blocks/submited.html | 2 | ||||
-rw-r--r-- | templates/chimere/blocks/welcome.html | 40 | ||||
-rw-r--r-- | templates/chimere/detail.html | 11 | ||||
-rw-r--r-- | templates/chimere/main_map.html | 23 | ||||
-rw-r--r-- | templates/chimere/main_map_simple.html | 120 | ||||
-rw-r--r-- | templates/search/search.html | 8 |
11 files changed, 211 insertions, 39 deletions
diff --git a/templates/chimere/base.html b/templates/chimere/base.html index d616765..de5a885 100644 --- a/templates/chimere/base.html +++ b/templates/chimere/base.html @@ -1,12 +1,14 @@ {% extends "base.html" %} {% load chimere_tags i18n %} {% block extra_head %} +<link href='https://fonts.googleapis.com/css?family=Numans' rel='stylesheet' type='text/css'/> <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=4.3.0" /> <link rel="shortcut icon" href="{{ STATIC_URL }}saclay/images/favicon.png?ver={{SACLAY_VERSION}}"/> <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}}" /> +<link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/saclay.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/bootstrap.min.js?ver=3.0.0" type="text/javascript"></script> @@ -17,6 +19,22 @@ <script src="{{ STATIC_URL }}saclay/js/mobile.chimere.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script>{%endif%} {% if css_area %} <link rel="stylesheet" href="{{ css_area }}?ver={{SACLAY_VERSION}}" />{% endif %} + +<!-- Piwik --> +<script type="text/javascript"> + var _paq = _paq || []; + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="https://stats.iggdrasil.net/"; + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', 3]); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; + g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); +</script> +<noscript><p><img src="https://stats.iggdrasil.net/piwik.php?idsite=3" style="border:0;" alt="" /></p></noscript> +<!-- End Piwik Code --> {% endblock %} {% block header %} <noscript> diff --git a/templates/chimere/blocks/categories.html b/templates/chimere/blocks/categories.html index 05115ef..0fe73df 100644 --- a/templates/chimere/blocks/categories.html +++ b/templates/chimere/blocks/categories.html @@ -2,8 +2,11 @@ <ul id='ul_categories'> {% for category, lst_sub_categories in sub_categories %} <li class='main_category {% if category.selected %}toggle_minus{%else%}toggle_plus{%endif%}'> - <span id='main_category_{{category.pk}}'><label>{% trans category.name %}</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> + <span id='main_category_{{category.pk}}'> + <i class="triangle"></i> + <label>{% trans category.name %}</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 %} <li id='li_sub_{{sub_category.id}}' class='subcategory'> diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html index da68b49..26bc9bd 100644 --- a/templates/chimere/blocks/map.html +++ b/templates/chimere/blocks/map.html @@ -21,7 +21,6 @@ $("#{{map_id}}").show(); <script type="text/javascript"> - {% if single_category %} $(function() {$('#panel').hide()});{% endif %} var permalink = window.location.hash.substr(1); @@ -62,6 +61,9 @@ $("#{{map_id}}").show(); chimere_init_options["restricted_extent"] = bounds; {% endif %} + // Spécifique Saclay + chimere_init_options["minZoom"] = 12; + $("#{{map_id}}").chimere(chimere_init_options); {% if zoom %} if (!permalink) $('#{{map_id}}').chimere('zoom', {'area':{{zoom}} }); diff --git a/templates/chimere/blocks/map_menu.html b/templates/chimere/blocks/map_menu.html new file mode 100644 index 0000000..38fb4a8 --- /dev/null +++ b/templates/chimere/blocks/map_menu.html @@ -0,0 +1,14 @@ +{% load i18n %} +<div id='chimere_map_menu'> + <ul> + {% if routing %} + <li id='map_menu_from' class='routing_item'>{% trans "From" context "routing" %}</li> + <li id='map_menu_step' class='routing_item'>{% trans "Add a step" context "routing" %}</li> + <li id='map_menu_to' class='routing_item'>{% trans "To" context "routing" %}</li> + <li id='map_menu_clear' class='routing_item'>{% trans "Clear the itinerary" context "routing" %}</li> + {% endif%} + <li id='map_menu_zoomin'>{% trans "Zoom in" %}</li> + <li id='map_menu_zoomout'>{% trans "Zoom out" %}</li> + <li id='map_menu_center'>{% trans "Center the map here" %}</li> + </ul> +</div> diff --git a/templates/chimere/blocks/share_bar.html b/templates/chimere/blocks/share_bar.html index 39caf59..32e8e82 100644 --- a/templates/chimere/blocks/share_bar.html +++ b/templates/chimere/blocks/share_bar.html @@ -11,8 +11,7 @@ {% 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 %} - {% if rss %}<li class='shared'><a href='{% url "chimere:feeds-global" %}'> - <img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{% endif %}{%endif%} + {% if rss %}<li class='shared'><a href='{% url "chimere:feeds-global" %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{% endif %}{%endif%} </ul>{% endif %} <script type='text/javascript'> <!-- diff --git a/templates/chimere/blocks/submited.html b/templates/chimere/blocks/submited.html index b0d2dac..953d1bc 100644 --- a/templates/chimere/blocks/submited.html +++ b/templates/chimere/blocks/submited.html @@ -3,7 +3,7 @@ <h2>Merci</h2> <h3>pour votre contribution au projet !</h3> -<p>En proposant un nouvel élément, vous contribuez à enrichir la carte avec des données libres. Une fois validée, votre contribution sera disponible selon les termes de la licence <a href='https://creativecommons.org/licenses/by-sa/3.0/fr/'>Creative Commons Paternité - Pas d’Utilisation Commerciale 2.0 France</a>. Vous devez être l’auteur des éléments que vous nous faites partager ou bien vous être assuré de l’accord de leur auteur pour cette mise à disposition. Ceci concerne les textes, photos et tout contenu multimedia.</p> +<p>En proposant un nouvel élément, vous contribuez à enrichir la carte avec des données libres. Une fois validée, votre contribution sera disponible selon les termes de la licence <a href='https://creativecommons.org/licenses/by-nc/2.0/fr/'>Creative Commons Paternité - Pas d’Utilisation Commerciale 2.0 France</a>. Vous devez être l’auteur des éléments que vous nous faites partager ou bien vous être assuré de l’accord de leur auteur pour cette mise à disposition. Ceci concerne les textes, photos et tout contenu multimedia.</p> {% if contact_email %}<p>N’hésitez pas à nous contacter pour toute question : <a href='mailto:{{contact_email}}'>{{contact_email}}</a>.</p>{% endif%} </div> <script type='text/javascript'> diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html index a70e92f..ea20b9f 100644 --- a/templates/chimere/blocks/welcome.html +++ b/templates/chimere/blocks/welcome.html @@ -1,25 +1,44 @@ {% load i18n sanitize chimere_tags %} +{% comment %} + +{# TODO remove? #} + {% if news_lst or welcome_message %} <script type='text/javascript'> <!-- $(function(){ - /* $('#welcome div.media-player').jmeEmbedControls(); $('#welcome video').each(function(index){$(this).pause()}); - $('#welcome audio').each(function(index){$(this).pause()});*/ - $("#welcome").dialog({width:826, height:410, dialogClass:'welcome-dialog' - {% if not display %}, autoOpen:false{% endif %}}); + $('#welcome audio').each(function(index){$(this).pause()}); + $("#welcome").dialog({width:550, height:300, dialogClass:'welcome-dialog' + {% if not display %}, autoOpen:false{% endif %}, + open: function () { $("#welcome_content").scrollTop(0); } + }); }); // --> </script> <div id='welcome' style='display:none'> - <div class='title'> - <h2>{{title}}</h2> - </div> <div id='welcome_message'> - <div id='welcome_content'> - {{welcome_message|safe}} - </div> + + <h3>Trouvez</h3> + <p>un concert, du poulet fermier, une randonnée</p> + + <p class='welcome-search'> + <input id="id_welcome_search" name='__welcome_search__' autocomplete="off" type="text"> + <button type="button" id='haystack-search-page' class="btn btn-default"><span class="action-label">Rechercher </span><span class="glyphicon glyphicon-search"></span></button> + </p> + + <h4>L'agenda du Plateau en 1 clic</h4> + <p> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RH'><img src='http://saclay.carte-ouverte.org/media/icons/event_reunions.png' title='Réunions publiques' alt='Réunions publiques'/></a> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RI'><img src='http://saclay.carte-ouverte.org/media/icons/event_conf.png' title='Conférences et projections' alt='Conférences et projections'/></a> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RJ'><img src='http://saclay.carte-ouverte.org/media/icons/event_expos.png' title='Expositions et visites' alt='Expositions et visites'/></a> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RO'><img src='http://saclay.carte-ouverte.org/media/icons/event_spectacle.png' title='Spectacles' alt='Spectacles'/></a> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RN'><img src='http://saclay.carte-ouverte.org/media/icons/event_forma_ateliers.png' title='Formations et ateliers' alt='Formations et ateliers'/></a> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RM'><img src='http://saclay.carte-ouverte.org/media/icons/event_brocante.png' title='Brocante et marchés artisanaux' alt='Brocante et marchés artisanaux'/></a> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RL'><img src='http://saclay.carte-ouverte.org/media/icons/event_rando.png' title='Randonnées' alt='Randonnées'/></a> + <a href='http://saclay.carte-ouverte.org/saclay/ty/RK'><img src='http://saclay.carte-ouverte.org/media/icons/event_sports.png' title='Manifestations sportives' alt='Manifestations sportives'/></a> + </p> </div> </div> <script type='text/javascript'> @@ -34,3 +53,4 @@ $(function(){ // --> </script> {% endif %} +{% endcomment %} diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html index fccbc05..798cd4f 100644 --- a/templates/chimere/detail.html +++ b/templates/chimere/detail.html @@ -17,15 +17,18 @@ {%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> + <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"l d F Y"}} + {% if marker.end_date %} - {{marker.end_date|date:"l d F 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> + <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 img img:src"|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> + <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 img img:src"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div> {%endif%}{% endfor %} + {% if marker.origin %} + <div class='origin'><label>Source :</label> {{marker.origin|safe}}</div> + {% endif %} </div> </div> <div id='detail_footer'> diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index c95f064..e37ad80 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -1,5 +1,5 @@ {% extends "chimere/base.html" %} -{% load i18n unlocalize_point chimere_tags %} +{% load i18n static unlocalize_point chimere_tags %} {% block extra_head %} {% head_jquery %} {% head_chimere %} @@ -8,7 +8,7 @@ {% head_form %} <script src="{{ STATIC_URL }}saclay/js/jquery.form.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script> {% if has_search %} -<script src="{{ STATIC_URL }}chimere/js/search.js?ver={{VERSION}}" type="text/javascript"></script> +<script src="{{ STATIC_URL }}saclay/js/search.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script> <script src="{{ STATIC_URL }}chimere/js/search-autocomplete.js?ver={{VERSION}}" type="text/javascript"></script>{% endif %} <script type='text/javascript' language='javascript'> @@ -72,8 +72,24 @@ <i class="fa fa-arrow-circle-left" aria-hidden="true"></i> <p>REVENIR AUX CATÉGORIES</p> </div> <div class='footer' id='footer-panel'> + <p>Disponible en téléchargement sur mobile</p> + <div id="store"> + <a href="https://play.google.com/store/apps/details?id=com.saclay.saclaycarteouverte" + target="_blank"> + <img src="{% static 'saclay/images/googleplay.svg' %}" + alt="Google play" class="store-image"/> + </a> + <a href="https://itunes.apple.com/fr/app/carto/id768621760?mt=8" + target="_blank"> + <img src="{% static 'saclay/images/appstore.svg' %}" + alt="App store" class="store-image"/> + </a> + </div> + <span id='action-project' class='dyn-page'> + <a href='/dyn/project/'>le projet</a> + </span> | {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact" %}</a> | {% endif %} - <a href='{% url 'chimere:extra_page' '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service & credits" %}</a> + <a href="{% url 'chimere:extra_page' '' 'legal' %}" id='page-legal' class='dyn-page'>{% trans "terms of service & credits" %}</a> </div> </div> {% endblock %} @@ -111,6 +127,7 @@ {% if itinerary_form %}<div id='routing-button' class="action-button"> <i class="fa fa-map-signs" aria-hidden="true"></i></div>{% endif %} <div id='default-message'></div> + <a href="{% url 'chimere:extra_page' '' 'feedback' %}" id='page-feedback' class='dyn-page'>Suggestions</a> <script type="text/javascript"> <!-- $("#main-map").show(); diff --git a/templates/chimere/main_map_simple.html b/templates/chimere/main_map_simple.html index 552d309..a14ea3f 100644 --- a/templates/chimere/main_map_simple.html +++ b/templates/chimere/main_map_simple.html @@ -1,24 +1,116 @@ -{% 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 %} +{% extends "chimere/base.html" %} +{% load i18n unlocalize_point chimere_tags %} +{% block extra_head %} +{% head_jquery %} +{% head_chimere %} +{% head_jme %} +{% head_form %} +<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script> +<script src="{{ STATIC_URL }}saclay/js/SaclayCloud.js" type="text/javascript"></script> +<script src="{{ STATIC_URL }}saclay/js/jquery.form.js" type="text/javascript"></script> + +<script type='text/javascript' language='javascript'> + <!-- + var default_error_message = "{% trans "Error while loading the page... Refresh the page. If the problem persist contact the webmaster." %}"; + var edit_url = "{% url edit %}"; + var edit_event_url = "{% url edit-event %}"; + var edit_route_url = "{% url edit-route %}"; + // --> +</script> +<script src="{{ STATIC_URL }}saclay/js/interface.js" type="text/javascript"></script> +{{ block.super }} +{% endblock %} {% block message_edit %}{% endblock %} {% block sidebar %} <div class='sidebar-handler' id='sidebar-handler-hide'> </div> + <div id='action-panel'> + <ul id='map-actions' class='action'> + <li id='action-categories' class='state-active'> + <label>{% trans "Categories" %}</label> + </li>{% if itinerary_form %} + <li id='action-routing'> + <label>{% trans "Routing" %}</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 id='panel'> - <a> - <h2>{% trans "Categories"%}</h2> - </a> - <form method='post' name='frm_categories' id='frm_categories'> - <div id='categories' name='categories'></div> - </form> + <div id='map-panel'> + <form action='.' method='post' name='frm_categories' id='frm_categories'> + <div id='categories'>{# dynamic content #} + </div> + </form> + {% routing %} + </div> + <div id='edit-panel'> + <div id='frm-edit-marker'>{# dynamic content #} + </div> + <div id='frm-edit-route'>{# dynamic content #} + </div> + <div id='frm-edit-event'>{# dynamic content #} + </div> + </div> + </div> + <div class='footer' id='footer-panel'> + {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact us" %}</a> | {% endif %} + <a href='{% url chimere:extra_page '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a> </div> {% endblock %} {% block content %} - <script type='text/javascript'><!-- - var simple = true; - // --></script> + <div id='category_description'> + </div> + <script type='text/javascript'> + $(function(){ + $('#category_description').dialog({'autoOpen':false, width:630, + 'dialogClass':'no-titlebar'}); + }); + </script> + <div class='sidebar-handler' id='sidebar-handler-show'> + </div> + <div id='detail' class='ui-widget ui-corner-all'></div> + {% if not itinerary_form %}<div class='map_button'> + <a href='#' id='button-move-map' class='toggle-button toggle-button-active' onclick='toggleDrawOff();return false;'> + {% trans "Move on the map" %} + </a> + <a href='#' id='button-draw-map' class='toggle-button toggle-button-inactive' onclick='toggleDrawOn();return false;'> + {% trans "Draw" %} + </a> + </div>{% endif %} + <div id='permalink'></div> + {% if simple %} + {% display_welcome 0 %} + {%else%} + {% display_welcome news_visible %} + {% endif %} + {% display_news news_visible %} {{ block.super }} + <div id='map-shadow'></div> + <div id='default-message'></div> +<script type="text/javascript"> + <!-- + $("#main-map").show(); + // --> +</script> + {% map_menu %} + {% map 'main-map' %} + <div id='chimere_message'></div> + <script type='text/javascript'> + $(function(){$('#chimere_message').dialog({'autoOpen':false, + dialogClass:'no-titlebar-simple', position:'right bottom', + resizable: false});}); + </script> +{% endblock %} +{% block footer %} + <p class='map-footer'>{% include "chimere/blocks/footer.html" %}</p> {% endblock %} diff --git a/templates/search/search.html b/templates/search/search.html index 8aab1eb..e6f37fc 100644 --- a/templates/search/search.html +++ b/templates/search/search.html @@ -29,8 +29,12 @@ 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> + <input type="text" id="id_q" name="q" autocomplete="off" + placeholder="TROUVEZ un concert, du poulet fermier..."/> + <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> |