0
@@ -51,18 +51,18 @@ $preview = array_key_exists('previewbutton', $_POST);
0
 $submit = array_key_exists('submitbutton', $_POST);
0
 $apply = array_key_exists('applybutton', $_POST);
0
 
0
-require_once(dirname(dirname(__FILE__)) . '/lib/xajax/xajax.inc.php');
0
-$xajax = new xajax();
0
-$xajax->registerFunction('ajaxpreview');
0
-$xajax->registerFunction('change_block_type');
0
+$cms_ajax = new CmsAjax();
0
 
0
-$xajax->processRequests();
0
+$cms_ajax->register_function('ajaxpreview');
0
+$cms_ajax->register_function('change_block_type');
0
+
0
+$cms_ajax->process_requests();
0
 
0
 #See what kind of permissions we have
0
 $access = (check_permission($userid, 'Add Pages') || check_permission($userid, 'Modify Page Structure'));
0
 
0
 require_once("header.php");
0
-CmsAdminTheme::inject_header_text($xajax->getJavascript('../lib/xajax')."\n");
0
+CmsAdminTheme::inject_header_text($cms_ajax->get_javascript()."\n");
0
 
0
 #No access?  Just display an error and exit.
0
 if (!$access) {
0
@@ -167,8 +167,9 @@ function change_block_type($params, $block_id, $new_block_type)
0
   $div_id = 'content-form-' . $block_id;
0
   $page_object->$type_param = $new_block_type;
0
   
0
-  $objResponse = new xajaxResponse();
0
-  $objResponse->addAssign("serialized_content", "value", serialize_object($page_object));
0
+  $resp = new CmsAjaxResponse();
0
+
0
+  $resp->modify_attribute("#serialized_content", "value", serialize_object($page_object));
0
   
0
   $smarty->_compile_source('metadata template', $page_object->create_block_type($block_id), $_compiled);
0
   @ob_start();
0
@@ -176,9 +177,9 @@ function change_block_type($params, $block_id, $new_block_type)
0
   $result = @ob_get_contents();
0
   @ob_end_clean();
0
   
0
-  $objResponse->addAssign($div_id, 'innerHTML', $result);
0
+  $resp->modify_html("#$div_id", $result);
0
   
0
-  return $objResponse->getXML();
0
+  return $resp->get_result();
0
 }
0
 
0
 function ajaxpreview($params)
0
@@ -196,18 +197,12 @@ function ajaxpreview($params)
0
   $tmpfname = create_preview($page_object);
0
   $url = $config["root_url"] . '/index.php?tmpfile=' . urlencode(basename($tmpfname));
0
   
0
-  $objResponse = new xajaxResponse();
0
-  $objResponse->addAssign("previewframe", "src", $url);
0
-  $objResponse->addAssign("serialized_content", "value", serialize_object($page_object));
0
-  $count = 0;
0
+  $resp = new CmsAjaxResponse();
0
 
0
-  foreach (array("content", "advanced") as $tabname)
0
-  {
0
-    $objResponse->addScript("Element.removeClassName('".$tabname."', 'active');Element.removeClassName('".$tabname."_c', 'active');$('".$tabname."_c').style.display = 'none';");
0
-  }
0
-  $objResponse->addScript("Element.addClassName('preview', 'active');Element.addClassName('preview_c', 'active');$('preview_c').style.display = '';");
0
+  $resp->modify_attribute("#previewframe", "src", $url);
0
+  $resp->modify_attribute("#serialized_content", "value", serialize_object($page_object));
0
 
0
-  return $objResponse->getXML();
0
+  return $resp->get_result();
0
 }
0
 
0
 //Get a working page object
