--- a/ajax.php	Wed Dec 26 00:37:26 2007 -0500
+++ b/ajax.php	Thu Dec 27 22:09:33 2007 -0500
@@ -35,7 +35,7 @@
     define('ENANO_ROOT', dirname($filename));
     require(ENANO_ROOT.'/includes/functions.php');
     require(ENANO_ROOT.'/includes/dbal.php');
-    require(ENANO_ROOT.'/includes/json.php');
+    require(ENANO_ROOT.'/includes/json2.php');
     
     require(ENANO_ROOT . '/config.php');
     unset($dbuser, $dbpasswd);
@@ -96,21 +96,32 @@
       echo PageUtils::checkusername($_GET['name']);
       break;
     case "getsource":
+      header('Content-type: application/json');
       $password = ( isset($_GET['pagepass']) ) ? $_GET['pagepass'] : false;
       $page = new PageProcessor($paths->page_id, $paths->namespace);
       $page->password = $password;
       if ( $src = $page->fetch_source() )
       {
-        echo $src;
+        $allowed = true;
       }
       else if ( $src !== false )
       {
-        echo '';
+        $allowed = true;
+        $src = '';
       }
       else
       {
-        echo 'err_access_denied';
+        $allowed = false;
+        $src = '';
       }
+      $return = array(
+          'mode' => 'editor',
+          'src' => $src,
+          'auth_view_source' => $allowed,
+          'auth_edit' => $session->get_permissions('edit_page'),
+          'time' => time()
+        );
+      echo enano_json_encode($return);
       break;
     case "getpage":
       // echo PageUtils::getpage($paths->page, false, ( (isset($_GET['oldid'])) ? $_GET['oldid'] : false ));
@@ -136,6 +147,85 @@
         echo '<p>Error saving the page: '.$e.'</p>';
       }
       break;
+    case "savepage_json":
+      header('Content-type: application/json');
+      if ( !isset($_POST['r']) )
+        die('Invalid request');
+      
+      $request = enano_json_decode($_POST['r']);
+      if ( !isset($request['src']) || !isset($request['summary']) || !isset($request['minor_edit']) || !isset($request['time']) )
+        die('Invalid request');
+      
+      $time = intval($request['time']);
+      
+      // Verify that no edits have been made since the editor was requested
+      $q = $db->sql_query('SELECT time_id, author FROM ' . table_prefix . "logs WHERE log_type = 'page' AND action = 'edit' AND page_id = '{$paths->page_id}' AND namespace = '{$paths->namespace}' ORDER BY time_id DESC LIMIT 1;");
+      if ( !$q )
+        $db->die_json();
+      
+      $row = $db->fetchrow();
+      $db->free_result();
+      
+      if ( $row['time_id'] > $time )
+      {
+        $return = array(
+          'mode' => 'obsolete',
+          'author' => $row['author'],
+          'date_string' => date('d M Y h:i a', $row['time_id']),
+          'time' => $row['time_id'] // time() ???
+          );
+        echo enano_json_encode($return);
+        break;
+      }
+      
+      // Verification complete. Start the PageProcessor and let it do the dirty work for us.
+      $page = new PageProcessor($paths->page_id, $paths->namespace);
+      if ( $page->update_page($request['src'], $request['summary'], ( $request['minor_edit'] == 1 )) )
+      {
+        $return = array(
+            'mode' => 'success'
+          );
+      }
+      else
+      {
+        $errors = array();
+        while ( $err = $page->pop_error() )
+        {
+          $errors[] = $err;
+        }
+        $return = array(
+          'mode' => 'errors',
+          'errors' => array_values($errors)
+          );
+      }
+      
+      echo enano_json_encode($return);
+      
+      break;
+    case "diff_cur":
+      
+      // Lie about our content type to fool ad scripts
+      header('Content-type: application/xhtml+xml');
+      
+      if ( !isset($_POST['text']) )
+        die('Invalid request');
+      
+      $page = new PageProcessor($paths->page_id, $paths->namespace);
+      if ( !($src = $page->fetch_source()) )
+      {
+        die('Access denied');
+      }
+      
+      $diff = RenderMan::diff($src, $_POST['text']);
+      if ( $diff == '<table class="diff"></table>' )
+      {
+        $diff = '<p>' . $lang->get('editor_msg_diff_empty') . '</p>';
+      }
+      
+      echo '<div class="info-box">' . $lang->get('editor_msg_diff') . '</div>';
+      echo $diff;
+      
+      break;
     case "protect":
       echo PageUtils::protect($paths->page_id, $paths->namespace, (int)$_POST['level'], $_POST['reason']);
       break;

--- a/includes/clientside/css/enano-shared.css	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/css/enano-shared.css	Thu Dec 27 22:09:33 2007 -0500
@@ -425,6 +425,10 @@
 .usermessage a:hover {
   color: #AA5500 !important;
 }
+.usermessage h2 {
+  border-bottom-color: #ef8500 !important;
+  color: black;
+}
 div.thumbnail {
   display: table;
   border: 1px solid #AAAAAA;

--- a/includes/clientside/static/acl.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/static/acl.js	Thu Dec 27 22:09:33 2007 -0500
@@ -49,7 +49,7 @@
         aclDataCache = groups;
         __aclBuildSelector(groups);
       }
-    });
+    }, true);
   return false;
 }
 
@@ -84,7 +84,7 @@
         groups.namespace = thispage[1];
         __aclBuildSelector(groups);
       }
-    });
+    }, true);
 }
 
 function __aclBuildSelector(groups)
@@ -426,13 +426,13 @@
             note.appendChild(document.createTextNode($lang.get('acl_lbl_save_success_body', { target_name: data.target_name })));
             note.appendChild(document.createElement('br'));
             var a = document.createElement('a');
-            a.href = 'javascript:void(0);';
-            a.onclick = function() { this.parentNode.parentNode.removeChild(this.parentNode); return false; };
+            a.href = '#';
+            a.onclick = function(e) { alert('ONCLICK'); return false; };
             a.appendChild(document.createTextNode('[ ' + $lang.get('acl_btn_success_dismiss') + ' :'));
             note.appendChild(a);
             var a2 = document.createElement('a');
-            a2.href = 'javascript:void(0);';
-            a2.onclick = function() { killACLManager(); return false; };
+            a2.href = '#';
+            a2.onclick = function(e) { alert('ONCLICK'); return false; };
             a2.appendChild(document.createTextNode(': ' + $lang.get('acl_btn_success_close') + ' ]'));
             note.appendChild(a2);
             document.getElementById(aclManagerID + '_main').insertBefore(note, document.getElementById(aclManagerID + '_main').firstChild);
@@ -487,7 +487,7 @@
                 //fadeInfoBoxes();
                 
               }
