Xibo

Merge lp://staging/~stephane-quimpere/xibo/more-sizes-in-fckeditor into lp://staging/xibo/1.0

  1. more-sizes-in-fckeditor
  2. Merge into halley
Proposed by stef
Status: Merged
Approved by: Alex Harrington
Approved revision: 66
Merged at revision: not available
Proposed branch: lp://staging/~stephane-quimpere/xibo/more-sizes-in-fckeditor
Merge into: lp://staging/xibo/1.0
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~stephane-quimpere/xibo/more-sizes-in-fckeditor
Reviewer Review Type Date Requested Status
Dan Garner Approve
Review via email: mp+11150@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
stef (stephane-quimpere) wrote :

In answer to the blueprint :
https://blueprints.launchpad.net/xibo/+spec/more-sizes-in-fckeditor

Revision history for this message
Dan Garner (dangarner) wrote :

Looks good to me - will be merged during the 1.0.4 release process

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server/3rdparty/fckeditor/fckconfig.js'
2--- server/3rdparty/fckeditor/fckconfig.js 2008-12-14 14:41:09 +0000
3+++ server/3rdparty/fckeditor/fckconfig.js 2009-09-03 19:06:01 +0000
4@@ -148,7 +148,7 @@
5 FCKConfig.FontFormats = 'p;h1;h2;h3;h4;h5;h6;pre;address;div' ;
6 FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
7 //FCKConfig.FontSizes = 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
8-FCKConfig.FontSizes = '0.8em;1em;1.2em;1.6em;1.8em;2.0em;2.5em;3.0em;4.0em;6.0em;8.0em;10.0em' ;
9+FCKConfig.FontSizes = '0.8em;1em;1.2em;1.4em;1.6em;1.8em;2.0em;2.2em;2.4em;2.5em;2.7em;3.0em;3.3em;3.5em;4.0em;4.5em;5em;5.5em;6.0em;6.5em;7em;8.0em;10.0em' ;
10
11 FCKConfig.StylesXmlPath = FCKConfig.EditorPath + 'fckstyles.xml' ;
12 FCKConfig.TemplatesXmlPath = FCKConfig.EditorPath + 'fcktemplates.xml' ;

Subscribers

People subscribed via source and target branches