Skip to content

Commit 8487f8f

Browse files
committed
tinymce-update (to 3.5b2)
1 parent d18013b commit 8487f8f

File tree

196 files changed

+14354
-11122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+14354
-11122
lines changed

docs/changelog.rst

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
Changelog
99
=========
1010

11+
2.3.8 (April 03, 2012)
12+
----------------------
13+
14+
* TinyMCE Update (3.5b2)
15+
1116
2.3.7 (February 11, 2012)
1217
-------------------------
1318

docs/index.rst

+5
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ Code
6565

6666
https://github.com/sehmaschine/django-grappelli
6767

68+
Screenshots
69+
-----------
70+
71+
http://sehmaschine.github.com/django-grappelli/
72+
6873
Discussion
6974
----------
7075

grappelli/static/grappelli/tinymce/changelog.txt

+225
Large diffs are not rendered by default.

grappelli/static/grappelli/tinymce/examples/full.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
// General options
1111
mode : "textareas",
1212
theme : "advanced",
13-
plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
13+
plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave,visualblocks",
1414

1515
// Theme options
1616
theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
1717
theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
1818
theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
19-
theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",
19+
theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft,visualblocks",
2020
theme_advanced_toolbar_location : "top",
2121
theme_advanced_toolbar_align : "left",
2222
theme_advanced_statusbar_location : "bottom",
@@ -52,7 +52,7 @@
5252
<!-- /TinyMCE -->
5353

5454
</head>
55-
<body>
55+
<body role="application">
5656

5757
<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">
5858
<div>

grappelli/static/grappelli/tinymce/examples/lists/media_list.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ var tinyMCEMediaList = [
1010
["Some RealMedia", "media/sample.rm"],
1111
["Some Shockwave", "media/sample.dcr"],
1212
["Some Video", "media/sample.mp4"],
13-
["Some FLV", "media/sample.flv"],
13+
["Some FLV", "media/sample.flv"]
1414
];

grappelli/static/grappelli/tinymce/jscripts/tiny_mce/langs/de.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)