Merge pull request jazzband#128 from dani0805/tinymce4

Upgrade to 4.2.4

Author: Natim

docs/index.rst

@@ -30,13 +30,31 @@ Make sure `staticfiles`_ application is properly configured (TinyMCE is bundled
         ...
     )
 
+#. Add a custom profile if needed in ``settings.py``. A sample profile is shown below, for all the available options check http://www.tinymce.com/wiki.php/Configuration ::
+
+    TINYMCE_PROFILE = {
+        'theme': 'modern',
+        'plugins': 'noneditable advlist autolink link lists charmap hr searchreplace wordcount visualblocks visualchars code insertdatetime save table contextmenu directionality paste textcolor',
+        'toolbar': 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | forecolor backcolor | upload_button',
+        'noneditable_leave_contenteditable': 'true',
+        'setup': 'addCustomButtons',
+        'content_css': os.path.join(STATIC_URL, "mycss/tinymce.css"),
+        'relative_urls': False,
+        'remove_script_host': True,
+        'document_base_url': APP_HOST_URL,
+        'removed_menuitems': 'newdocument'
+    }
+
+
 #. Use ``HTMLField`` where you would use ``TextField`` (or check Usage for alternatives). ::
 
     from django.db import models
     from tinymce.models import HTMLField
+    from myproject.settings import TINYMCE_PROFILE
 
     class MyModel(models.Model):
-        my_field = HTMLField()
+        my_field = HTMLField(profile=TINYMCE_PROFILE)
+
 
 The django-tinymce code is licensed under the `MIT License`_. See the ``LICENSE.txt``
 file in the distribution. Note that the TinyMCE editor is distributed under

metadata.py

@@ -1,4 +1,4 @@
 name = 'tinymce'
 authors = 'Joost Cassee, Aljosa Mohorovic'
-version = '2.0-dev'
+version = '3.0'
 release = version

tinymce/static/tinymce/langs/ar.js