-            });
+            }, true);
             
             break;
           case 'error':
@@ -501,7 +501,7 @@
             break;
         }
       }
-    });
+    }, true);
 }
 
 function __aclBuildGroupsHTML(groups)

--- a/includes/clientside/static/ajax.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/static/ajax.js	Thu Dec 27 22:09:33 2007 -0500
@@ -2,7 +2,22 @@
  * AJAX applets
  */
  
-function ajaxGet(uri, f) {
+function ajaxGet(uri, f, call_editor_safe) {
+  // Is the editor open?
+  if ( editor_open && !call_editor_safe )
+  {
+    // Make sure the user is willing to close the editor
+    var conf = confirm($lang.get('editor_msg_confirm_ajax'));
+    if ( !conf )
+    {
+      // Kill off any "loading" windows, etc. and cancel the request
+      unsetAjaxLoading();
+      return false;
+    }
+    // The user allowed the editor to be closed. Reset flags and knock out the on-close confirmation.
+    editor_open = false;
+    enableUnload();
+  }
   if (window.XMLHttpRequest) {
     ajax = new XMLHttpRequest();
   } else {
@@ -19,7 +34,22 @@
   ajax.send(null);
 }
 
-function ajaxPost(uri, parms, f) {
+function ajaxPost(uri, parms, f, call_editor_safe) {
+  // Is the editor open?
+  if ( editor_open && !call_editor_safe )
+  {
+    // Make sure the user is willing to close the editor
+    var conf = confirm($lang.get('editor_msg_confirm_ajax'));
+    if ( !conf )
+    {
+      // Kill off any "loading" windows, etc. and cancel the request
+      unsetAjaxLoading();
+      return false;
+    }
+    // The user allowed the editor to be closed. Reset flags and knock out the on-close confirmation.
+    editor_open = false;
+    enableUnload();
+  }
   if (window.XMLHttpRequest) {
     ajax = new XMLHttpRequest();
   } else {
@@ -134,132 +164,6 @@
   return text;
 }
 
-// Page editor
-
-function ajaxEditor()
-{
-  // IE <6 pseudo-compatibility
-  if ( KILL_SWITCH )
-    return true;
-  setAjaxLoading();
-  ajaxGet(stdAjaxPrefix+'&_mode=getsource', function() {
-      if(ajax.readyState == 4) {
-        unsetAjaxLoading();
-        if(edit_open) {
-          c=confirm($lang.get('editor_msg_revert_confirm'));
-          if(!c) return;
-        }
-        edit_open = true;
-        selectButtonMajor('article');
-        selectButtonMinor('edit');
-        if(in_array('ajaxEditArea', grippied_textareas))
-        {
-          // Allow the textarea grippifier to re-create the resizer control on the textarea
-          grippied_textareas.pop(in_array('ajaxEditArea', grippied_textareas));
-        }
-        disableUnload($lang.get('editor_msg_unload'));
-        var switcher = ( readCookie('enano_editor_mode') == 'tinymce' ) ?
-                        '<a href="#" onclick="setEditorText(); return false;">' + $lang.get('editor_btn_wikitext') + '</a>  |  ' + $lang.get('editor_btn_graphical') :
-                        $lang.get('editor_btn_wikitext') + '  |  <a href="#" onclick="setEditorMCE(); return false;">' + $lang.get('editor_btn_graphical') + '</a>' ;
-        document.getElementById('ajaxEditContainer').innerHTML = '\
-        <div id="mdgPreviewContainer"></div> \
-        <span id="switcher">' + switcher + '</span><br />\
-        <form name="mdgAjaxEditor" method="get" action="#" onsubmit="ajaxSavePage(); return false;">\
-        <textarea id="ajaxEditArea" rows="20" cols="60" style="display: block; margin: 1em 0 1em 1em; width: 96.5%;">'+ajax.responseText+'</textarea><br />\
-          ' + $lang.get('editor_lbl_edit_summary') + ' <input id="ajaxEditSummary" size="40" /><br />\
-          <input id="ajaxEditMinor" name="minor" type="checkbox" /> <label for="ajaxEditMinor">' + $lang.get('editor_lbl_minor_edit') + '</label><br />\
-          <a href="#" onclick="void(ajaxSavePage()); return false;">' + $lang.get('editor_btn_save') + '</a>  |  <a href="#" onclick="void(ajaxShowPreview()); return false;">' + $lang.get('editor_btn_preview') + '</a>  |  <a href="#" onclick="void(ajaxEditor()); return false;">' + $lang.get('editor_btn_revert') + '</a>  |  <a href="#" onclick="void(ajaxDiscard()); return false;">' + $lang.get('editor_btn_cancel') + '</a>\
-          <br />\
-          '+editNotice+'\
-        </form>';
-        // initTextareas();
-        if(readCookie('enano_editor_mode') == 'tinymce')
-        {
-          $('ajaxEditArea').switchToMCE();
-        }
-      }
-  });
-}
-
-function setEditorMCE()
-{
-  $('ajaxEditArea').switchToMCE();
-  createCookie('enano_editor_mode', 'tinymce', 365);
-  $('switcher').object.innerHTML = '<a href="#" onclick="setEditorText(); return false;">' + $lang.get('editor_btn_wikitext') + '</a>  |  ' + $lang.get('editor_btn_graphical');
-}
-
-function setEditorText()
-{
-  $('ajaxEditArea').destroyMCE();
-  createCookie('enano_editor_mode', 'text', 365);
-  $('switcher').object.innerHTML = $lang.get('editor_btn_wikitext') + '  |  <a href="#" onclick="setEditorMCE(); return false;">' + $lang.get('editor_btn_graphical') + '</a>';
-}
-
-function ajaxViewSource()
-{
-  // IE <6 pseudo-compatibility
-  if ( KILL_SWITCH )
-    return true;
-  setAjaxLoading();
-  ajaxGet(stdAjaxPrefix+'&_mode=getsource', function() {
-      if(ajax.readyState == 4) {
-        unsetAjaxLoading();
-        edit_open = false;
-        selectButtonMajor('article');
-        selectButtonMinor('edit');
-        if(in_array('ajaxEditArea', grippied_textareas))
-        {
-          // Allow the textarea grippifier to re-create the resizer control on the textarea
-          grippied_textareas.pop(in_array('ajaxEditArea', grippied_textareas));
-        }
-        document.getElementById('ajaxEditContainer').innerHTML = '\
-          <form method="get" action="#" onsubmit="ajaxSavePage(); return false;">\
-            <textarea readonly="readonly" id="ajaxEditArea" rows="20" cols="60" style="display: block; margin: 1em 0 1em 1em; width: 96.5%;">'+ajax.responseText+'</textarea><br />\
-            <a href="#" onclick="void(ajaxReset()); return false;">' + $lang.get('editor_btn_closeviewer') + '</a>\
-          </form>';
-        initTextareas();
-      }
-  });
-}
-
-function ajaxShowPreview()
-{
-  // IE <6 pseudo-compatibility
-  if ( KILL_SWITCH )
-    return true;
-  goBusy('Loading preview...');
-  var text = ajaxEscape($('ajaxEditArea').getContent());
-  if(document.mdgAjaxEditor.minor.checked) minor='&minor';
-  else minor='';
-  ajaxPost(stdAjaxPrefix+'&_mode=preview', 'summary='+document.getElementById('ajaxEditSummary').value+minor+'&text='+text, function() {
-    if(ajax.readyState == 4) {
-      unBusy();
-      edit_open = false;
-      document.getElementById('mdgPreviewContainer').innerHTML = ajax.responseText;
-    }
-  });
-}
-
-function ajaxSavePage()
-{
-  // IE <6 pseudo-compatibility
-  if ( KILL_SWITCH )
-    return true;
-  //goBusy('Saving page...');
-  var text = ajaxEscape($('ajaxEditArea').getContent());
-  if(document.mdgAjaxEditor.minor.checked) minor='&minor';
-  else minor='';
-  ajaxPost(stdAjaxPrefix+'&_mode=savepage', 'summary='+document.getElementById('ajaxEditSummary').value+minor+'&text='+text, function() {
-    if(ajax.readyState == 4) {
-      unBusy();
-      edit_open = false;
-      document.getElementById('ajaxEditContainer').innerHTML = ajax.responseText;
-      enableUnload();
-      unselectAllButtonsMinor();
-    }
-  });
-}
-
 function ajaxDiscard()
 {
   // IE <6 pseudo-compatibility
@@ -283,7 +187,6 @@
   ajaxGet(stdAjaxPrefix+'&_mode=getpage&noheaders', function() {
     if(ajax.readyState == 4) {
       unsetAjaxLoading();
-      edit_open = false;
       document.getElementById('ajaxEditContainer').innerHTML = ajax.responseText;
       selectButtonMajor('article');
       unselectAllButtonsMinor();
@@ -314,7 +217,7 @@
       if(ajax.responseText != 'good')
         alert(ajax.responseText);
     }
-  });
+  }, true);
 }
 
 function ajaxRename()
@@ -330,7 +233,7 @@
       unsetAjaxLoading();
       alert(ajax.responseText);
     }
-  });
+  }, true);
 }
 
 function ajaxMakePage()
