Changeset 2264

Timestamp:

07/23/08 11:34:16 (5 years ago)

Author:

fredck

Message:

Fixed errors in the config file of sample15.
On sample16, the about dialog box was under the flash.
Created the "assets" folder to make the html sample folder clearer.
The margins of <ul> and <ol> elements where actually removing the bullets in IE.

Location:

FCKeditor/branches/features/new_samples/_samples/html

Files:

• assets (added)
• assets/sample06.config.js (added)
• assets/sample11_frame.html (added)
• assets/sample14.config.js (added)
• assets/sample14.styles.css (added)
• assets/sample15.config.js (added)
• assets/sample16.config.js (added)
• assets/sample16.fla (added)
• assets/sample16.swf (added)
• assets/swfobject.js (added)
• sample06.config.js (deleted)
• sample06.html (modified) (1 diff)
• sample11.html (modified) (1 diff)
• sample11_frame.html (deleted)
• sample14.config.js (deleted)
• sample14.html (modified) (1 diff)
• sample14.styles.css (deleted)
• sample15.config.js (deleted)
• sample15.html (modified) (1 diff)
• sample16.config.js (deleted)
• sample16.fla (deleted)
• sample16.html (modified) (3 diffs)
• sample16.swf (deleted)
• swfobject.js (deleted)

FCKeditor/branches/features/new_samples/_samples/html/sample06.html

@@ -58 +58 @@
 
 // Set the custom configurations file path (in this way the original file is mantained).
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/sample06.config.js' ;
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample06.config.js' ;
 
 // Let's use a custom toolbar for this sample.

FCKeditor/branches/features/new_samples/_samples/html/sample11.html

@@ -39 +39 @@
         <div id="xToolbar"></div>
         <hr />
-        <iframe src="sample11_frame.html" width="100%" height="300"></iframe>
+        <iframe src="assets/sample11_frame.html" width="100%" height="300"></iframe>
 </body>
 </html>

FCKeditor/branches/features/new_samples/_samples/html/sample14.html

@@ -53 +53 @@
 // Instruct the editor to load our configurations from a custom file, leaving the
 // original configuration file untouched.
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/sample14.config.js' ;
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample14.config.js' ;
 
 oFCKeditor.Height = 300 ;

FCKeditor/branches/features/new_samples/_samples/html/sample15.html

@@ -53 +53 @@
 // Instruct the editor to load our configurations from a custom file, leaving the
 // original configuration file untouched.
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/sample15.config.js' ;
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample15.config.js' ;
 
 oFCKeditor.Height = 300 ;

FCKeditor/branches/features/new_samples/_samples/html/sample16.html

@@ -29 +29 @@
         <link href="../sample.css" rel="stylesheet" type="text/css" />
         <script type="text/javascript" src="../../fckeditor.js"></script>
-        <script type="text/javascript" src="swfobject.js"></script>
+        <script type="text/javascript" src="assets/swfobject.js"></script>
         <script type="text/javascript">
 function sendToFlash()
@@ -40 +40 @@
 function init()
 {
-        var so = new SWFObject("sample16.swf", "fckFlash", "550", "400", "8", "#ffffff") ;
+        var so = new SWFObject("assets/sample16.swf", "fckFlash", "550", "400", "8", "#ffffff") ;
+        so.addParam("wmode", "transparent");
         so.write("fckFlashContainer") ;
 }
@@ -73 +74 @@
 // Instruct the editor to load our configurations from a custom file, leaving the
 // original configuration file untouched.
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/sample16.config.js' ;
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample16.config.js' ;
 oFCKeditor.Height = 400 ;
 oFCKeditor.Width = '100%' ;