summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media/icons/readme1
-rw-r--r--media/pictures/readme1
-rw-r--r--media/route_files/readme1
-rw-r--r--mobile_settings.py11
-rw-r--r--static/saclay/css/saclay.css9
-rw-r--r--static/saclay/css/styles.css18
-rw-r--r--static/saclay/images/handler-hide.pngbin232 -> 1110 bytes
-rw-r--r--static/saclay/images/handler-show.pngbin224 -> 1111 bytes
-rw-r--r--static/saclay/images/logo_mobile.pngbin0 -> 9066 bytes
-rw-r--r--static/saclay/js/SaclayCloud.js108
-rw-r--r--templates/chimere/base.html4
-rw-r--r--templates/chimere/blocks/actions.html27
-rw-r--r--templates/chimere/blocks/page_title.html12
-rw-r--r--templates/chimere/detail.html19
-rw-r--r--templates/chimere/main_map.html8
15 files changed, 124 insertions, 95 deletions
diff --git a/media/icons/readme b/media/icons/readme
deleted file mode 100644
index 968559a..0000000
--- a/media/icons/readme
+++ /dev/null
@@ -1 +0,0 @@
-Icons files are stored here
diff --git a/media/pictures/readme b/media/pictures/readme
deleted file mode 100644
index a8a7401..0000000
--- a/media/pictures/readme
+++ /dev/null
@@ -1 +0,0 @@
-Pictures files are stored here
diff --git a/media/route_files/readme b/media/route_files/readme
deleted file mode 100644
index 90d72ab..0000000
--- a/media/route_files/readme
+++ /dev/null
@@ -1 +0,0 @@
-Route files are stored here
diff --git a/mobile_settings.py b/mobile_settings.py
new file mode 100644
index 0000000..4da5a1b
--- /dev/null
+++ b/mobile_settings.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+try:
+ from settings import *
+except ImportError, e:
+ print 'Unable to load settings.py:', e
+
+SITE_ID = 2
+DEBUG = True
+TEMPLATE_DEBUG = True
diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css
index 8d03d22..312a27e 100644
--- a/static/saclay/css/saclay.css
+++ b/static/saclay/css/saclay.css
@@ -616,6 +616,15 @@
background-image:url('../images/subcategories/ress_heberg_on.png');
}
+/*68 - Culture - Scientifique */
+#li_sub_68 label{
+ background-image:url('../images/subcategories/cult_7_off.png');
+}
+
+#li_sub_68 .selected label{
+ background-image:url('../images/subcategories/cult_7_on.png');
+}
+
/*82 - Ressources pratiques - Offices de Tourisme et SI*/
#li_sub_82 label{
background-image:url('../images/subcategories/ress_offices_off.png');
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 5847c3c..4e6a92c 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -23,7 +23,7 @@ h2, .cloud h4, #layer_selection, #layer_selection h4, #permalink a,
}
/* activated */
-#detail_footer, #detail_footer a, #chimere_itinerary h4,
+.small-galery p.legend, #detail_footer, #detail_footer a, #chimere_itinerary h4,
h3.warn, .itinerary_label.itinerary_start, .itinerary_label.itinerary_end,
.action li.ui-state-active{
color:#fff;
@@ -97,6 +97,7 @@ ul#multimedia_list_content li, #welcome .footer,
background-color:#d6d6c4;
}
+.small-galery p.legend,
#detail_footer{
background-color:#9f9f89;
}
@@ -147,6 +148,11 @@ div.warning, .errorlist{
background-color:#fff;
}
+/* black */
+.small-galery{
+ background-color:#000;
+}
+
h2, h3{
background:none;
}
@@ -271,7 +277,7 @@ h3.warn{
}
.welcome-dialog.ui-dialog .ui-dialog-titlebar-close{
- right:10px;
+ right:0;
width:30px;
height:30px;
top:5px;
@@ -293,11 +299,11 @@ h3.warn{
}
.no-titlebar-small.ui-dialog .ui-dialog-titlebar{
- width:340px;
+ width:300px;
}
.no-titlebar.ui-dialog .ui-dialog-titlebar{
- width:630px;
+ width:650px;
}
.no-titlebar.ui-dialog .ui-dialog-titlebar-close,
@@ -1887,6 +1893,10 @@ select#id_categories{
left:auto;
}
+#main-map .olControlZoom{
+ display:none;
+}
+
#main-map .olControlPanPanel .olButton,
#main-map .olControlZoomPanel .olButton {
background-image: url('../images/map_sprite.png');
diff --git a/static/saclay/images/handler-hide.png b/static/saclay/images/handler-hide.png
index 844300a..2d02a29 100644
--- a/static/saclay/images/handler-hide.png
+++ b/static/saclay/images/handler-hide.png
Binary files differ
diff --git a/static/saclay/images/handler-show.png b/static/saclay/images/handler-show.png
index f258f87..5ad9615 100644
--- a/static/saclay/images/handler-show.png
+++ b/static/saclay/images/handler-show.png
Binary files differ
diff --git a/static/saclay/images/logo_mobile.png b/static/saclay/images/logo_mobile.png
new file mode 100644
index 0000000..33a7718
--- /dev/null
+++ b/static/saclay/images/logo_mobile.png
Binary files differ
diff --git a/static/saclay/js/SaclayCloud.js b/static/saclay/js/SaclayCloud.js
index a3f48f4..23da041 100644
--- a/static/saclay/js/SaclayCloud.js
+++ b/static/saclay/js/SaclayCloud.js
@@ -1,54 +1,54 @@
-
-/* set this empty if you put cloud-popup-saclay.png inside your default
- * OpenLayers dir */
-var SACLAY_IMAGE_PATH = '../../saclay/images/'
-
-OpenLayers.Popup.SaclayCloud =
- OpenLayers.Class(OpenLayers.Popup.FramedCloud, {
-
- initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox,
- closeBoxCallback) {
- this.positionBlocks.tc = {
- 'offset': new OpenLayers.Pixel(-217, 28),
- 'padding': new OpenLayers.Bounds(8, 30, 8, 9),
- 'blocks': [
- { // top-left
- size: new OpenLayers.Size('auto', 'auto'),
- anchor: new OpenLayers.Bounds(0, 51, 22, 0),
- position: new OpenLayers.Pixel(0, 0)
- },
- { //top-right
- size: new OpenLayers.Size(22, 'auto'),
- anchor: new OpenLayers.Bounds(null, 50, 0, 0),
- position: new OpenLayers.Pixel(-1238, 0)
- },
- { //bottom-left
- size: new OpenLayers.Size('auto', 19),
- anchor: new OpenLayers.Bounds(0, 32, 22, null),
- position: new OpenLayers.Pixel(0, -631)
- },
- { //bottom-right
- size: new OpenLayers.Size(22, 18),
- anchor: new OpenLayers.Bounds(null, 32, 0, null),
- position: new OpenLayers.Pixel(-1238, -631)
- /*anchor: new OpenLayers.Bounds(null, 32, 10, null),
- position: new OpenLayers.Pixel(-1228, -632)*/
- },
- { // stem
- size: new OpenLayers.Size(54, 35),
- anchor: new OpenLayers.Bounds(null, 0, 168, null),
- position: new OpenLayers.Pixel(0, -688)
- }
- ]
- };
-
- this.calculateRelativePosition = function () {return 'tc';};
- this.autoSize = true;
- this.imageSrc = (OpenLayers.Util.getImageLocation(SACLAY_IMAGE_PATH + 'cloud-popup-saclay.png'));
- OpenLayers.Popup.Framed.prototype.initialize.apply(this, arguments);
- this.contentDiv.className = this.contentDisplayClass;
- },
-
- CLASS_NAME: "OpenLayers.Popup.SaclayCloud"
-});
-
+
+/* set this empty if you put cloud-popup-saclay.png inside your default
+ * OpenLayers dir */
+var SACLAY_IMAGE_PATH = '../../saclay/images/'
+
+OpenLayers.Popup.SaclayCloud =
+ OpenLayers.Class(OpenLayers.Popup.FramedCloud, {
+
+ initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox,
+ closeBoxCallback) {
+ this.positionBlocks.tc = {
+ 'offset': new OpenLayers.Pixel(-140, 28),
+ 'padding': new OpenLayers.Bounds(8, 30, 8, 9),
+ 'blocks': [
+ { // top-left
+ size: new OpenLayers.Size('auto', 'auto'),
+ anchor: new OpenLayers.Bounds(0, 51, 22, 0),
+ position: new OpenLayers.Pixel(0, 0)
+ },
+ { //top-right
+ size: new OpenLayers.Size(22, 'auto'),
+ anchor: new OpenLayers.Bounds(null, 50, 0, 0),
+ position: new OpenLayers.Pixel(-1238, 0)
+ },
+ { //bottom-left
+ size: new OpenLayers.Size('auto', 19),
+ anchor: new OpenLayers.Bounds(0, 32, 22, null),
+ position: new OpenLayers.Pixel(0, -631)
+ },
+ { //bottom-right
+ size: new OpenLayers.Size(22, 18),
+ anchor: new OpenLayers.Bounds(null, 32, 0, null),
+ position: new OpenLayers.Pixel(-1238, -631)
+ /*anchor: new OpenLayers.Bounds(null, 32, 10, null),
+ position: new OpenLayers.Pixel(-1228, -632)*/
+ },
+ { // stem
+ size: new OpenLayers.Size(54, 35),
+ anchor: new OpenLayers.Bounds(null, 0, 97, null),
+ position: new OpenLayers.Pixel(0, -688)
+ }
+ ]
+ };
+
+ this.calculateRelativePosition = function () {return 'tc';};
+ this.autoSize = true;
+ this.imageSrc = (OpenLayers.Util.getImageLocation(SACLAY_IMAGE_PATH + 'cloud-popup-saclay.png'));
+ OpenLayers.Popup.Framed.prototype.initialize.apply(this, arguments);
+ this.contentDiv.className = this.contentDisplayClass;
+ },
+
+ CLASS_NAME: "OpenLayers.Popup.SaclayCloud"
+});
+
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index 5f88092..a213980 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -33,6 +33,8 @@
<!-- End Piwik Code -->
{% endblock %}
{% block header %}
+{% comment %}
+<-- app mobile !-->
<noscript>
<div id="no-js-message">
<p id='no-js' class='warning'>{% trans "You must enable JavaScript in your browser to display Chimère."%}</p>
@@ -44,6 +46,7 @@
{% block actions %}
{% include "chimere/blocks/actions.html" %}
{% endblock %}
+{% endcomment %}
{% endblock %}
{% block content %}
{% block top %}{% endblock %}
@@ -54,4 +57,3 @@
{% block footer %}
{% include "chimere/blocks/footer.html" %}
{% endblock %}
-
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index dca7fc7..be7f6bd 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -1,26 +1 @@
-{% 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>
+<!-- SUPPRIME POUR VUE MOBILE --> \ No newline at end of file
diff --git a/templates/chimere/blocks/page_title.html b/templates/chimere/blocks/page_title.html
index f068b97..785299a 100644
--- a/templates/chimere/blocks/page_title.html
+++ b/templates/chimere/blocks/page_title.html
@@ -1,5 +1,7 @@
-{% load i18n %}
- <div id='page_title'>
- <h1>Carte OuVerte</h1>
- <h2>du plateau de saclay</h2>
- </div>
+{% load i18n %}
+<!-- SUPPRIME POUR VUE MOBILE
+ <div id='page_title'>
+ <h1>Carte OuVerte</h1>
+ <h2>du plateau de saclay</h2>
+ </div>
+--> \ No newline at end of file
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index 5f576d7..ebe2992 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -17,8 +17,8 @@
{%endif%}
<div>
{% if dated %}
- <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>
+ <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 img img:src"|safe}}</div>
@@ -28,6 +28,8 @@
{%endif%}{% endfor %}
{% if marker.origin %}
<div class='origin'><label>Source :</label> {{marker.origin|safe}}</div>
+ {% if marker.multimedia_items %}
+ <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
{% endif %}
</div>
</div>
@@ -49,6 +51,19 @@
</a>
{% endcomment %}
</div>
+{% if marker.multimedia_items %}
+<div id='gallery-{{marker.pk}}' class='gallery'>
+ <div class='tabs'>
+ <ul>{% for item in marker.multimedia_items %}
+ <li><a href="#tab-{{ forloop.counter }}">{{ item.name }}</a></li>{% endfor %}
+ </ul>
+ {% for multimedia_item in marker.multimedia_items %}
+ <div id="tab-{{ forloop.counter }}" class='{% ifequal multimedia_item.multimedia_type.media_type 'V' %}video{% else %}other{% endifequal %}'>
+ {% multimedia_render multimedia_item %}
+ </div>{% endfor %}
+ </div>
+</div>
+{% endif %}
<script language='javascript' type='text/javascript'>
<!--
$('html').addClass('js-on');
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index f1409d0..9dce672 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -27,6 +27,8 @@
{% block sidebar %}
<div class='sidebar-handler' id='sidebar-handler-hide'>
</div>
+ {% comment %}
+ <!-- SUPPRIME POUR LA VUE MOBILE
<div id='action-panel'{% if has_search %} class='three'{% endif %}>
<ul id='map-actions' class='action'>
<li id='action-categories' class='state-active'>
@@ -50,6 +52,8 @@
</li>
</ul>
</div>
+ FIN SUPPRESSION POUR LA VUE -->
+ {% endcomment %}
<div id='panel'>
<div id='map-panel'>
<form action='.' method='post' name='frm_categories' id='frm_categories'>
@@ -68,10 +72,14 @@
</div>
</div>
</div>
+ {% comment %}
+ <!-- SUPPRIME POUR LA VUE MOBILE
<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>
+ FIN SUPPRESSION POUR LA VUE -->
+ {% endcomment %}
{% endblock %}
{% block content %}
<div id='category_description'>
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 05:14:37 +0000