summaryrefslogtreecommitdiff
path: root/templates/chimere
diff options
context:
space:
mode:
Diffstat (limited to 'templates/chimere')
-rw-r--r--templates/chimere/base.html5
-rw-r--r--templates/chimere/blocks/alternate_multimedia.html2
-rw-r--r--templates/chimere/blocks/welcome.html61
-rw-r--r--templates/chimere/main_map.html3
4 files changed, 27 insertions, 44 deletions
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index b24f070..5f88092 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -1,6 +1,7 @@
{% 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="shortcut icon" href="{{ STATIC_URL }}saclay/images/favicon.png"/>
<link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/print.css" media='print'/>
@@ -21,14 +22,14 @@
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
- var u="https://piwik.proxience.net/";
+ 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://piwik.proxience.net/piwik.php?idsite=3" style="border:0;" alt="" /></p></noscript>
+<noscript><p><img src="https://stats.iggdrasil.net/piwik.php?idsite=3" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
{% endblock %}
{% block header %}
diff --git a/templates/chimere/blocks/alternate_multimedia.html b/templates/chimere/blocks/alternate_multimedia.html
index d535d7b..61c42c3 100644
--- a/templates/chimere/blocks/alternate_multimedia.html
+++ b/templates/chimere/blocks/alternate_multimedia.html
@@ -36,7 +36,7 @@
</div>{%endcomment%}
<div class="fieldWrapper">
<label for="multimedia_name">{% trans "Name" %}</label>
- <input type='text' id='multimedia_name' name='multimedia_name'>
+ <input type='text' id='multimedia_name' name='multimedia_name' value=" ">
</div>
<div class="fieldWrapper">
<input type='radio' value='image' id='media_type_image' name="multimedia_type"> <label for='media_type_image'>{% trans "Image" %}</label>
diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index 8d7add2..aa5d7f1 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -6,7 +6,7 @@ $(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'
+ $("#welcome").dialog({width:550, height:300, dialogClass:'welcome-dialog'
{% if not display %}, autoOpen:false{% endif %},
open: function () { $("#welcome_content").scrollTop(0); }
});
@@ -14,47 +14,28 @@ $(function(){
// -->
</script>
<div id='welcome' style='display:none'>
- <div class='title'>
- <h2>{{title}}</h2>
- </div>
- {% comment %} <img src='{{STATIC_URL}}saclay/images/popup/welcome_header.png' alt='Welcome header'/> {% endcomment %}
<div id='welcome_message'>
- <div id='welcome_content'>
- {{welcome_message|safe}}
- </div>
- <div id='logos'>
- <a href='http://www.paris-malaquais.archi.fr/'><img alt='Paris Malaquais link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-paris-malaquais.png'/></a><a href='http://www.terreetcite.org/'><img alt='Terre et cité link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-terre-et-cite.png'/></a><a href='http://www.groupechronos.org/'><img alt='Chronos link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-chronos.png'/></a>
- </div>
+ <h3>Trouvez</h3>
+ <p>un concert, du fromage de chèvre, 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>
- {% comment %} <div class='welcome-col'>
- <div class='news'>
- {% if news_lst %}
- {% for news in news_lst %}
- <div class='info'>
- {% if news.title %}
- <h4>{{news.title}} &ndash; {{ news.date }}</h4>
- {{news.short_desc|safe}}
- {% else %}
- <h4>{{news.name}} &ndash; {{ news.start_date }}{% if news.end_date %} - {{ news.end_date }}{% endif %}</h4>
- {% if news.description %}
- {{news.short_desc|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td th tr"|safe}}...
- {% endif %}
- {% endif %}
- <p class='marker_link'>
- {% if news.point %}
- <a href='{% get_tinyfied_url news area_name %}'>{% trans "See it on the map"%}</a> -
- {% endif %}
- <a href='#' class='get_more_information'>{% trans "More informations"%}</a>
- {% if news.url %}
- - <a href='{{news.url}}'>{% trans "Go to the event website"%}</a>
- {% endif %}
- </p>
- </div>
- {%endfor%}
- {% endif %}
- </div>
- <div class='footer'><a href='#' class='get_more_information'>{% trans "See all news" %}</a></div>
- </div>{% endcomment %}
</div>
<script type='text/javascript'>
<!--
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 2acbba5..28beea9 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -9,7 +9,7 @@
<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>
{% if has_search %}
-<script src="{{ STATIC_URL }}chimere/js/search.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}saclay/js/search.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}chimere/js/search-autocomplete.js" type="text/javascript"></script>{% endif %}
<script type='text/javascript' language='javascript'>
@@ -103,6 +103,7 @@
{{ block.super }}
<div id='map-shadow'></div>
<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();
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 05:20:05 +0000