@@ -385,7 +288,7 @@
       unsetAjaxLoading();
       alert(ajax.responseText);
     }
-  });
+  }, true);
 }
 
 function ajaxResetDelVotes()
@@ -407,7 +310,7 @@
         setTimeout("document.getElementById('mdgDeleteVoteNoticeBox').style.display = 'none';", 1000);
       }
     }
-  });
+  }, true);
 }
 
 function ajaxSetWikiMode(val) {
@@ -705,7 +608,7 @@
         kid.appendChild(p_parent);
         
       }
-    });
+    }, true);
 }
 
 function ajaxChangeStyleComplete()
@@ -750,7 +653,7 @@
           alert('Error occurred during attempt to change theme:\n' + ajax.responseText);
         }
       }
-    });
+    }, true);
   
   return false;
   
@@ -840,8 +743,7 @@
       {
         alert(ajax.responseText);
       }
-    }
-  );
+    }, true);
 }
 
 function ajaxStartLogin()
@@ -1315,7 +1217,7 @@
         if ( ajax.responseXML.firstChild.tagName == 'enano' )
         {
           var enanotag = ajax.responseXML.firstChild;
-          for ( var i in enanotag.childNodes )
+          for ( var i = 0; i < enanotag.childNodes.length; i++ )
           {
             if ( enanotag.childNodes[i].tagName == 'error' )
             {
@@ -1325,13 +1227,13 @@
             {
               // got <latest>
               var latesttag = enanotag.childNodes[i];
-              for ( var i in latesttag.childNodes )
+              for ( var i = 0; i < latesttag.childNodes.length; i++ )
               {
                 var node = latesttag.childNodes[i];
                 if ( node.tagName == 'release' )
                 {
                   var releasedata = new Object();
-                  for ( var i in node.attributes )
+                  for ( var i = 0; i < node.attributes.length; i++ )
                   {
                     releasedata[node.attributes[i].nodeName] = node.attributes[i].nodeValue;
                   }
@@ -1367,7 +1269,7 @@
           {
             var infobox = document.createElement('div');
             infobox.className = 'info-box-mini';
-            infobox.appendChild(document.createTextNode('An update for Enano is available.'));
+            infobox.appendChild(document.createTextNode('An update for Enano is available. The newest release is highlighted below.'));
             infobox.style.borderWidth = '0';
             infobox.style.margin = '0 0 0 0';
             thediv.appendChild(infobox);
@@ -1376,7 +1278,7 @@
           {
             var infobox = document.createElement('div');
             infobox.className = 'info-box-mini';
-            infobox.appendChild(document.createTextNode('No new updates are available.'));
+            infobox.appendChild(document.createTextNode('No new updates are available. The latest available releases are shown below.'));
             infobox.style.borderWidth = '0';
             infobox.style.margin = '0 0 0 0';
             thediv.appendChild(infobox);

--- a/includes/clientside/static/dynano.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/static/dynano.js	Thu Dec 27 22:09:33 2007 -0500
@@ -86,7 +86,7 @@
   return left_offset;
 }
 
-function DN_switchToMCE()
+function DN_switchToMCE(performWikiTransform)
 {
   //if ( this.object.dn_is_mce )
   //  return this;
@@ -94,17 +94,38 @@
     this.object.id = 'textarea_' + Math.floor(Math.random() * 1000000);
   if ( !this.object.name )
     this.object.name = 'textarea_' + Math.floor(Math.random() * 1000000);
-  tinyMCE.addMCEControl(this.object, this.object.name, document);
+  // TinyMCE 2.x
+  // tinyMCE.addMCEControl(this.object, this.object.name, document);
+  // TinyMCE 3.x
+  if ( performWikiTransform )
+  {
+    this.object.value = DN_WikitextToXHTML(this.object.value);
+  }
+  tinyMCE.execCommand("mceAddControl", true, this.object.id);
   this.object.dnIsMCE = 'yes';
   return this;
 }
 
-function DN_destroyMCE()
+function DN_destroyMCE(performWikiTransform)
 {
   //if ( !this.object.dn_is_mce )
   //  return this;
-  if ( this.object.name )
-    tinyMCE.removeMCEControl(this.object.name);
+  if ( this.object.id )
+  {
+    // TinyMCE 2.x
+    // tinyMCE.removeMCEControl(this.object.name);
+    // TinyMCE 3.x
+    var ed = tinyMCE.getInstanceById(this.object.id);
+    if ( ed )
+    {
+      if ( !tinyMCE.execCommand("mceRemoveEditor", false, this.object.id) )
+        alert('could not destroy editor');
+      if ( performWikiTransform )
+      {
+        this.object.value = DN_XHTMLToWikitext(this.object.value);
+      }
+    }
+  }
   this.object.dnIsMCE = 'no';
   return this;
 }
@@ -114,8 +135,11 @@
   if ( this.object.name )
   {
     var text = this.object.value;
-    if ( tinyMCE.getInstanceById(this.object.name) )
-      text = tinyMCE.getContent(this.object.name);
+    if ( tinyMCE.get(this.object.id) )
+    {
+      var editor = tinyMCE.get(this.object.id);
+      text = editor.getContent();
+    }
     return text;
   }
   else
@@ -124,6 +148,27 @@
   }
 }
 
+// A basic Wikitext to XHTML converter
+function DN_WikitextToXHTML(text)
+{
+  text = text.replace(/^===[\s]*(.+?)[\s]*===$/g, '<h3>$1</h3>');
+  text = text.replace(/'''(.+?)'''/g, '<b>$1</b>');
+  text = text.replace(/''(.+?)''/g, '<i>$1</i>');
+  text = text.replace(/\[(http|ftp|irc|mailto):([^ \]])+ ([^\]]+?)\]/g, '<a href="$1:$2">$4</a>');
+  return text;
+}
+
+// Inverse of the previous function
+function DN_XHTMLToWikitext(text)
+{
+  text = text.replace(/<h3>(.+?)<\/h3>/g, '=== $1 ===');
+  text = text.replace(/<(b|strong)>(.+?)<\/(b|strong)>/g, "'''$2'''");
+  text = text.replace(/<(i|em)>(.+?)<\/(i|em)>/g, "''$2''");
+  text = text.replace(/<a href="([^" ]+)">(.+?)<\/a>/g, '[$1 $2]');
+  text = text.replace(/<\/?p>/g, '');
+  return text;
+}
+
 DNobj.prototype.addClass = function(clsname) { addClass(this.object, clsname); return this; };
 DNobj.prototype.rmClass  = function(clsname) { rmClass( this.object, clsname); return this; };
 DNobj.prototype.hasClass = function(clsname) { return hasClass(this.object, clsname); };

--- a/includes/clientside/static/editor.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/static/editor.js	Thu Dec 27 22:09:33 2007 -0500
@@ -1,16 +1,32 @@
 // Javascript routines for the page editor
 
+if ( document.getElementById('mdgCss') )
+{
+  var css_url = document.getElementById('mdgCss').href;
+}
+else
+{
+  var css_url = scriptPath + '/includes/clientside/css/enano_shared.css';
+}
+
+var do_popups = ( is_Safari ) ? '' : ',inlinepopups';
+var _skin = ( typeof(tinymce_skin) == 'string' ) ? tinymce_skin : 'default';
+
 var enano_tinymce_options = {
-  mode : "exact",
-  elements : '',
-  plugins : 'table',
+  mode : "none",
+  plugins : 'table,save,safari,pagebreak,style,layer,advhr,insertdatetime,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras' + do_popups,
+  theme : 'advanced',
+  skin : _skin,
   theme_advanced_resize_horizontal : false,
   theme_advanced_resizing : true,
   theme_advanced_toolbar_location : "top",
   theme_advanced_toolbar_align : "left",
-  theme_advanced_buttons1_add : "fontselect,fontsizeselect",
+  theme_advanced_buttons1 : "save,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,forecolor,backcolor,|,formatselect,|,fontselect,fontsizeselect",
   theme_advanced_buttons3_add_before : "tablecontrols,separator",
-  theme_advanced_statusbar_location : 'bottom'
+  theme_advanced_buttons3_add_after : "|,fullscreen",
+  theme_advanced_statusbar_location : 'bottom',
+  noneditable_noneditable_class : 'mce_readonly',
+  content_css : css_url
 };
 
 var initTinyMCE = function(e)
@@ -25,3 +41,585 @@
 }
 addOnloadHook(initTinyMCE);
 
+var editor_open = false;
+
+function ajaxEditor()
+{
+  if ( KILL_SWITCH )
+    return true;
+  if ( editor_open )
+    return true;
+  selectButtonMinor('edit');
+  selectButtonMajor('article');
+  setAjaxLoading();
+  ajaxGet(stdAjaxPrefix + '&_mode=getsource', function()
+    {
+      if ( ajax.readyState == 4 )
+      {
+        unsetAjaxLoading();
+        
+        var response = String(ajax.responseText + '');
+        if ( response.substr(0, 1) != '{' )
+        {
+          handle_invalid_json(response);
+          return false;
+        }
+        
+        response = parseJSON(response);
+        if ( response.mode == 'error' )
+        {
+          unselectAllButtonsMinor();
+          new messagebox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error);
+          return false;
+        }
+        
+        if ( !response.auth_view_source )
+        {
+          unselectAllButtonsMinor();
+          new messagebox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_access_denied_title'), $lang.get('editor_err_access_denied_body'));
+          return false;
+        }
+        
+        ajaxBuildEditor(response.src, (!response.auth_edit), response.time);
+      }
+    });
+}
+
+function ajaxBuildEditor(content, readonly, timestamp)
+{
+  // Set flags
+  // We don't want the fancy confirmation framework to trigger if the user is only viewing the page source
+  if ( !readonly )
+  {
+    editor_open = true;
+    disableUnload();
+  }  
+  
+  // Destroy existing contents of page container
+  var edcon = document.getElementById('ajaxEditContainer');
+  for ( var i = edcon.childNodes.length - 1; i >= 0; i-- )
+  {
+    edcon.removeChild(edcon.childNodes[i]);
+  }
+  
+  //
+  // BUILD EDITOR
+  //
+  
+  // Plaintext/wikitext toggler
+  
+  var toggler = document.createElement('p');
+  toggler.style.marginLeft = '0';
+  
+  var span_wiki = document.createElement('span');
+  var span_mce  = document.createElement('span');
+  span_wiki.id  = 'enano_edit_btn_pt';
+  span_mce.id   = 'enano_edit_btn_mce';
+  if ( readCookie('enano_editor_mode') == 'tinymce' )
+  {
+    // Current selection is TinyMCE - make span_wiki have the link and span_mce be plaintext
+    var a = document.createElement('a');
+    a.href = '#';
+    a.onclick = function() {
+      ajaxSetEditorPlain();
+      return false;
+    };
+    a.appendChild(document.createTextNode($lang.get('editor_btn_wikitext')));
+    span_wiki.appendChild(a);
+    toggler.appendChild(span_wiki);
+    toggler.appendChild(document.createTextNode(' | '));
+    span_mce.appendChild(document.createTextNode($lang.get('editor_btn_graphical')));
+    toggler.appendChild(span_mce);
+  }
+  else
+  {
+    // Current selection is wikitext - set span_wiki to plaintext and span_mce to link
+    span_wiki.appendChild(document.createTextNode($lang.get('editor_btn_wikitext')));
+    toggler.appendChild(span_wiki);
+    toggler.appendChild(document.createTextNode(' | '));
+    var a = document.createElement('a');
+    a.href = '#';
+    a.onclick = function() {
+      ajaxSetEditorMCE();
+      return false;
+    };
+    a.appendChild(document.createTextNode($lang.get('editor_btn_graphical')));
+    span_mce.appendChild(a);
+    toggler.appendChild(span_mce);
+  }
+  
+  // Form (to allow submits from MCE to trigger a real save)
+  var form = document.createElement('form');
+  form.action = 'javascript:void(0);';
+  form.onsubmit = function()
+  {
+    ajaxEditorSave();
+    return false;
+  }
+  
+  // Preview holder
+  var preview_anchor = document.createElement('a');
+  preview_anchor.name = 'ajax_preview';
+  preview_anchor.id = 'ajax_preview';
+  var preview_container = document.createElement('div');
+  preview_container.id = 'enano_editor_preview';
+  
+  // Textarea containing the content
+  var ta_wrapper = document.createElement('div');
+  ta_wrapper.style.margin = '10px 0';
+  var textarea = document.createElement('textarea');
+  textarea.value = content;
+  textarea._edTimestamp = timestamp;
+  textarea.id = 'ajaxEditArea';
+  textarea.rows = '20';
+  textarea.cols = '60';
+  textarea.style.width = '98.7%';
+  if ( readonly )
+  {
+    textarea.className = 'mce_readonly';
+    textarea.setAttribute('readonly', 'readonly');
+  }
+  ta_wrapper.appendChild(textarea);
+  
+  // Revision metadata controls
+  var tblholder = document.createElement('div');
+  tblholder.className = 'tblholder';
+  var metatable = document.createElement('table');
+  metatable.setAttribute('border', '0');
+  metatable.setAttribute('cellspacing', '1');
+  metatable.setAttribute('cellpadding', '4');
+  
+  if ( readonly )
+  {
+    // Close Viewer button
+    var tr3 = document.createElement('tr');
+    var td3 = document.createElement('th');
+    td3.setAttribute('colspan', '2');
+    td3.className = 'subhead';
+    
+    var btn_cancel = document.createElement('input');
+    btn_cancel.type = 'button';
+    btn_cancel.value = $lang.get('editor_btn_closeviewer');
+    btn_cancel.onclick = function() { ajaxReset(true); return false; };
+    td3.appendChild(btn_cancel);
+    tr3.appendChild(td3);
+    
+    metatable.appendChild(tr3);
+  }
+  else
+  {
+    // First row: edit summary
+    var tr1 = document.createElement('tr');
+    var td1_1 = document.createElement('td');
+    var td1_2 = document.createElement('td');
+    td1_1.className = 'row2';
+    td1_2.className = 'row1';
+    td1_2.style.width = '70%';
+    td1_1.appendChild(document.createTextNode($lang.get('editor_lbl_edit_summary')));
+    td1_1.appendChild(document.createElement('br'));
+    var small = document.createElement('small');
+    small.appendChild(document.createTextNode($lang.get('editor_lbl_edit_summary_explain')));
+    td1_1.appendChild(small);
+    
+    var field_es = document.createElement('input');
+    field_es.id = 'enano_editor_field_summary';
+    field_es.type = 'text';
+    field_es.size = '40';
+    field_es.style.width = '96%';
+    td1_2.appendChild(field_es);
+    
+    tr1.appendChild(td1_1);
+    tr1.appendChild(td1_2);
+    
+    // Second row: minor edit
+    var tr2 = document.createElement('tr');
+    var td2_1 = document.createElement('td');
+    var td2_2 = document.createElement('td');
+    td2_1.className = 'row2';
+    td2_2.className = 'row1';
+    td2_1.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit')));
+    td2_1.appendChild(document.createElement('br'));
+    var small = document.createElement('small');
+    small.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit_explain')));
+    td2_1.appendChild(small);
+    
+    var label = document.createElement('label');
+    var field_mi = document.createElement('input');
+    field_mi.id = 'enano_editor_field_minor';
+    field_mi.type = 'checkbox';
+    label.appendChild(field_mi);
+    label.appendChild(document.createTextNode(' '));
+    label.appendChild(document.createTextNode($lang.get('editor_lbl_minor_edit_field')));
+    td2_2.appendChild(label);
+    
+    tr2.appendChild(td2_1);
+    tr2.appendChild(td2_2);
+    
+    // Third row: controls
+    var tr3 = document.createElement('tr');
+    var td3 = document.createElement('th');
+    td3.setAttribute('colspan', '2');
+    td3.className = 'subhead';
+    
+    var btn_save = document.createElement('input');
+    btn_save.type = 'button';
+    btn_save.value = $lang.get('editor_btn_save');
+    btn_save.onclick = function() { ajaxEditorSave(); return false; };
+    td3.appendChild(btn_save);
+    
+    td3.appendChild(document.createTextNode(' '));
+    
+    var btn_preview = document.createElement('input');
+    btn_preview.type = 'button';
+    btn_preview.value = $lang.get('editor_btn_preview');
+    btn_preview.onclick = function() { ajaxEditorGenPreview(); return false; };
+    td3.appendChild(btn_preview);
+    
+    td3.appendChild(document.createTextNode(' '));
+    
+    var btn_revert = document.createElement('input');
+    btn_revert.type = 'button';
+    btn_revert.value = $lang.get('editor_btn_revert');
+    btn_revert.onclick = function() { ajaxEditorRevertToLatest(); return false; };
+    td3.appendChild(btn_revert);
+    
+    td3.appendChild(document.createTextNode(' '));
+    
+    var btn_diff = document.createElement('input');
+    btn_diff.type = 'button';
+    btn_diff.value = $lang.get('editor_btn_diff');
+    btn_diff.onclick = function() { ajaxEditorShowDiffs(); return false; };
+    td3.appendChild(btn_diff);
+    
+    td3.appendChild(document.createTextNode(' '));
+    
+    var btn_cancel = document.createElement('input');
+    btn_cancel.type = 'button';
+    btn_cancel.value = $lang.get('editor_btn_cancel');
+    btn_cancel.onclick = function() { ajaxEditorCancel(); return false; };
+    td3.appendChild(btn_cancel);
+    tr3.appendChild(td3);
+    
+    metatable.appendChild(tr1);
+    metatable.appendChild(tr2);
+    metatable.appendChild(tr3);
+  }
+  tblholder.appendChild(metatable);
+  
+  // Edit disclaimer/notice
+  if ( editNotice ) // This is set globally in {JS_DYNAMIC_VARS}.
+  {
+    var en_div = document.createElement('div');
+    en_div.innerHTML = editNotice;
+    en_div.className = 'usermessage';
+    en_div.style.margin = '10px 0 0 0';
+  }
+  
+  // Put it all together...
+  form.appendChild(toggler);
+  form.appendChild(preview_anchor);
+  form.appendChild(preview_container);
+  form.appendChild(ta_wrapper);
+  form.appendChild(tblholder);
+  edcon.appendChild(form);
+  
+  if ( editNotice && !readonly )
+  {
+    edcon.appendChild(en_div);
+  }
+  
+  // If the editor preference is tinymce, switch the editor to TinyMCE now
+  if ( readCookie('enano_editor_mode') == 'tinymce' )
+  {
+    $dynano('ajaxEditArea').switchToMCE();
+  }
+}
+
+function ajaxEditorSave()
+{
+  ajaxSetEditorLoading();
+  var ta_content = $('ajaxEditArea').getContent();
+  var edit_summ = $('enano_editor_field_summary').object.value;
+  if ( !edit_summ )
+    edit_summ = '';
+  var is_minor = ( $('enano_editor_field_minor').object.checked ) ? 1 : 0;
+  var timestamp = $('ajaxEditArea').object._edTimestamp;
+  
+  var json_packet = {
+    src: ta_content,
+    summary: edit_summ,
+    minor_edit: is_minor,
+    time: timestamp
+  };
+  json_packet = ajaxEscape(toJSONString(json_packet));
+  ajaxPost(stdAjaxPrefix + '&_mode=savepage_json', 'r=' + json_packet, function()
+    {
+      if ( ajax.readyState == 4 )
+      {
+        ajaxUnSetEditorLoading();
+        var response = String(ajax.responseText + '');
+        if ( response.substr(0, 1) != '{' )
+        {
+          handle_invalid_json(response);
+          return false;
+        }
+        
+        response = parseJSON(response);
+        // This will only be used if there was a lower-level error.
+        if ( response.mode == 'error' )
+        {
+          new messagebox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error);
+          return false;
+        }
+        // This will be used if the PageProcessor generated errors (usually security/permissions related)
+        if ( response.mode == 'errors' )
+        {
+          var errors = '<ul><li>' + implode('</li><li>', response.errors) + '</li></ul>';
+          new messagebox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_save_title'), $lang.get('editor_err_save_body') + errors);
+          return false;
+        }
+        // If someone else got to the page first, warn the user
+        if ( response.mode == 'obsolete' )
+        {
+          // Update the local timestamp to allow override
+          $('ajaxEditArea').object._edTimestamp = response.time;
+          new messagebox(MB_OK | MB_ICONEXCLAMATION, $lang.get('editor_err_obsolete_title'), $lang.get('editor_err_obsolete_body', { author: response.author, timestamp: response.date_string, page_url: makeUrl(title, false, true) }));
+          return false;
+        }
+        if ( response.mode == 'success' )
+        {
+          // The save was successful; reset flags and make another request for the new page content
+          setAjaxLoading();
+          editor_open = false;
+          enableUnload();
+          ajaxGet(stdAjaxPrefix + '&_mode=getpage&noheaders', function()
+            {
+              if ( ajax.readyState == 4 )
+              {
+                unsetAjaxLoading();
+                document.getElementById('ajaxEditContainer').innerHTML = '<div class="usermessage">' + $lang.get('editor_msg_saved') + '</div>' + ajax.responseText;
+                selectButtonMajor('article');
+                unselectAllButtonsMinor();
+              }
+            });
+        }
+      }
+    }, true);
+  
+}
+
+function ajaxEditorGenPreview()
+{
+  ajaxSetEditorLoading();
+  var ta_content = $('ajaxEditArea').getContent();
+  ta_content = ajaxEscape(ta_content);
+  if ( $('enano_editor_preview').object.innerHTML != '' )
+  {
+    opacity('enano_editor_preview', 100, 0, 500);
+  }
+  ajaxPost(stdAjaxPrefix + '&_mode=preview', 'text=' + ta_content, function()
+    {
+      if ( ajax.readyState == 4 )
+      {
+        ajaxUnSetEditorLoading();
+        changeOpac(0, 'enano_editor_preview');
+        $('enano_editor_preview').object.innerHTML = ajax.responseText;
+        window.location.hash = '#ajax_preview';
+        opacity('enano_editor_preview', 0, 100, 500);
+      }
+    }, true);
+}
+
+function ajaxEditorRevertToLatest()
+{
+  var mb = new messagebox(MB_YESNO | MB_ICONQUESTION, $lang.get('editor_msg_revert_confirm_title'), $lang.get('editor_msg_revert_confirm_body'));
+  mb.onclick['Yes'] = function()
+  {
+    setTimeout('ajaxEditorRevertToLatestReal();', 750);
+  }
+}
+
+function ajaxEditorRevertToLatestReal()
+{
+  ajaxSetEditorLoading();
+  ajaxGet(stdAjaxPrefix + '&_mode=getsource', function()
+    {
+      if ( ajax.readyState == 4 )
+      {
+        ajaxUnSetEditorLoading();
+        
+        var response = String(ajax.responseText + '');
+        if ( response.substr(0, 1) != '{' )
+        {
+          handle_invalid_json(response);
+          return false;
+        }
+        
+        response = parseJSON(response);
+        if ( response.mode == 'error' )
+        {
+          unselectAllButtonsMinor();
+          new messagebox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_server'), response.error);
+          return false;
+        }
+        
+        if ( !response.auth_view_source )
+        {
+          unselectAllButtonsMinor();
+          new messagebox(MB_OK | MB_ICONSTOP, $lang.get('editor_err_access_denied_title'), $lang.get('editor_err_access_denied_body'));
+          return false;
+        }
+        
+        var ed = tinyMCE.get('ajaxEditArea');
+        if ( ed )
+        {
+          ed.setContent(response.src);
+        }
+        else
+        {
+          $('ajaxEditArea').object.value = response.src;
+        }
+      }
+    }, true);
+}
+
+function ajaxEditorShowDiffs()
+{
+  ajaxSetEditorLoading();
+  var ta_content = $('ajaxEditArea').getContent();
+  ta_content = ajaxEscape(ta_content);
+  if ( $('enano_editor_preview').object.innerHTML != '' )
+  {
+    opacity('enano_editor_preview', 100, 0, 500);
+  }
+  ajaxPost(stdAjaxPrefix + '&_mode=diff_cur', 'text=' + ta_content, function()
+    {
+      if ( ajax.readyState == 4 )
+      {
+        ajaxUnSetEditorLoading();
+        changeOpac(0, 'enano_editor_preview');
+        $('enano_editor_preview').object.innerHTML = ajax.responseText;
+        window.location.hash = '#ajax_preview';
+        opacity('enano_editor_preview', 0, 100, 500);
+      }
+    }, true);
+}
+
+function ajaxEditorCancel()
+{
+  var mb = new messagebox(MB_YESNO | MB_ICONQUESTION, $lang.get('editor_msg_cancel_confirm_title'), $lang.get('editor_msg_cancel_confirm_body'));
+  mb.onclick['Yes'] = function()
+  {
+    setAjaxLoading();
+    editor_open = false;
+    enableUnload();
+    setTimeout('ajaxReset();', 750);
+  }
+}
+
+function ajaxSetEditorMCE()
+{
+  if ( editor_loading )
+    return false;
+  
+  // Clear out existing buttons
+  var span_wiki = $dynano('enano_edit_btn_pt').object;
+  var span_mce  = $dynano('enano_edit_btn_mce').object;
+  span_wiki.removeChild(span_wiki.firstChild);
+  span_mce.removeChild(span_mce.firstChild);
+  
+  // Rebuild control
+  var a = document.createElement('a');
+  a.href = '#';
+  a.onclick = function() {
+    ajaxSetEditorPlain();
+    return false;
+  };
+  a.appendChild(document.createTextNode($lang.get('editor_btn_wikitext')));
+  span_wiki.appendChild(a);
+  span_mce.appendChild(document.createTextNode($lang.get('editor_btn_graphical')));
+  
+  // Swap editor
+  $dynano('ajaxEditArea').switchToMCE();
+  
+  // Remember the setting
+  createCookie('enano_editor_mode', 'tinymce', 365);
+}
+
+function ajaxSetEditorPlain()
+{
+  if ( editor_loading )
+    return false;
+  
+  // Clear out existing buttons
+  var span_wiki = $dynano('enano_edit_btn_pt').object;
+  var span_mce  = $dynano('enano_edit_btn_mce').object;
+  span_wiki.removeChild(span_wiki.firstChild);
+  span_mce.removeChild(span_mce.firstChild);
+  
+  // Rebuild control
+  span_wiki.appendChild(document.createTextNode($lang.get('editor_btn_wikitext')));
+  var a = document.createElement('a');
+  a.href = '#';
+  a.onclick = function() {
+    ajaxSetEditorMCE();
+    return false;
+  };
+  a.appendChild(document.createTextNode($lang.get('editor_btn_graphical')));
+  span_mce.appendChild(a);
+  
+  // Swap editor
+  $dynano('ajaxEditArea').destroyMCE();
+  
+  // Remember the setting
+  createCookie('enano_editor_mode', 'text', 365);
+}
+
+var editor_loading = false;
+
+function ajaxSetEditorLoading()
+{
+  var ed = tinyMCE.get('ajaxEditArea');
+  editor_loading = true;
+  if ( ed )
+  {
+    ed.setProgressState(1);
+  }
+  else
+  {
+    ed = document.getElementById('ajaxEditArea');
+    var blackout = document.createElement('div');
+    blackout.style.position = 'absolute';
+    blackout.style.top = $('ajaxEditArea').Top() + 'px';
+    blackout.style.left = $('ajaxEditArea').Left() + 'px';
+    blackout.style.width = $('ajaxEditArea').Width() + 'px';
+    blackout.style.height = $('ajaxEditArea').Height() + 'px';
+    blackout.style.backgroundColor = '#FFFFFF';
+    domObjChangeOpac(60, blackout);
+    blackout.style.backgroundImage = 'url(' + scriptPath + '/includes/clientside/tinymce/themes/advanced/skins/default/img/progress.gif)';
+    blackout.style.backgroundPosition = 'center center';
+    blackout.style.backgroundRepeat = 'no-repeat';
+    blackout.id = 'enano_editor_blackout';
+    blackout.style.zIndex = getHighestZ() + 2;
+    
+    var body = document.getElementsByTagName('body')[0];
+    body.appendChild(blackout);
+  }
+}
+
+function ajaxUnSetEditorLoading()
+{
+  editor_loading = false;
+  var ed = tinyMCE.get('ajaxEditArea');
+  if ( ed )
+  {
+    ed.setProgressState(0);
+  }
+  else
+  {
+    var blackout = document.getElementById('enano_editor_blackout');
+    var body = document.getElementsByTagName('body')[0];
+    body.removeChild(blackout);
+  }
+}
+

