Update tinymce configuration

4 files changed, 25 insertions, 17 deletions

diff --git a/chimere/forms.py b/chimere/forms.py
index 748f815..33da85d 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -295,7 +295,8 @@ class MarkerAdminFormBase(forms.ModelForm):
     """
     is_admin = True
     name = forms.CharField(label=_("Name"), required=True)
-    description = forms.CharField(widget=TextareaAdminWidget, required=False)
+    description = forms.CharField(widget=FullTextareaWidget,
+                                  required=False)
     _PROPERTY_FILTERS = {}
 
     class Meta:
diff --git a/chimere/static/chimere/js/textareas.js b/chimere/static/chimere/js/textareas.js
index 4d2a74f..e40252d 100644
--- a/chimere/static/chimere/js/textareas.js
+++ b/chimere/static/chimere/js/textareas.js
@@ -24,8 +24,9 @@ if (!window.tinymce_init){
         editor_selector : "mceEditor",
         relative_urls : false,
         toolbar_items_size: 'small',
+        plugins: 'link',
         menubar: '',
-        toolbar1: 'bold italic,underline | bullist,numlist',
+        toolbar1: 'bold italic underline | bullist numlist | link | removeformat',
         toolbar2: "",
         toolbar3: ""
     });
diff --git a/chimere/static/chimere/js/textareas_admin.js b/chimere/static/chimere/js/textareas_admin.js
index 1dae2aa..9e6c9ab 100644
--- a/chimere/static/chimere/js/textareas_admin.js
+++ b/chimere/static/chimere/js/textareas_admin.js
@@ -25,7 +25,7 @@ if (!window.tinymce_init){
         relative_urls : false,
         toolbar_items_size: 'small',
         menubar: '',
-        toolbar1: 'bold italic,underline | bullist,numlist | link,image',
+        toolbar1: 'bold italic underline | bullist numlist | link',
         toolbar2: "",
         toolbar3: ""
     });
diff --git a/chimere/widgets.py b/chimere/widgets.py
index 4b6830d..6c56ecc 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -233,6 +233,16 @@ class TextareaWidgetBase(forms.Textarea):
             kwargs['attrs']['class'] += ' '
         kwargs['attrs']['class'] += 'mceEditor'
         rendered = super(TextareaWidgetBase, self).render(*args, **kwargs)
+        rendered += """
+<style>
+.mce-tinymce{
+    position: initial;
+}
+.field-%s label{
+    padding: 0.9em 1em;
+}
+</style>
+""" % args[0]
         return mark_safe(rendered)
 
 
@@ -256,20 +266,16 @@ class FullTextareaWidget(TextareaWidgetBase):
             kwargs['attrs']['class'] += ' '
         kwargs['attrs']['class'] += 'mceEditor'
         rendered = super(FullTextareaWidget, self).render(*args, **kwargs)
-        rendered += """<script type='text/javascript'>
-    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>
-"""
+        rendered += """
+<style>
+.mce-tinymce{
+    position: initial;
+}
+.field-%s label{
+    padding: 0.9em 1em;
+}
+</style>
+""" % args[0]
         return mark_safe(rendered)