diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 3 | ||||
| -rw-r--r-- | chimere/static/chimere/js/textareas.js | 12 | ||||
| -rw-r--r-- | chimere/static/chimere/js/textareas_admin.js | 10 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/head_form.html | 3 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 3 | ||||
| -rw-r--r-- | chimere/widgets.py | 21 | ||||
| -rw-r--r-- | local_settings.py.pip.sample | 1 | ||||
| -rw-r--r-- | local_settings.py.sample | 3 | ||||
| -rw-r--r-- | settings.py | 2 |
9 files changed, 32 insertions, 26 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 85c1142..c07fee7 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -1878,7 +1878,8 @@ function transformCoordToLonLat(coord) { //fin lib ios cleanRoute: function(){ - settings.layerVectors.removeAllFeatures(); + if (typeof settings.editionSource != 'undefined') + settings.editionSource.clear(); }, // add json layer addJSON: function(json_url){ diff --git a/chimere/static/chimere/js/textareas.js b/chimere/static/chimere/js/textareas.js index 22b68c8..4d2a74f 100644 --- a/chimere/static/chimere/js/textareas.js +++ b/chimere/static/chimere/js/textareas.js @@ -20,11 +20,13 @@ if (!window.tinymce_init){ window.tinymce_init = true; tinyMCE.init({ mode : "textareas", - theme : "advanced", + theme: 'modern', editor_selector : "mceEditor", relative_urls : false, - theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "" - }) + toolbar_items_size: 'small', + menubar: '', + toolbar1: 'bold italic,underline | bullist,numlist', + toolbar2: "", + toolbar3: "" + }); }; diff --git a/chimere/static/chimere/js/textareas_admin.js b/chimere/static/chimere/js/textareas_admin.js index 7acec97..1dae2aa 100644 --- a/chimere/static/chimere/js/textareas_admin.js +++ b/chimere/static/chimere/js/textareas_admin.js @@ -20,11 +20,13 @@ if (!window.tinymce_init){ window.tinymce_init = true; tinyMCE.init({ mode : "textareas", - theme : "advanced", + theme: 'modern', editor_selector : "mceEditor", relative_urls : false, - theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link,image", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "" + toolbar_items_size: 'small', + menubar: '', + toolbar1: 'bold italic,underline | bullist,numlist | link,image', + toolbar2: "", + toolbar3: "" }); }; diff --git a/chimere/templates/chimere/blocks/head_form.html b/chimere/templates/chimere/blocks/head_form.html index 4c24b29..fdcfeb3 100644 --- a/chimere/templates/chimere/blocks/head_form.html +++ b/chimere/templates/chimere/blocks/head_form.html @@ -1,2 +1 @@ - -{% if TINYMCE_URL %}<script src="{{ TINYMCE_URL }}tiny_mce.js" type="text/javascript"></script>{% endif %} +{% if ENABLE_TINYMCE %}<script src="{{ STATIC_URL }}tinymce/tinymce.min.js" type="text/javascript"></script>{% endif %} diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 1adeade..f4d0fed 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -181,7 +181,8 @@ def head_form(): """ Manualy add forms header (necessary in case of ajax load) """ - context_data = {"TINYMCE_URL": settings.TINYMCE_URL} + context_data = {"ENABLE_TINYMCE": settings.ENABLE_TINYMCE, + "STATIC_URL": settings.STATIC_URL} return context_data diff --git a/chimere/widgets.py b/chimere/widgets.py index 0b00d9d..3fb23e2 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -206,8 +206,8 @@ class ImporterChoicesWidget(forms.Select): TINYMCE_JS, FULL_TINY_JS, ADMIN_TINY_JS = [], [], [] -if settings.TINYMCE_URL: - TINYMCE_JS = ["%stiny_mce.js" % settings.TINYMCE_URL] +if settings.ENABLE_TINYMCE: + TINYMCE_JS = ["{}tinymce/tinymce.min.js".format(settings.STATIC_URL)] FULL_TINY_JS = TINYMCE_JS[:] + \ ["%schimere/js/textareas.js" % settings.STATIC_URL] ADMIN_TINY_JS = TINYMCE_JS[:] + \ @@ -254,12 +254,17 @@ class FullTextareaWidget(TextareaWidgetBase): kwargs['attrs']['class'] += 'mceEditor' rendered = super(FullTextareaWidget, self).render(*args, **kwargs) rendered += """<script type='text/javascript'> -tinyMCE.init({ - mode : "textareas", - theme : "advanced", - relative_urls : false, - editor_selector : "mceEditor" -}); + tinyMCE.init({ + mode : "textareas", + theme: 'modern', + editor_selector : "mceEditor", + relative_urls : false, + toolbar_items_size: 'small', + menubar: '', + toolbar1: 'bold italic,underline | bullist,numlist', + toolbar2: "", + toolbar3: "" + }); </script> """ return mark_safe(rendered) diff --git a/local_settings.py.pip.sample b/local_settings.py.pip.sample index 747427f..105002e 100644 --- a/local_settings.py.pip.sample +++ b/local_settings.py.pip.sample @@ -33,7 +33,6 @@ DATABASES = { } # if you want to use tinymce provide an URL or a relative path to find it -TINYMCE_URL = '' JQUERY_JS_URLS = ( '%sjquery/jquery.js' % STATIC_URL, 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js') diff --git a/local_settings.py.sample b/local_settings.py.sample index 385a774..447d01b 100644 --- a/local_settings.py.sample +++ b/local_settings.py.sample @@ -9,9 +9,6 @@ CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL CHIMERE_OSM_USER = 'osm_user' CHIMERE_OSM_PASSWORD = 'osm_pass' -# if you want to use tinymce provide an URL or a relative path to find it -TINYMCE_URL = '' - # Make this string unique, and don't share it with anybody. SECRET_KEY = '' diff --git a/settings.py b/settings.py index 39e7ceb..5787ad4 100644 --- a/settings.py +++ b/settings.py @@ -23,7 +23,7 @@ CONTACT_EMAIL = '' STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' -TINYMCE_URL = '' +ENABLE_TINYMCE = False JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', '/javascript/jquery-ui/jquery-ui.js',) JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css', |