--- a/includes/clientside/static/enano-lib-basic.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/static/enano-lib-basic.js	Thu Dec 27 22:09:33 2007 -0500
@@ -255,7 +255,7 @@
 {
   var script = document.createElement('script');
   script.type="text/javascript";
-  script.src=scriptPath+"/includes/clientside/tinymce/tiny_mce_src.js";
+  script.src=scriptPath+"/includes/clientside/tinymce/tiny_mce.js";
   head.appendChild(script);
 }
 

--- a/includes/clientside/static/l10n.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/static/l10n.js	Thu Dec 27 22:09:33 2007 -0500
@@ -23,13 +23,13 @@
   
   this.perform_subst = function(str, subst)
   {
-    // var this_regex = /%this\.([a-z0-9_]+)%/;
-    // var match;
-    // while ( str.match(this_regex) )
-    // {
-    //   match = str.match(this_regex);
-    //   alert(match);
-    // }
+    var this_regex = /%this\.([a-z0-9_]+)%/;
+    var match;
+    while ( str.match(this_regex) )
+    {
+      match = str.match(this_regex);
+      str = str.replace(match[0], this.get(match[1]));
+    }
     // hackish workaround for %config.*%
     str = str.replace(/%config\.([a-z0-9_]+)%/g, '%$1%');
     if ( typeof(subst) == 'object' )

--- a/includes/clientside/static/misc.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/static/misc.js	Thu Dec 27 22:09:33 2007 -0500
@@ -123,16 +123,19 @@
 function disableUnload(message)
 {
   if(typeof message != 'string') message = 'You may want to save your changes first.';
-  var body = document.getElementsByTagName('body');
-  body = body[0];
-  body.onbeforeunload='return unescape(\''+escape(message)+'\')';
+  window._unloadmsg = message;
+  window.onbeforeunload = function(e)
+  {
+    if ( !e )
+      e = window.event;
+    e.returnValue = window._unloadmsg;
+  }
 }
 
 function enableUnload()
 {
-  var body = document.getElementsByTagName('body');
-  body = body[0];
-  body.onbeforeunload = null;
+  window._unloadmsg = null;
+  window.onbeforeunload = null;
 }
 
 /**
@@ -656,7 +659,7 @@
             }
             break;
           case 'success_reset':
-            var conf = confirm('You have logged in using a temporary password. Before you can log in, you must finish resetting your password. Do you want to reset your real password now?');
+            var conf = confirm($lang.get('user_login_ajax_msg_used_temp_pass'));
             if ( conf )
             {
               var url = makeUrlNS('Special', 'PasswordReset/stage2/' + response.user_id + '/' + response.temppass);

--- a/includes/clientside/tinymce/blank.htm	Wed Dec 26 00:37:26 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>blank_page</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-<body class="mceContentBody">
-
-</body>
-</html>

--- a/includes/clientside/tinymce/langs/en.js	Wed Dec 26 00:37:26 2007 -0500
+++ b/includes/clientside/tinymce/langs/en.js	Thu Dec 27 22:09:33 2007 -0500
@@ -1,41 +1,154 @@
-// UK lang variables
-
-tinyMCE.addToLang('',{
-bold_desc : 'Bold (Ctrl+B)',
-italic_desc : 'Italic (Ctrl+I)',
-underline_desc : 'Underline (Ctrl+U)',
-striketrough_desc : 'Strikethrough',
-justifyleft_desc : 'Align left',
-justifycenter_desc : 'Align center',
-justifyright_desc : 'Align right',
-justifyfull_desc : 'Align full',
-bullist_desc : 'Unordered list',
-numlist_desc : 'Ordered list',
-outdent_desc : 'Outdent',
-indent_desc : 'Indent',
-undo_desc : 'Undo (Ctrl+Z)',
-redo_desc : 'Redo (Ctrl+Y)',
-link_desc : 'Insert/edit link',
-unlink_desc : 'Unlink',
-image_desc : 'Insert/edit image',
-cleanup_desc : 'Cleanup messy code',
-focus_alert : 'A editor instance must be focused before using this command.',
-edit_confirm : 'Do you want to use the WYSIWYG mode for this textarea?',
-insert_link_title : 'Insert/edit link',
-insert : 'Insert',
-update : 'Update',
-cancel : 'Cancel',
-insert_link_url : 'Link URL',
-insert_link_target : 'Target',
-insert_link_target_same : 'Open link in the same window',
-insert_link_target_blank : 'Open link in a new window',
-insert_image_title : 'Insert/edit image',
-insert_image_src : 'Image URL',
-insert_image_alt : 'Image description',
-help_desc : 'Help',
-bold_img : "bold.gif",
-italic_img : "italic.gif",
-underline_img : "underline.gif",
-clipboard_msg : 'Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?',
-popup_blocked : 'Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.'
-});
+tinyMCE.addI18n({en:{
+common:{
+edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
+apply:"Apply",
+insert:"Insert",
+update:"Update",
+cancel:"Cancel",
+close:"Close",
+browse:"Browse",
+class_name:"Class",
+not_set:"-- Not set --",
+clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
+clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
+popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
+invalid_data:"Error: Invalid values entered, these are marked in red.",
+more_colors:"More colors"
+},
+contextmenu:{
+align:"Alignment",
+left:"Left",
+center:"Center",
+right:"Right",
+full:"Full"
+},
+insertdatetime:{
+date_fmt:"%Y-%m-%d",
+time_fmt:"%H:%M:%S",
+insertdate_desc:"Insert date",
+inserttime_desc:"Insert time",
+months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
+months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
+day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
+day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
+},
+print:{
+print_desc:"Print"
+},
+preview:{
+preview_desc:"Preview"
+},
+directionality:{
+ltr_desc:"Direction left to right",
+rtl_desc:"Direction right to left"
+},
+layer:{
+insertlayer_desc:"Insert new layer",
+forward_desc:"Move forward",
+backward_desc:"Move backward",
+absolute_desc:"Toggle absolute positioning",
+content:"New layer..."
+},
+save:{
+save_desc:"Save",
+cancel_desc:"Cancel all changes"
+},
+nonbreaking:{
+nonbreaking_desc:"Insert non-breaking space character"
+},
+iespell:{
+iespell_desc:"Run spell checking",
+download:"ieSpell not detected. Do you want to install it now?"
+},
+advhr:{
+advhr_desc:"Horizontale rule"
+},
+emotions:{
+emotions_desc:"Emotions"
+},
+searchreplace:{
+search_desc:"Find",
+replace_desc:"Find/Replace"
+},
+advimage:{
+image_desc:"Insert/edit image"
+},
+advlink:{
+link_desc:"Insert/edit link"
+},
+xhtmlxtras:{
+cite_desc:"Citation",
+abbr_desc:"Abbreviation",
+acronym_desc:"Acronym",
+del_desc:"Deletion",
+ins_desc:"Insertion",
+attribs_desc:"Insert/Edit Attributes"
+},
+style:{
+desc:"Edit CSS Style"
+},
+paste:{
+paste_text_desc:"Paste as Plain Text",
+paste_word_desc:"Paste from Word",
+selectall_desc:"Select All"
+},
+paste_dlg:{
+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V on your keyboard to paste the text into the window."
+},
+table:{
+desc:"Inserts a new table",
+row_before_desc:"Insert row before",
+row_after_desc:"Insert row after",
+delete_row_desc:"Delete row",
+col_before_desc:"Insert column before",
+col_after_desc:"Insert column after",
+delete_col_desc:"Remove column",
+split_cells_desc:"Split merged table cells",
+merge_cells_desc:"Merge table cells",
+row_desc:"Table row properties",
+cell_desc:"Table cell properties",
+props_desc:"Table properties",
+paste_row_before_desc:"Paste table row before",
+paste_row_after_desc:"Paste table row after",
+cut_row_desc:"Cut table row",
+copy_row_desc:"Copy table row",
+del:"Delete table",
+row:"Row",
+col:"Column",
+cell:"Cell"
+},
+autosave:{
+unload_msg:"The changes you made will be lost if you navigate away from this page."
+},
+fullscreen:{
+desc:"Toggle fullscreen mode"
+},
+media:{
+desc:"Insert / edit embedded media",
+edit:"Edit embedded media"
+},
+fullpage:{
+desc:"Document properties"
+},
+template:{
+desc:"Insert predefined template content"
+},
+visualchars:{
+desc:"Visual control characters on/off."
+},
+spellchecker:{
+desc:"Toggle spellchecker",
+menu:"Spellchecker settings",
+ignore_word:"Ignore word",
+ignore_words:"Ignore all",
+langs:"Languages",
+wait:"Please wait...",
+sug:"Suggestions",
+no_sug:"No suggestions",
+no_mpell:"No misspellings found."
+},
+pagebreak:{
+desc:"Insert page break."
+}}});
\ No newline at end of file