Merge pull request #502 from mes3yd/make-jquery-urls-configurable

feat(make-jquery-urls-configurable): Add settings
This commit is contained in:
partizan 2019-03-31 21:37:46 +03:00 committed by GitHub
commit 4292034b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions

View file

@ -359,8 +359,8 @@ class TabbedDjangoJqueryTranslationAdmin(TranslationAdmin):
class Media:
js = (
'modeltranslation/js/force_jquery.js',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js',
'//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js',
mt_settings.JQUERY_UI_URL,
mt_settings.JQUERY_MB_BROWSER_URL,
'modeltranslation/js/tabbed_translation_fields.js',
)
css = {
@ -375,9 +375,9 @@ class TabbedExternalJqueryTranslationAdmin(TranslationAdmin):
"""
class Media:
js = (
'//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js',
'//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js',
mt_settings.JQUERY_URL,
mt_settings.JQUERY_UI_URL,
mt_settings.JQUERY_MB_BROWSER_URL,
'modeltranslation/js/tabbed_translation_fields.js',
)
css = {

View file

@ -54,3 +54,10 @@ for key, value in FALLBACK_LANGUAGES.items():
ENABLE_FALLBACKS = getattr(settings, 'MODELTRANSLATION_ENABLE_FALLBACKS', True)
LOADDATA_RETAIN_LOCALE = getattr(settings, 'MODELTRANSLATION_LOADDATA_RETAIN_LOCALE', True)
JQUERY_URL = getattr(settings, 'JQUERY_URL',
'//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js')
JQUERY_UI_URL = getattr(settings, 'JQUERY_UI_URL',
'//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js')
JQUERY_MB_BROWSER_URL = getattr(settings, 'JQUERY_MB_BROWSER_URL',
'//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js')