Set RU language by default, add files for custom css

movie4 · movie4 · commit 5d784d6b2f8c · 2015-10-14T18:26:41.000+05:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,4 +1,5 @@
 Changelog
 =========
 
+* 0.0.11 - Set RU language by default, add files for custom css
 * 0.0.10 - Update to TinyMCE 4.2.6
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "django-tinymce-4",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "homepage": "https://github.com/ITCase/django-tinymce-4",
   "authors": [
     "ITCase <info@itcase.pro>"
diff --git a/tinymce_4/__init__.py b/tinymce_4/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.0.10'
+__version__ = '0.0.11'
diff --git a/tinymce_4/static/tinymce_4/css/tinymce_content.css b/tinymce_4/static/tinymce_4/css/tinymce_content.css
@@ -0,0 +1,5 @@
+body
+{
+  background: #fff;
+  padding: 15px 0 0 15px;
+}
diff --git a/tinymce_4/static/tinymce_4/css/tinymce_reset.css b/tinymce_4/static/tinymce_4/css/tinymce_reset.css
@@ -0,0 +1,4 @@
+body
+{
+  font-size: 1em !important;
+}
diff --git a/tinymce_4/static/tinymce_4/langs/ru.js b/tinymce_4/static/tinymce_4/langs/ru.js
diff --git a/tinymce_4/static/tinymce_4/settings/full.js b/tinymce_4/static/tinymce_4/settings/full.js
@@ -17,12 +17,13 @@ function change_image_alignment(node, styles) {
 tinymce.init({
   height: '350px',
   selector: 'textarea.tinymce',
+  language_url : '/static/tinymce_4/langs/ru.js',
   theme: 'modern',
   relative_urls: false,
   valid_elements: '*[*]',
   content_css: [
-    '/static/tinymce_4/tinymce_content.css?' + new Date().getTime(),
-    '/static/tinymce_4/tinymce_reset.css?'+ new Date().getTime()
+    '/static/tinymce_4/css/tinymce_content.css?' + new Date().getTime(),
+    '/static/tinymce_4/css/tinymce_reset.css?'+ new Date().getTime()
   ],
 
   plugins: [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "django-tinymce-4",`
`3`		`- "version": "0.0.10",`
	`3`	`+ "version": "0.0.11",`
`4`	`4`	`"homepage": "https://github.com/ITCase/django-tinymce-4",`
`5`	`5`	`"authors": [`
`6`	`6`	`"ITCase <[email protected]>"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`		`-__version__ = '0.0.10'`
	`2`	`+__version__ = '0.0.11'`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +body
 +{
 +  background: #fff;
 +  padding: 15px 0 0 15px;
 +}