[commits] Horde branch master updated. 0e7875a6b3d373106988ddd8f447db5bef4ddb30

[Michael Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: ed42f4d386d06378fbc65d49ffb83b52083c431d

0e7875a add ckeditor plugin for syntaxhighlighter blocks, and intial Jonah support.

-----------------------------------------------------------------------

commit 0e7875a6b3d373106988ddd8f447db5bef4ddb30
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 7 19:41:28 2010 -0400

    add ckeditor plugin for syntaxhighlighter blocks, and intial Jonah support.
    
    Need to figure out a clean way of getting the code type from the jonah story,
    thinking of using a regex for the <pre brush="php"> elements. For now, hard code
    php only.

 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php             |    5 +-
 framework/Editor/js/config.js                                     |    2 +-
 .../Editor/js/plugins/syntaxhighlight/dialogs/syntaxhighlight.js  |    1 +
 .../Editor/js/plugins/syntaxhighlight/images/syntaxhighlight.gif  |  Bin 0 -> 94 bytes
 framework/Editor/js/plugins/syntaxhighlight/lang/en.js            |    1 +
 framework/Editor/js/plugins/syntaxhighlight/plugin.js             |    1 +
 framework/Editor/lib/Horde/Editor/Ckeditor.php                    |    4 +-
 framework/Editor/package.xml                                      |  988 +++--
 jonah/lib/View/StoryView.php                                      |   16 +
 9 files changed, 538 insertions(+), 480 deletions(-)
 create mode 100644 framework/Editor/js/plugins/syntaxhighlight/dialogs/syntaxhighlight.js
 create mode 100644 framework/Editor/js/plugins/syntaxhighlight/images/syntaxhighlight.gif
 create mode 100644 framework/Editor/js/plugins/syntaxhighlight/lang/en.js
 create mode 100644 framework/Editor/js/plugins/syntaxhighlight/plugin.js

http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php?rt=horde-git&r1=8352173fc37d37ad4a99af2a4508a8b7e9600f50&r2=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/diff.php/framework/Editor/js/config.js?rt=horde-git&r1=e996e6367d2a5913e884fd31ba8e3ae9b8ab93a6&r2=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/co.php/framework/Editor/js/plugins/syntaxhighlight/dialogs/syntaxhighlight.js?rt=horde-git&r=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/co.php/framework/Editor/js/plugins/syntaxhighlight/images/syntaxhighlight.gif?rt=horde-git&r=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/co.php/framework/Editor/js/plugins/syntaxhighlight/lang/en.js?rt=horde-git&r=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/co.php/framework/Editor/js/plugins/syntaxhighlight/plugin.js?rt=horde-git&r=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/diff.php/framework/Editor/lib/Horde/Editor/Ckeditor.php?rt=horde-git&r1=b924f983cfbc1accf3edebd15c8b2e7e4fd3fae5&r2=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/diff.php/framework/Editor/package.xml?rt=horde-git&r1=1a030604c726f90814989ed3ba8f3ab67902546d&r2=0e7875a6b3d373106988ddd8f447db5bef4ddb30
http://git.horde.org/diff.php/jonah/lib/View/StoryView.php?rt=horde-git&r1=8352173fc37d37ad4a99af2a4508a8b7e9600f50&r2=0e7875a6b3d373106988ddd8f447db5bef4ddb30