Commit Graph

38 Commits

Author SHA1 Message Date
Andrew O'Neil
b456a2c56e MINOR: Allow imagemaps in tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Andrew O'Neil
d4c788d4b5 MINOR: Allow imagemaps in tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sam Minnee
b6e0c2358b BUGFIX: Allow insertion of object tags (such as youtube vids) into WYSIWYG's HTML view
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:16 +13:00
Sean Harvey
36cfa2cc15 MINOR Allow DIV elements in TinyMCE to have a style attribute
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:14 +13:00
Sam Minnee
bd4bdb18a8 ENHANCEMENT: Added fullscreen button to WYSIWYG toolbar
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75037 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:13 +13:00
Sam Minnee
76551c3f8b ENHANCEMENT #3687: Allow the insertion of iframes (such as google maps snippets) into TinyMCEa
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:13 +13:00
Sam Minnee
46a5b5e50e BUGFIX: Simple toolbar alteration to make toolbar fit at 1024x768
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@73593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:10 +13:00
Andrew O'Neil
8701d47f5c BUGFIX: #3491 - Fix nonexistant plugin stopping tinymce from working in safari.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71872 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:06 +13:00
Sam Minnee
58278bd8f5 Include the media widget into the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@71035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:05 +13:00
Will Rossiter
5759314893 BUGFIX: show flash icon and box if flash file exists. MINOR: created a default editor.css file which has base css styles for the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Sam Minnee
35f2bc0a2f BUGFIX #3024 - Stopped style dropdowns from getting stuck by making them regular dropdowns. Not as pretty but more stable.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sam Minnee
c02d69037a BUGFIX #3199: No longer warned about saving changes if you have actually pressed save.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69720 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:51 +13:00
Sam Minnee
5a79ae34f6 BUGFIX #3097: Removed buggy template feature
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:51 +13:00
Sean Harvey
9baf35d500 ENHANCEMENT Added ability to include a blockquote in the CMS WYSIWYG editor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sean Harvey
6fca21ecd0 BUGFIX Fixed error in javascript (because of commented out code) that broke IE6/7 in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Sam Minnee
170a0f256f #1885: Fixed safari bold, italic, underline by removing HTML scrubbing.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Will Rossiter
4bba3151df MINOR: actually allow youtube / blip videos to be embedded into the cms content area
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:39 +13:00
Will Rossiter
2a309755d9 Merged pre-2.3-oct08 into branches/2.3 (via trunk)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:37 +13:00
Sam Minnee
c57825de31 Fixed WYSIWYG styling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:36 +13:00
Sam Minnee
b3b1dbdf92 Replace source view with one based on codepress
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:36 +13:00
Sam Minnee
38e1030d11 #2991 - Fixed change detection in mce fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:41:01 +00:00
Sam Minnee
c2fe5b15ae FEATURE #594: Added javascript-on-demand support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 04:31:53 +00:00
Will Rossiter
4efa350ed5 BUGFIX: temp fix for flash inserter.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 03:08:24 +00:00
Ingo Schommer
df7092163f ENHANCEMENT Using currently used content languages for options in the TinyMCE spellchecker (see http://open.silverstripe.com/ticket/2498#comment:2)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:47:13 +00:00
Sam Minnee
b6ae79afce Added spellchecker to CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 02:13:58 +00:00
Sam Minnee
e32d366975 Fixed TinyMCE stylihg
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 02:36:54 +00:00
Sam Minnee
2d0e2fa79d Removed scrubbing of the HTML
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-27 08:11:01 +00:00
Sam Minnee
dd7aa66ca7 Fixed bug in tinymce_ssbuttons plugin inclusion
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:12:43 +00:00
Sam Minnee
9f4ad4b2cc FEATURE: Update to TinyMCE 3.2 - CMS changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:03:33 +00:00
Will Rossiter
3b3bea1352 MINOR: allow tinymce to suck down script code at least in tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-30 01:23:05 +00:00
Matt Peel
66c3db1e8e Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
4475726ad6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
b074268912 Merged revisions 47157 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz

........
  r47157 | sminnee | 2007-12-17 11:21:34 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-23 23:58:53 +00:00
Andrew O'Neil
5868bb1e8f GSOC #99 - Switch TinyMCE languages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-07 23:48:05 +00:00
Andrew O'Neil
997f3d09d0 Reverting, problem isn't fully fixed (merged from 2.1.0 branch, r41586)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:07:42 +00:00
Andrew O'Neil
958b1d5a9d hack to fix TinyMCE not resizing properly on load (merged from 2.1.0 branch, r41582)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42931 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:07:02 +00:00
Ingo Schommer
3501d6a57b elofgren: BUGFIX: Add if((typeof tinyMCE != 'undefined')) statement around call to tinyMCE.init() to prevent "Error: 'tinyMCE' is undefined" error in IE7 on Newsletter Recipient import. .
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42054 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:28:40 +00:00
Hayden Smith
abb9a61d0d Moved CMS module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:05 +00:00