@@ -1,8 +1,11 @@
 tinymce.addI18n('ar',{
 "Cut": "\u0642\u0635",
+"Heading 5": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 5",
 "Header 2": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 2",
 "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u062a\u0635\u0641\u062d\u0643 \u0644\u0627 \u064a\u062f\u0639\u0645 \u0627\u0644\u0648\u0635\u0648\u0644 \u0627\u0644\u0645\u0628\u0627\u0634\u0631 \u0625\u0644\u0649 \u0627\u0644\u062d\u0627\u0641\u0638\u0629. \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u062e\u062a\u0635\u0627\u0631\u0627\u062a \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0641\u0627\u062a\u064a\u062d Ctrl+X\/C\/V \u0628\u062f\u0644\u0627 \u0645\u0646 \u0630\u0644\u0643.",
+"Heading 4": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 4",
 "Div": "Div",
+"Heading 2": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 2",
 "Paste": "\u0644\u0635\u0642",
 "Close": "\u0625\u063a\u0644\u0627\u0642",
 "Font Family": "\u0639\u0627\u0626\u0644\u0629 \u0627\u0644\u062e\u0637",
@@ -11,6 +14,8 @@ tinymce.addI18n('ar',{
 "New document": "\u0645\u0633\u062a\u0646\u062f \u062c\u062f\u064a\u062f",
 "Blockquote": "\u0639\u0644\u0627\u0645\u0627\u062a \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633",
 "Numbered list": "\u062a\u0631\u0642\u064a\u0645",
+"Heading 1": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 1",
+"Headings": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629",
 "Increase indent": "\u0632\u064a\u0627\u062f\u0629 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
 "Formats": "\u0627\u0644\u062a\u0646\u0633\u064a\u0642\u0627\u062a",
 "Headers": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646",
@@ -34,9 +39,11 @@ tinymce.addI18n('ar',{
 "Italic": "\u0645\u0627\u0626\u0644",
 "Align center": "\u062a\u0648\u0633\u064a\u0637",
 "Header 5": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 5",
+"Heading 6": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 6",
+"Heading 3": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 3",
 "Decrease indent": "\u0625\u0646\u0642\u0627\u0635 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
 "Header 4": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u0644\u0635\u0642 \u0645\u0646 \u062d\u0627\u0644\u064a\u0627 \u0628\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0646\u0635 \u0627\u0644\u0639\u0627\u062f\u064a. \u0633\u064a\u062a\u0645\u0643\u0646 \u0627\u0644\u0622\u0646 \u0645\u0646 \u0644\u0635\u0642 \u0643\u0644 \u0627\u0644\u0645\u062d\u062a\u0648\u064a\u0627\u062a \u0643\u0646\u0635 \u0639\u0627\u062f\u064a \u062d\u062a\u0649 \u062a\u0642\u0648\u0645 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u062e\u064a\u0627\u0631.",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u064a\u062a\u0645 \u0627\u0644\u0644\u0635\u0642 \u062d\u0627\u0644\u064a\u0627\u064b \u0643\u0646\u0635 \u0639\u0627\u062f\u064a. \u0627\u0644\u0645\u062d\u062a\u0648\u0649 \u0633\u064a\u0628\u0642\u0649 \u0643\u0646\u0635 \u0639\u0627\u062f\u064a \u062d\u062a\u0649 \u062a\u0642\u0648\u0645 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u062e\u064a\u0627\u0631.",
 "Underline": "\u062a\u0633\u0637\u064a\u0631",
 "Cancel": "\u0625\u0644\u063a\u0627\u0621",
 "Justify": "\u0636\u0628\u0637",
@@ -59,6 +66,7 @@ tinymce.addI18n('ar',{
 "Restore last draft": "\u0627\u0633\u062a\u0639\u0627\u062f\u0629 \u0623\u062e\u0631 \u0645\u0633\u0648\u062f\u0629",
 "Special character": "\u0631\u0645\u0632",
 "Source code": "\u0634\u0641\u0631\u0629 \u0627\u0644\u0645\u0635\u062f\u0631",
+"Color": "\u0627\u0644\u0644\u0648\u0646",
 "Right to left": "\u0645\u0646 \u0627\u0644\u064a\u0645\u064a\u0646 \u0644\u0644\u064a\u0633\u0627\u0631",
 "Left to right": "\u0645\u0646 \u0627\u0644\u064a\u0633\u0627\u0631 \u0644\u0644\u064a\u0645\u064a\u0646",
 "Emoticons": "\u0627\u0644\u0631\u0645\u0648\u0632",
@@ -121,11 +129,13 @@ tinymce.addI18n('ar',{
 "Finish": "\u0627\u0646\u062a\u0647\u064a",
 "Ignore all": "\u062a\u062c\u0627\u0647\u0644 \u0627\u0644\u0643\u0644",
 "Ignore": "\u062a\u062c\u0627\u0647\u0644",
+"Add to Dictionary": "\u0627\u0636\u0641 \u0627\u0644\u064a \u0627\u0644\u0642\u0627\u0645\u0648\u0633",
 "Insert row before": "\u0625\u062f\u0631\u0627\u062c \u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
 "Rows": "\u0639\u062f\u062f \u0627\u0644\u0635\u0641\u0648\u0641",
 "Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
 "Paste row after": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0633\u0641\u0644",
 "Alignment": "\u0645\u062d\u0627\u0630\u0627\u0629",
+"Border color": "\u0644\u0648\u0646 \u0627\u0644\u0625\u0637\u0627\u0631",
 "Column group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0639\u0645\u0648\u062f",
 "Row": "\u0635\u0641",
 "Insert column before": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0633\u0627\u0631",
@@ -141,15 +151,20 @@ tinymce.addI18n('ar',{
 "Paste row before": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
 "Scope": "\u0627\u0644\u0645\u062c\u0627\u0644",
 "Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
+"H Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0623\u0641\u0642\u064a\u0629",
+"Top": "\u0623\u0639\u0644\u064a",
 "Header cell": "\u0631\u0623\u0633 \u0627\u0644\u062e\u0644\u064a\u0629",
 "Column": "\u0639\u0645\u0648\u062f",
+"Row group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0635\u0641",
 "Cell": "\u062e\u0644\u064a\u0629",
-"Header": "\u0627\u0644\u0631\u0623\u0633",
+"Middle": "\u0627\u0644\u0648\u0633\u0637",
 "Cell type": "\u0646\u0648\u0639 \u0627\u0644\u062e\u0644\u064a\u0629",
 "Copy row": "\u0646\u0633\u062e \u0627\u0644\u0635\u0641",
 "Row properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0635\u0641",
 "Table properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u062c\u062f\u0648\u0644",
-"Row group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0635\u0641",
+"Bottom": "\u0627\u0644\u0623\u0633\u0641\u0644",
+"V Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0631\u0623\u0633\u064a\u0629",
+"Header": "\u0627\u0644\u0631\u0623\u0633",
 "Right": "\u064a\u0645\u064a\u0646",
 "Insert column after": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0645\u064a\u0646",
 "Cols": "\u0639\u062f\u062f \u0627\u0644\u0623\u0639\u0645\u062f\u0629",
@@ -164,6 +179,9 @@ tinymce.addI18n('ar',{
 "Insert template": "\u0625\u062f\u0631\u0627\u062c \u0642\u0627\u0644\u0628",
 "Templates": "\u0642\u0648\u0627\u0644\u0628",
 "Background color": "\u0644\u0648\u0646 \u0627\u0644\u062e\u0644\u0641\u064a\u0629",
+"Custom...": "\u062a\u062e\u0635\u064a\u0635 ...",
+"Custom color": "\u0644\u0648\u0646 \u0645\u062e\u0635\u0635",
+"No color": "\u0628\u062f\u0648\u0646 \u0644\u0648\u0646",
 "Text color": "\u0644\u0648\u0646 \u0627\u0644\u0646\u0635",
 "Show blocks": "\u0645\u0634\u0627\u0647\u062f\u0629 \u0627\u0644\u0643\u062a\u0644",
 "Show invisible characters": "\u0623\u0638\u0647\u0631 \u0627\u0644\u0623\u062d\u0631\u0641 \u0627\u0644\u063a\u064a\u0631 \u0645\u0631\u0626\u064a\u0629",

tinymce/static/tinymce/langs/ar_SA.js

@@ -59,6 +59,7 @@ tinymce.addI18n('ar_SA',{
 "Restore last draft": "\u0627\u0633\u062a\u0639\u0627\u062f\u0629 \u0623\u062e\u0631 \u0645\u0633\u0648\u062f\u0629",
 "Special character": "Special character",
 "Source code": "Source code",
+"Color": "\u062a\u062d\u062f\u064a\u062f \u0627\u0644\u0644\u0648\u0646",
 "Right to left": "\u0645\u0646 \u0627\u0644\u064a\u0645\u064a\u0646 \u0625\u0644\u064a \u0627\u0644\u064a\u0633\u0627\u0631",
 "Left to right": "\u0645\u0646 \u0627\u0644\u064a\u0633\u0627\u0631 \u0625\u0644\u064a \u0627\u0644\u064a\u0645\u064a\u0646",
 "Emoticons": "\u0627\u0644\u0631\u0645\u0648\u0632",

tinymce/static/tinymce/langs/az.js

@@ -9,7 +9,7 @@ tinymce.addI18n('az',{
 "Paste": "\u018flav\u0259 et",
 "Close": "Ba\u011fla",
 "Font Family": "Font stili",
-"Pre": "Qabaqcadan",
+"Pre": "Pre",
 "Align right": "Sa\u011f t\u0259r\u0259f \u00fczr\u0259",
 "New document": "Yeni s\u0259n\u0259d",
 "Blockquote": "Sitat",
@@ -28,10 +28,10 @@ tinymce.addI18n('az',{
 "Header 1": "Ba\u015fl\u0131q 1",
 "Superscript": "Yuxar\u0131 indeks",
 "Clear formatting": "Format\u0131 t\u0259mizl\u0259",
-"Font Sizes": "Font \u00f6l\u00e7\u00fcs\u00fc",
+"Font Sizes": "Font \u00f6l\u00e7\u00fcl\u0259ri",
 "Subscript": "A\u015fa\u011f\u0131 indeks",
-"Header 6": "Ba\u015fl\u0131q 6\u00e7",
-"Redo": "Ir\u0259li",
+"Header 6": "Ba\u015fl\u0131q 6",
+"Redo": "\u0130r\u0259li",
 "Paragraph": "Paraqraf",
 "Ok": "Oldu",
 "Bold": "Qal\u0131n",
@@ -53,7 +53,7 @@ tinymce.addI18n('az',{
 "Visual aids": "Konturlar\u0131 g\u00f6st\u0259r",
 "Lower Greek": "Ki\u00e7ik Yunan \u0259lifbas\u0131",
 "Square": "Sah\u0259",
-"Default": "\u018fvv\u0259ld\u0259n qurulmu\u015f",
+"Default": "Susmaya g\u00f6r\u0259",
 "Lower Alpha": "Ki\u00e7ik Alfa \u0259lifbas\u0131",
 "Circle": "Dair\u0259",
 "Disc": "Disk",
@@ -66,9 +66,10 @@ tinymce.addI18n('az',{
 "Restore last draft": "Son layih\u0259nin b\u0259rpas\u0131",
 "Special character": "X\u00fcsusi simvollar",
 "Source code": "M\u0259nb\u0259 kodu",
+"Color": "R\u0259ng",
 "Right to left": "Sa\u011fdan sola",
 "Left to right": "Soldan sa\u011fa",
-"Emoticons": "T\u0259b\u0259ss\u00fcml\u0259r",
+"Emoticons": "Emosiyalar",
 "Robots": "Robotlar",
 "Document properties": "S\u0259n\u0259din x\u00fcsusiyy\u0259tl\u0259ri",
 "Title": "Ba\u015fl\u0131q",
@@ -89,7 +90,7 @@ tinymce.addI18n('az',{
 "Image description": "\u015e\u0259kilin t\u0259sviri",
 "Style": "Stil",
 "Dimensions": "\u00d6l\u00e7\u00fcl\u0259r",
-"Insert image": "\u015e\u0259kilin redakt\u0259 edilm\u0259si",
+"Insert image": "\u015e\u0259kil yerl\u0259\u015fdir",
 "Insert date\/time": "G\u00fcn\/tarix \u0259lav\u0259 et",
 "Remove link": "Linki sil",
 "Url": "Linkin \u00fcnvan\u0131",
@@ -128,11 +129,13 @@ tinymce.addI18n('az',{
 "Finish": "Bitir",
 "Ignore all": "Ham\u0131s\u0131n\u0131 iqnorla",
 "Ignore": "\u0130qnorla",
+"Add to Dictionary": "L\u00fc\u011f\u0259t\u0259 \u0259lav\u0259 edilsin",
 "Insert row before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
 "Rows": "S\u0259tirl\u0259r",
 "Height": "H\u00fcnd\u00fcrl\u00fcy\u00fc",
 "Paste row after": "Sonras\u0131na s\u0259tir \u0259lav\u0259 et",
 "Alignment": "D\u00fczl\u0259ndirm\u0259",
+"Border color": "\u00c7\u0259r\u00e7iv\u0259 r\u0259ngi",
 "Column group": "S\u00fctunun qrupu",
 "Row": "S\u0259tir",
 "Insert column before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
@@ -143,7 +146,7 @@ tinymce.addI18n('az',{
 "Insert table": "S\u0259tir \u0259lav\u0259 et",
 "Body": "K\u00fctl\u0259",
 "Caption": "Ba\u015flan\u011f\u0131c",
-"Footer": "Son",
+"Footer": "\u018fn a\u015fa\u011f\u0131",
 "Delete row": "S\u0259tiri sil",
 "Paste row before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
 "Scope": "Sfera",
@@ -176,6 +179,9 @@ tinymce.addI18n('az',{
 "Insert template": "\u015eablon \u0259lav\u0259 et",
 "Templates": "\u015eablonlar",
 "Background color": "Arxafon r\u0259ngi",
+"Custom...": "\u00c7\u0259kilm\u0259...",
+"Custom color": "\u00c7\u0259kilm\u0259 r\u0259ng",
+"No color": "R\u0259ngsiz",
 "Text color": "M\u0259tnin r\u0259ngi",
 "Show blocks": "Bloklar\u0131 g\u00f6st\u0259r",
 "Show invisible characters": "G\u00f6r\u00fcnm\u0259y\u0259n simvollar\u0131 g\u00f6st\u0259r",

tinymce/static/tinymce/langs/be.js

@@ -66,6 +66,9 @@ tinymce.addI18n('be',{
 "Restore last draft": "\u0410\u0434\u043d\u0430\u045e\u043b\u0435\u043d\u043d\u0435 \u0430\u043f\u043e\u0448\u043d\u044f\u0433\u0430 \u043f\u0440\u0430\u0435\u043a\u0442\u0430",
 "Special character": "\u0421\u043f\u0435\u0446\u044b\u044f\u043b\u044c\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
 "Source code": "\u0417\u044b\u0445\u043e\u0434\u043d\u044b \u043a\u043e\u0434",
+"B": "B",
+"R": "R",
+"G": "G",
 "Color": "\u041a\u043e\u043b\u0435\u0440",
 "Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u0430",
 "Left to right": "\u0417\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u0430",
@@ -91,6 +94,25 @@ tinymce.addI18n('be',{
 "Style": "\u0421\u0442\u044b\u043b\u044c",
 "Dimensions": "\u041f\u0430\u043c\u0435\u0440",
 "Insert image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
+"Zoom in": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c",
+"Contrast": "\u041a\u0430\u043d\u0442\u0440\u0430\u0441\u0442",
+"Back": "\u041d\u0430\u0437\u0430\u0434",
+"Gamma": "\u0413\u0430\u043c\u0430",
+"Flip horizontally": "\u0410\u0434\u043b\u044e\u0441\u0442\u0440\u0430\u0432\u0430\u0446\u044c \u0433\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430",
+"Resize": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043f\u0430\u043c\u0435\u0440",
+"Sharpen": "\u0412\u044b\u0440\u0430\u0437\u043d\u0430\u0441\u0446\u044c",
+"Zoom out": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c",
+"Image options": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u044b\u044f\u0432\u044b",
+"Apply": "\u0423\u0436\u044b\u0446\u044c",
+"Brightness": "\u042f\u0440\u043a\u0430\u0441\u0446\u044c",
+"Rotate clockwise": "\u041f\u0430\u0432\u044f\u0440\u043d\u0443\u0446\u044c clockwise",
+"Rotate counterclockwise": "\u041f\u0430\u0432\u044f\u0440\u043d\u0443\u0446\u044c counterclockwise",
+"Edit image": "\u0420\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
+"Color levels": "\u0423\u0437\u0440\u043e\u045e\u043d\u0456 \u043a\u043e\u043b\u0435\u0440\u0430\u045e",
+"Crop": "\u0410\u0431\u0440\u044d\u0437\u0430\u0446\u044c",
+"Orientation": "\u0410\u0440\u044b\u0435\u043d\u0442\u0430\u0446\u044b\u044f",
+"Flip vertically": "\u0410\u0434\u043b\u044e\u0441\u0442\u0440\u0430\u0432\u0430\u0446\u044c \u0432\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u0430",
+"Invert": "\u0406\u043d\u0432\u0435\u0440\u0442\u0430\u0432\u0430\u0446\u044c",
 "Insert date\/time": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
 "Remove link": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
 "Url": "\u0410\u0434\u0440\u0430\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",