Commit ebeabbcc authored by chris's avatar chris

various fixes

parent d9ce93a1
flyers (0.20140711) UNRELEASED; urgency=low
flyers (0.20140719) UNRELEASED; urgency=low
* Initial release.
-- Christophe Siraut <d@tobald.eu.org> Mon, 14 Jul 2014 17:18:01 +0200
-- Christophe Siraut <d@tobald.eu.org> Sat, 19 Jul 2014 15:15:25 +0200
......@@ -7,7 +7,7 @@
"logo": "",
"site_description": "Nous envoyons des flyers de spectacles de th\u00e9atre.",
"site_name": "Flyers",
"home_page": 1
"home_page": null
}
}
]
......@@ -9,6 +9,6 @@ DATABASES = {
'NAME': os.path.join(BASE_DIR, 'db.sqlite'),
}
}
STATIC_ROOT = os.path.join(BASE_DIR, 'staticroot')
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
CKEDITOR_UPLOAD_PATH = os.path.join(BASE_DIR, 'media', 'uploads')
......@@ -36,9 +36,11 @@
&nbsp;
</div>
{% if object.title != 'Welcome' %}
<div id="footer">
<div class="pagewrap" style="padding: 10px; text-align: center;">Website powered with <a href="http://www.tobald.eu.org/projects/flyers/">Flyers</a> - <a href="/admin/">Admin</a> </div></div>
</div>
{% endif %}
</div>
......
......@@ -4,7 +4,7 @@
{% block title %} - {{ object.title }}{% endblock %}
{% block content %}
{% if object.text or object.page_set %}
{% if object.text or object.page_set|length %}
<div class="pagewrap">
<div class="page">
<div class="pagelinks">
......
from modeltranslation.translator import translator, TranslationOptions
from flyers.content.models import Page, Press, Reference
class PageTranslationOptions(TranslationOptions):
fields = ('text',)
translator.register(Page, PageTranslationOptions)
class PressTranslationOptions(TranslationOptions):
fields = ('text',)
translator.register(Press, PressTranslationOptions)
class ReferenceTranslationOptions(TranslationOptions):
fields = ('text',)
translator.register(Reference, ReferenceTranslationOptions)
......@@ -84,8 +84,8 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.6/howto/static-files/
STATIC_URL = '/staticroot/'
STATIC_ROOT = os.path.join(BASE_DIR, 'staticroot')
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
CKEDITOR_UPLOAD_PATH = os.path.join(BASE_DIR, 'media', 'uploads')
......@@ -106,6 +106,6 @@ LANGUAGES = (
('ca', 'Català'),
)
MODELTRANSLATION_TRANSLATION_REGISTRY = ('flyer.translation',)
SITE_MULTILINGUAL = False
SITE_MULTILINGUAL = True
if SITE_MULTILINGUAL:
INSTALLED_APPS += ('modeltranslation',)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment