diff options
| -rw-r--r-- | chimere/models.py | 6 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/head_chimere.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail.html | 4 | ||||
| -rw-r--r-- | chimere/templates/chimere/upload_file.html | 3 | ||||
| -rw-r--r-- | chimere/views.py | 2 | ||||
| -rw-r--r-- | chimere/widgets.py | 3 |
6 files changed, 11 insertions, 9 deletions
diff --git a/chimere/models.py b/chimere/models.py index b367f8c..ee4688d 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -426,7 +426,7 @@ class MultimediaFile(models.Model): class PictureFile(models.Model): name = models.CharField(_(u"Name"), max_length=150, blank=True, null=True) - picture = models.ImageField(_(u"Image"), upload_to='upload', + picture = models.ImageField(_(u"Image"), upload_to='pictures', height_field='height', width_field='width') height = models.IntegerField(_(u"Height")) width = models.IntegerField(_(u"Width")) @@ -438,9 +438,9 @@ class PictureFile(models.Model): class RouteFile(models.Model): name = models.CharField(_(u"Name"), max_length=150) - raw_file = models.FileField(_(u"Raw file (gpx or kml)"), upload_to='upload') + raw_file = models.FileField(_(u"Raw file (gpx or kml)"), upload_to='route_files') simplified_file = models.FileField(_(u"Simplified file"), - upload_to='upload', blank=True, null=True) + upload_to='route_files', blank=True, null=True) TYPE = (('K', _(u'KML')), ('G', _(u'GPX'))) file_type = models.CharField(max_length=1, choices=TYPE) diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html index 3ad7bf4..85168f4 100644 --- a/chimere/templates/chimere/blocks/head_chimere.html +++ b/chimere/templates/chimere/blocks/head_chimere.html @@ -8,7 +8,7 @@ /* lower cases are for retrocompatibility */ var DYNAMIC_CATEGORIES = {{ DYNAMIC_CATEGORIES|lower }}; var STATIC_URL = static_url = "{{ STATIC_URL }}"; - var MEDIA_URL = media_path = "{{ STATIC_URL }}"; // to be corrected + var MEDIA_URL = media_path = "{{ MEDIA_URL }}"; var extra_url = "{{ EXTRA_URL }}"; var ICON_WIDTH = {{ ICON_WIDTH }}; var ICON_HEIGHT = {{ ICON_HEIGHT }}; diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html index 98033e7..86ab6de 100644 --- a/chimere/templates/chimere/detail.html +++ b/chimere/templates/chimere/detail.html @@ -1,7 +1,7 @@ {% load i18n sanitize %} <h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{{ marker.name }}</h2> <div id='detail_content'> - {% for picture in marker.default_pictures %}<img src='{{STATIC_URL}}{{picture.picture}}' alt='{{marker.name}}'/>{%endfor%} + {% for picture in marker.default_pictures %}<img src='{{MEDIA_URL}}{{picture.picture}}' alt='{{marker.name}}'/>{%endfor%} <div> {% if dated %} <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}} @@ -35,7 +35,7 @@ {% 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 %}'> {% if multimedia_item.picture %} - <img alt="{{multimedia_item.name}}" src='{{STATIC_URL}}{{multimedia_item.picture}}'/>{% endif %} + <img alt="{{multimedia_item.name}}" src='{{MEDIA_URL}}{{multimedia_item.picture}}'/>{% endif %} {% if multimedia_item.url and not multimedia_item.multimedia_type.iframe %} <div class="media-player"> <span class="media-label">{{multimedia_item.name}}</span> diff --git a/chimere/templates/chimere/upload_file.html b/chimere/templates/chimere/upload_file.html index ba1b7f3..7e17563 100644 --- a/chimere/templates/chimere/upload_file.html +++ b/chimere/templates/chimere/upload_file.html @@ -4,7 +4,8 @@ <head> <title>{% block title %}Chimère{% endblock %}</title> <script type="text/javascript"><!-- - var media_path = '{{STATIC_URL}}'; + var media_path = '{{MEDIA_URL}}'; + var static_path = '{{STATIC_URL}}'; var extra_url = "{{extra_url}}"; // --></script> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" /> diff --git a/chimere/views.py b/chimere/views.py index 0785998..59fc3b8 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -50,7 +50,7 @@ def get_base_response(area_name=""): """ Get the base url """ - base_response_dct = {'media_path':settings.STATIC_URL,} + base_response_dct = {'media_path':settings.MEDIA_URL,} base_url = reverse("chimere:index") # App urls must be included with namespace if not base_url.startswith('/'): base_url = '/' + base_url diff --git a/chimere/widgets.py b/chimere/widgets.py index d648835..9877a45 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -40,7 +40,8 @@ def getMapJS(area_name=''): js += u"var centerLonLat = new OpenLayers.LonLat(%f,"\ u"%f).transform(epsg_display_projection, epsg_projection);\n" % \ settings.CHIMERE_DEFAULT_CENTER - js += u"var media_path = '%s';\n" % settings.STATIC_URL + js += u"var media_path = '%s';\n" % settings.MEDIA_URL + js += u"var static_path = '%s';\n" % settings.STATIC_URL js += u"var map_layer = %s;\n" % settings.CHIMERE_MAP_LAYER js += u"var restricted_extent;\n" |