X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=admin_pages.html;h=ca4442941786b78c31008b4f18ba98b14cb5fc08;hb=0a5d51b1488c91a5b6387d440ab16c04ef10bac8;hp=7f923d6da9bc7f0d80faf01abadf47a9dea71245;hpb=c469d2530ad9684e56742d38f5817cb08ad98eef;p=wfpl-cms.git

diff --git a/admin_pages.html b/admin_pages.html
index 7f923d6..ca44429 100644
--- a/admin_pages.html
+++ b/admin_pages.html
@@ -4,7 +4,7 @@
 <head>
 	<title><!--~$title show {~-->~$host~ Admin: <!--~listings once_if {~-->Pages Listing<!--~}~--><!--~form {~--><!--~id {~-->Add a new page<!--~}~--><!--~id unset {~-->Edit page "~title html~"<!--~}~--><!--~}~--><!--~}~--></title>
 	<!--~$head {~-->
-	<script type="text/javascript" src="inc/ckeditor/ckeditor.js"></script>
+	<script src="inc/ckeditor/ckeditor.js"></script>
 	<style>
 		/* icon in cke buttons */
 		.cke_button_icon.cke_button__wfpl_images_icon {
@@ -59,14 +59,14 @@
 			border: 2px solid #444;
 		}
 	</style>
-	<script type="text/javascript">
+	<script>
 		window.cke_wfpl_images = {
 			images: [~wfpl_images {~
 				{
 					thumb: "~image thumb_src jsdq~",
 					image: "~image image_src jsdq~",
-					image_width: "~image image_width~",
-					image_height: "~image image_height~",
+					image_width: ~image image_width~,
+					image_height: ~image image_height~,
 					sizes: "~sizes jsdq~",
 					caption: "~caption jsdq~"
 				}~ sep {~,~}~~}~
@@ -148,7 +148,7 @@
 				break;
 			}
 			CKEDITOR.dialog.getCurrent().hide();
-			editor.insertElement(CKEDITOR.dom.element.createFromHtml(code));
+			CKEDITOR.currentInstance.insertElement(CKEDITOR.dom.element.createFromHtml(code));
 		}
 		CKEDITOR.plugins.add('wfpl_images', {
 			init: function (editor) {
@@ -226,6 +226,7 @@
 			CKEDITOR.replace(name, {
 				'contentsCss': 'style.css?m=~style.css mtime~',
 				'allowedContent': true,
+				bodyId: '~$basename~' + '_wysiwyg_' + name,
 				'stylesSet': [
 					{ name: 'Paragraph', element: 'p'},
 					{ name: 'Page Headline', element: 'h1'},
@@ -295,7 +296,7 @@
 					<li>To insert an image: place the cursor at the beginning of a line and click the "insert image" button in the editor. Note that you will only be able to insert images that you have already uploaded on the <a href="admin_images" target="_blank">manage images</a> page.</li>
 				</ul>
 			</div>
-			<div class="field"><textarea class="html_editor" rows="20" cols="50" id="content" name="content">~content html~</textarea><script type="text/javascript">make_wysiwyg('content');</script></div>
+			<div class="field"><textarea class="html_editor" rows="20" cols="50" id="content" name="content">~content html~</textarea><script>make_wysiwyg('content');</script></div>
 
 			<div class="caption">Description</div>
 			<div class="field_notes">(Hidden description of this page, primarily for search engines.)</div>
