diff options
| -rw-r--r-- | chimere/templates/chimere/blocks/categories.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/head_chimere.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail.html | 4 | ||||
| -rw-r--r-- | example_project/settings.py.example | 7 |
4 files changed, 8 insertions, 7 deletions
diff --git a/chimere/templates/chimere/blocks/categories.html b/chimere/templates/chimere/blocks/categories.html index 5ba89fc..94e947f 100644 --- a/chimere/templates/chimere/blocks/categories.html +++ b/chimere/templates/chimere/blocks/categories.html @@ -11,7 +11,7 @@ <li id='li_sub_{{sub_category.id}}'> <input type='checkbox' name='category_{{sub_category.id}}' id='category_{{sub_category.id}}'{% if sub_category.selected %} checked='checked'{% endif %}/> <label for='category_{{sub_category.id}}'> - <img alt='{{ sub_category.name }}' src='{{ MEDIA_URL }}{{sub_category.icon.image}}'/> + <img alt='{{ sub_category.name }}' src='{{ STATIC_URL }}{{sub_category.icon.image}}'/> {% trans sub_category.name %} </label> <img id="zoom_to_subcategory_{{sub_category.id}}" class="zoom_image zoom_to_subcategory" alt='{% trans "Zoom to" %} {{sub_category.name}}' src='{{ STATIC_URL }}chimere/img/zoom.png' /> diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html index 85168f4..3ad7bf4 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 = "{{ MEDIA_URL }}"; + var MEDIA_URL = media_path = "{{ STATIC_URL }}"; // to be corrected 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 86ab6de..98033e7 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='{{MEDIA_URL}}{{picture.picture}}' alt='{{marker.name}}'/>{%endfor%} + {% for picture in marker.default_pictures %}<img src='{{STATIC_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='{{MEDIA_URL}}{{multimedia_item.picture}}'/>{% endif %} + <img alt="{{multimedia_item.name}}" src='{{STATIC_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/example_project/settings.py.example b/example_project/settings.py.example index 947d46b..bac0369 100644 --- a/example_project/settings.py.example +++ b/example_project/settings.py.example @@ -11,7 +11,8 @@ SERVER_URL = 'http://www.mydomain.com/' EXTRA_URL = 'chimere/' BASE_URL = SERVER_URL + EXTRA_URL EMAIL_HOST = 'localhost' -STATIC_URL = '/static/' +STATIC_URL = '/' + EXTRA_URL + 'staticfiles/' +STATIC_ROOT = ROOT_PATH + 'static/' TINYMCE_URL = '/tinymce/' JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', @@ -108,11 +109,11 @@ USE_L10N = True # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = ROOT_PATH + 'static/' +MEDIA_ROOT = ROOT_PATH + 'media/' # URL that handles the media served from MEDIA_ROOT. # Example: "http://media.lawrence.com" -MEDIA_URL = '/' + EXTRA_URL + 'static/' +MEDIA_URL = '/' + EXTRA_URL + 'media/' # share with SHARE_NETWORKS = ( |