Merge branch 'jqueryui' into 1.0.x

Conflicts:
	lib/action.php

diff --cc lib/action.php
index fce59ba8a008f54583f400e7721ee4cbbc8d1c61,7614f4be3aec05a568a62d4a6699e2bd3531c060..12464c2c68e768432ebc5bcaf274547efbf9f9d1
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -293,19 -295,12 +295,21 @@@ class Action extends HTMLOutputter // l
      {
          if (Event::handle('StartShowScripts', array($this))) {
              if (Event::handle('StartShowJQueryScripts', array($this))) {
 -                $this->script('jquery.min.js');
 -                $this->script('jquery.form.min.js');
 -                $this->script('jquery-ui.min.js');
 -                $this->script('jquery.cookie.min.js');
 -                $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
 -                $this->script('jquery.joverlay.min.js');
 +                if (common_config('site', 'minify')) {
 +                    $this->script('jquery.min.js');
 +                    $this->script('jquery.form.min.js');
++                    $this->script('jquery-ui.min.js');
 +                    $this->script('jquery.cookie.min.js');
 +                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
 +                    $this->script('jquery.joverlay.min.js');
 +                } else {
 +                    $this->script('jquery.js');
 +                    $this->script('jquery.form.js');
++                    $this->script('jquery-ui.min.js');
 +                    $this->script('jquery.cookie.js');
 +                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
 +                    $this->script('jquery.joverlay.js');
 +                }
                  Event::handle('EndShowJQueryScripts', array($this));
              }
              if (Event::handle('StartShowStatusNetScripts', array($this)) &&