0
@@ -291,13 +286,14 @@ $smarty->assign('metadata_box', create_textarea(false, $page_object->metadata, '
0
 
0
 //extra buttons
0
 $ExtraButtons = array(
0
-          array(
0
-          'name'    => 'preview',
0
-          'class'   => 'positive preview',
0
-          'image'   => '',
0
-          'caption' => lang('preview'),
0
-          ),
0
-          );
0
+  array(
0
+    'name'    => 'preview',
0
+    'class'   => 'positive preview',
0
+    'image'   => '',
0
+    'caption' => lang('preview'),
0
+    'onclick' => "$('#page_tabs').tabsClick(4);return false;"
0
+  ),
0
+);
0
 
0
 $smarty->assign('DisplayButtons', $ExtraButtons);
0
 

0
@@ -17,7 +17,7 @@
0
       <li><a href="#advanced"><span>Advanced</span></a></li>
0
       <li><a href="#permissions"><span>Permissions</span></a></li>
0
       {if $can_preview eq true}
0
-        <li><a href="#preview"{if $showpreview eq true} class="active"{/if} onclick="xajax_ajaxpreview(xajax.getFormValues('contentform'));return false;"><span>Preview</span></a></li>
0
+        <li><a href="#preview"{if $showpreview eq true} class="active"{/if} onclick="cms_ajax_ajaxpreview($('#contentform').serializeForCmsAjax());return false;"><span>Preview</span></a></li>
0
       {/if}
0
     </ul>
0
     <div id="content">

0
@@ -5,7 +5,7 @@
0
 
0
   {* loop through to get custom buttons *}
0
   {foreach from=$DisplayButtons item=OneButton}
0
-    <input type="submit" value="{$OneButton.caption}" name="{$OneButton.name}" class="{$OneButton.class}" />
0
+    <input type="submit" value="{$OneButton.caption}" name="{$OneButton.name}" class="{$OneButton.class}" {if isset($OneButton.class)} onclick="{$OneButton.onclick}" {/if} />
0
   {/foreach}
0
 
0
 </div>
0
\ No newline at end of file

0
@@ -43,9 +43,22 @@ class CmsAjax extends CmsObject
0
       $args = array();
0
       if ($xml)
0
       {
0
-        foreach($xml->e as $element)
0
+        foreach ($xml->xpath('/ajaxarray/*') as $element)
0
         {
0
-          $args[] = (string)$element;
0
+          switch($element->getName())
0
+          {
0
+            case 'e':
0
+              $args[] = (string)$element;
0
+              break;
0
+            case 'sf':
0
+              $str = (string)$element;
0
+              $result = array();
0
+
0
+              parse_str($str, $result);
0
+              
0
+              $args[] = $result;
0
+              break;
0
+          }
0
         }
0
       }
0
       

0
@@ -29,7 +29,12 @@ class CmsAjaxResponse extends CmsObject
0
   
0
   function modify_html($selector, $text)
0
   {
0
-    $this->result .= '<as><s>' . $selector . '</s><t><![CDATA[' . $text . ']]></t></as>';
0
+    $this->result .= '<mh><s>' . $selector . '</s><t><![CDATA[' . $text . ']]></t></mh>';
0
+  }
0
+  
0
+  function modify_attribute($selector, $attribute, $text)
0
+  {
0
+    $this->result .= '<ma><s>' . $selector . '</s><a><![CDATA[' . $attribute . ']]></a><t><![CDATA[' . $text . ']]></t></ma>';
0
   }
0
   
0
   function script($text)

0
@@ -114,7 +114,7 @@ class Content extends CmsContentBase
0
         <div class="accordion_content">
0
           <div class="pageoverflow">
0
             <p class="pagetext">'.lang('blocktype').':</p>
0
-            <select name="content[property]['.$block['id'].'-block-type]" id="'.$block['id'].'-block-type" onchange="xajax_change_block_type(xajax.getFormValues(\'contentform\'), \''.$block['id'].'\', \'\' + $(\'#'.$block['id'].'-block-type\').val()); return false;">
0
+            <select name="content[property]['.$block['id'].'-block-type]" id="'.$block['id'].'-block-type" onchange="cms_ajax_change_block_type($(\'#contentform\').serializeForCmsAjax(), \''.$block['id'].'\', \'\' + $(\'#'.$block['id'].'-block-type\').val()); return false;">
0
               '.$this->create_block_type_options($type).'
0
             </select>
0
           </div>

0
@@ -1,30 +1,3 @@
0
-jQuery.fn.highlight = function(color, speed, easing, callback) {
0
-    
0
-  /* current color of the element */
0
-  var originalColor = jQuery(this).css('backgroundColor');
0
-  
0
-  /* find the first "real" color from the parent elements */
0
-  var parentEl = this.parentNode;
0
-  while(originalColor == 'transparent' && parentEl) {
0
-    originalColor = jQuery(parentEl).css('backgroundColor');
0
-    parentEl = parentEl.parentNode;
0
-  }
0
-  
0
-  /* swap element to the highlight color */
0
-  jQuery(this).css('backgroundColor', color);
0
-  
0
-  /* in IE, style is an object */
0
-  if(typeof this.oldStyleAttr == 'object') {
0
-      this.oldStyleAttr = this.oldStyleAttr["cssText"];
0
-  }
0
-  
0
-  /* animate back to the original color */
0
-  jQuery(this).animate(
0
-    {'backgroundColor':originalColor},
0
-    speed
0
-  );
0
-};
0
-
0
 function cms_ajax_call(fName, aArgs, iInt)
0
 {
0
   $.ajax({
0
@@ -34,6 +7,7 @@ function cms_ajax_call(fName, aArgs, iInt)
0
         cms_ajax_args: cms_ajax_array_to_xml(jQuery.makeArray(aArgs))
0
       },
0
       dataType: "xml",
0
+      type: "POST",
0
       success: function (xml) {
0
         cms_ajax_callback(xml);
0
       }
0
@@ -45,13 +19,21 @@ function cms_ajax_callback(xml)
0
   $(xml).find('ajax').children().each(
0
     function()
0
     {
0
-      if (this.tagName == 'as') //from ->modify_html
0
+      if (this.tagName == 'mh') //from ->modify_html
0
       {
0
         var selector = $(this).find("s").text();
0
         var val = $(this).find("t").text();
0
         
0
         $(selector).html(val);
0
       }
0
+      else if (this.tagName == 'ma') //from ->modify_attribute
0
+      {
0
+        var selector = $(this).find("s").text();
0
+        var attribute = $(this).find("a").text();
0
+        var val = $(this).find("t").text();
0
+        
0
+        $(selector).attr(attribute, val);
0
+      }
0
       else if (this.tagName == 'sc') //from ->script
0
       {
0
         var val = $(this).find("t").text();
0
@@ -67,9 +49,46 @@ function cms_ajax_array_to_xml(ary)
0
   var xml = "<ajaxarray>";
0
   for (i = 0; i < ary.length; i++)
0
   {
0
-    xml += '<e><![CDATA[' + ary[i] + ']]></e>';
0
+    var elem = String(ary[i]);
0
+    if (elem.indexOf("<sf>") == 0) //handle a serialized form
0
+      xml += elem;
0
+    else
0
+      xml += '<e><![CDATA[' + ary[i] + ']]></e>';
0
   }
0
   xml += "</ajaxarray>";
0
 
0
   return xml;
0
 }
0
+
0
+jQuery.fn.serializeForCmsAjax = function() {
0
+
0
+    return '<sf><![CDATA[' + this.serialize() + ']]></sf>';
0
+
0
+};
0
+
0
+jQuery.fn.highlight = function(color, speed, easing, callback) {
0
+    
0
+  /* current color of the element */
0
+  var originalColor = jQuery(this).css('backgroundColor');
0
+  
0
+  /* find the first "real" color from the parent elements */
0
+  var parentEl = this.parentNode;
0
+  while(originalColor == 'transparent' && parentEl) {
0
+    originalColor = jQuery(parentEl).css('backgroundColor');
0
+    parentEl = parentEl.parentNode;
0
+  }
0
+  
0
+  /* swap element to the highlight color */
0
+  jQuery(this).css('backgroundColor', color);
0
+  
0
+  /* in IE, style is an object */
0
+  if(typeof this.oldStyleAttr == 'object') {
0
+      this.oldStyleAttr = this.oldStyleAttr["cssText"];
0
+  }
0
+  
0
+  /* animate back to the original color */
0
+  jQuery(this).animate(
0
+    {'backgroundColor':originalColor},
0
+    speed
0
+  );
0
+};