? install.patch
? menu.patch
? modal.patch
? modal_0.patch.txt
? sites/default/files
? sites/default/settings.php
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.956
diff -u -p -r1.956 common.inc
--- includes/common.inc	8 Aug 2009 20:52:32 -0000	1.956
+++ includes/common.inc	10 Aug 2009 04:38:29 -0000
@@ -4917,3 +4917,24 @@ function _drupal_flush_css_js() {
   }
   variable_set('css_js_query_string', $new_character . substr($string_history, 0, 19));
 }
+
+/**
+ * Add a dialog using jquery UI.
+ * TODO: fix this comment.
+ * @param $selector, a jquery selector
+ * @param $options, see http://docs.jquery.com/UI/Dialog#options
+ */
+function drupal_dialog($selector = '', $options = array()) {
+  $dialogs = &drupal_static(__FUNCTION__, array());
+  if (!count($dialogs)) {
+    drupal_add_library('system', 'ui.dialog');
+    drupal_add_library('system', 'ui.draggable');
+    drupal_add_library('system', 'ui.droppable');
+    drupal_add_js('misc/dialog.js');
+  }
+  if (!isset($dialogs[$selector])) {
+    $dialogs[$selector] = $options;
+    drupal_add_js(array('dialogs' => $dialogs), 'setting');
+  }
+  return $dialogs;
+}
\ No newline at end of file
Index: misc/dialog.js
===================================================================
RCS file: misc/dialog.js
diff -N misc/dialog.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/dialog.js	10 Aug 2009 04:38:29 -0000
@@ -0,0 +1,24 @@
+// $Id$
+(function ($) {
+
+/**
+ * Initialize all modal dialogs requested by drupal_dialog().
+ */
+Drupal.behaviors.dialog = {
+  attach: function (context, settings) {
+  for (var key in Drupal.settings.dialogs) {
+    $(Drupal.settings.dialogs[key].modal_selector).dialog({ 
+      autoOpen: false, 
+      modal: true, 
+      width: 600,
+      height: 500,
+    });
+    $(key).click(function() {
+      $(Drupal.settings.dialogs[key].modal_selector).dialog("open");
+      return false;
+    });
+  }
+ }
+}
+
+})(jQuery);
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.265
diff -u -p -r1.265 filter.module
--- modules/filter/filter.module	2 Aug 2009 15:44:08 -0000	1.265
+++ modules/filter/filter.module	10 Aug 2009 04:38:29 -0000
@@ -578,7 +578,13 @@ function _filter_tips($format, $long = F
  * @ingroup themeable
  */
 function theme_filter_tips_more_info() {
-  return '<p>' . l(t('More information about text formats'), 'filter/tips') . '</p>';
+  $output = '<p>' . l(t('More information about text formats'), 'filter/tips', array('attributes' => array('class' => 'filter-tips-modal'))) . '</p>';
+  $options = array();
+  $title = t('Filter Tips');
+  $content = filter_tips_long();
+  $output .= '<div id="filter-tips-modal-dialog" class="ui-helper-hidden" title="' . $title . '">' . $content . '</div>';
+  drupal_dialog(".filter-tips-modal", array('modal_selector' => "#filter-tips-modal-dialog"));
+  return $output;
 }
 
 /**
Index: modules/filter/filter.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.pages.inc,v
retrieving revision 1.7
diff -u -p -r1.7 filter.pages.inc
--- modules/filter/filter.pages.inc	8 Mar 2009 21:25:18 -0000	1.7
+++ modules/filter/filter.pages.inc	10 Aug 2009 04:38:29 -0000
@@ -10,15 +10,8 @@
 /**
  * Menu callback; show a page with long filter tips.
  */
-function filter_tips_long() {
-  $format = arg(2);
-  if ($format) {
-    $output = theme('filter_tips', _filter_tips($format, TRUE), TRUE);
-  }
-  else {
-    $output = theme('filter_tips', _filter_tips(-1, TRUE), TRUE);
-  }
-  return $output;
+function filter_tips_long($format = '') {
+  return theme('filter_tips', _filter_tips(-1, TRUE), TRUE);
 }
 
 
Index: modules/php/php.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.test,v
retrieving revision 1.14
diff -u -p -r1.14 php.test
--- modules/php/php.test	13 Jul 2009 21:51:11 -0000	1.14
+++ modules/php/php.test	10 Aug 2009 04:38:29 -0000
@@ -56,7 +56,7 @@ class PHPFilterTestCase extends PHPTestC
 
     // Make sure that the PHP code shows up as text.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertText('print', t('PHP code is displayed.'));
+    $this->assertText('print "SimpleTest PHP was executed!"', t('PHP code is displayed.'));
 
     // Change filter to PHP filter and see that PHP code is evaluated.
     $edit = array();
@@ -65,7 +65,7 @@ class PHPFilterTestCase extends PHPTestC
     $this->assertRaw(t('Page %title has been updated.', array('%title' => $node->title)), t('PHP code filter turned on.'));
 
     // Make sure that the PHP code shows up as text.
-    $this->assertNoText('print', t('PHP code isn\'t displayed.'));
+    $this->assertNoText('print "SimpleTest PHP was executed!"', t('PHP code isn\'t displayed.'));
     $this->assertText('SimpleTest PHP was executed!', t('PHP code has been evaluated.'));
   }
 }