From f2e4f7193f57924d027588126fb26ddef255d5fa Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Mon, 29 Oct 2012 10:51:17 +1300
Subject: [PATCH 01/30] Rename rapidxwpr div class to wrapper - since thats
 what it is #550

* Fix other themes for renaming rapidxwpr to wrapper #550
---
 themes/bueno/views/footer.php    | 2 +-
 themes/bueno/views/header.php    | 2 +-
 themes/default/css/style.css     | 2 +-
 themes/default/views/footer.php  | 2 +-
 themes/default/views/header.php  | 2 +-
 themes/polaroid/css/_default.css | 2 +-
 themes/polaroid/views/footer.php | 2 +-
 themes/polaroid/views/header.php | 2 +-
 themes/unicorn/views/footer.php  | 2 +-
 themes/unicorn/views/header.php  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/themes/bueno/views/footer.php b/themes/bueno/views/footer.php
index 87420b89f5..93dd9f7fd8 100644
--- a/themes/bueno/views/footer.php
+++ b/themes/bueno/views/footer.php
@@ -11,7 +11,7 @@
 		<div id="underfooter"></div>
 
 		<!-- footer content -->
-		<div class="rapidxwpr floatholder">
+		<div class="wrapper floatholder">
 
 			<!-- footer credits -->
 			<div class="footer-credits">
diff --git a/themes/bueno/views/header.php b/themes/bueno/views/header.php
index ce6a1e69bf..b257b275cc 100644
--- a/themes/bueno/views/header.php
+++ b/themes/bueno/views/header.php
@@ -53,7 +53,7 @@
 
 
 	<!-- wrapper -->
-	<div class="rapidxwpr floatholder">
+	<div class="wrapper floatholder">
 
 		<!-- header -->
 		<div id="header">
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 7b46940ed2..94809e1087 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -80,7 +80,7 @@ body{
 
 
 /* wrapper setup */
-div.rapidxwpr{
+div.wrapper, div.rapidxwpr{
     margin: auto;
     width: 960px;
 }
diff --git a/themes/default/views/footer.php b/themes/default/views/footer.php
index 7cf8a54864..8ea8673a32 100644
--- a/themes/default/views/footer.php
+++ b/themes/default/views/footer.php
@@ -11,7 +11,7 @@
 		<div id="underfooter"></div>
 
 		<!-- footer content -->
-		<div class="rapidxwpr floatholder">
+		<div class="wrapper floatholder rapidxwpr">
 
 			<!-- footer credits -->
 			<div class="footer-credits">
diff --git a/themes/default/views/header.php b/themes/default/views/header.php
index 968869fbd2..979b773ab3 100644
--- a/themes/default/views/header.php
+++ b/themes/default/views/header.php
@@ -42,7 +42,7 @@
 	<?php echo $header_nav; ?>
 
 	<!-- wrapper -->
-	<div class="rapidxwpr floatholder">
+	<div class="wrapper floatholder rapidxwpr">
 
 		<!-- header -->
 		<div id="header">
diff --git a/themes/polaroid/css/_default.css b/themes/polaroid/css/_default.css
index fd8291de01..79e542e08a 100644
--- a/themes/polaroid/css/_default.css
+++ b/themes/polaroid/css/_default.css
@@ -174,7 +174,7 @@ body.page-reports-view { background:#ffffff; background-image:none; }
 .report_detail .r_location,
 div.credibility { display:none; }
 
-.page-reports-view div.rapidxwpr { width:740px; }
+.page-reports-view div.wrapper { width:740px; }
 .page-reports-view div#main { padding:0; }
 #main .left-col { width:150px; margin-right:45px; }
 #main .middle-col { width:350px; margin-right:45px; float:left; }
diff --git a/themes/polaroid/views/footer.php b/themes/polaroid/views/footer.php
index 87420b89f5..93dd9f7fd8 100644
--- a/themes/polaroid/views/footer.php
+++ b/themes/polaroid/views/footer.php
@@ -11,7 +11,7 @@
 		<div id="underfooter"></div>
 
 		<!-- footer content -->
-		<div class="rapidxwpr floatholder">
+		<div class="wrapper floatholder">
 
 			<!-- footer credits -->
 			<div class="footer-credits">
diff --git a/themes/polaroid/views/header.php b/themes/polaroid/views/header.php
index 43bfe4971a..66d310d4c1 100644
--- a/themes/polaroid/views/header.php
+++ b/themes/polaroid/views/header.php
@@ -53,7 +53,7 @@
 
 
 	<!-- wrapper -->
-	<div class="rapidxwpr floatholder">
+	<div class="wrapper floatholder">
 
 		<!-- header -->
 		<div id="header">
diff --git a/themes/unicorn/views/footer.php b/themes/unicorn/views/footer.php
index 05df581450..5010d1cada 100644
--- a/themes/unicorn/views/footer.php
+++ b/themes/unicorn/views/footer.php
@@ -11,7 +11,7 @@
 		<div id="underfooter"></div>
 
 		<!-- footer content -->
-		<div class="rapidxwpr floatholder">
+		<div class="wrapper floatholder">
 
 			<!-- footer credits -->
 			<div class="footer-credits">
diff --git a/themes/unicorn/views/header.php b/themes/unicorn/views/header.php
index 84d40b7d92..ca59419ba6 100644
--- a/themes/unicorn/views/header.php
+++ b/themes/unicorn/views/header.php
@@ -55,7 +55,7 @@
 
 
 	<!-- wrapper -->
-	<div class="rapidxwpr floatholder">
+	<div class="wrapper floatholder">
 
 		<!-- header -->
 		<div id="header">

From 27d0645809bb5fd53c12336d14edb02ab5209b92 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Thu, 28 Jun 2012 12:12:38 +1200
Subject: [PATCH 02/30] Move pngFix into global.js and remove runScheduler
 function #550

* pngFix can be run everywhere anyway.
* runScheduler was never being called
---
 application/libraries/Themes.php   | 2 --
 application/views/admin/layout.php | 1 +
 media/js/global.js                 | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 11ca87666c..d7bb36f3d7 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -207,8 +207,6 @@ private function _header_js()
 		$inline_js = <<< INLINEJS
 <script type="text/javascript">
 //<![CDATA[
-\$(function() { $(document).pngFix(); });
-
 {$insert_js}
 //]]>
 </script>
diff --git a/application/views/admin/layout.php b/application/views/admin/layout.php
index 6daec2cc4e..6a7a65355f 100644
--- a/application/views/admin/layout.php
+++ b/application/views/admin/layout.php
@@ -45,6 +45,7 @@
 	echo html::script(url::file_loc('js').'media/js/selectToUISlider.jQuery', TRUE);
 	echo html::script(url::file_loc('js').'media/js/jquery.hovertip-1.0', TRUE);
 	echo html::script(url::file_loc('js').'media/js/jquery.base64', TRUE);
+	echo html::script(url::file_loc('js')."media/js/jquery.pngFix.pack", TRUE);
 	?>
 
 	<?php if ($datepicker_enabled): ?>
diff --git a/media/js/global.js b/media/js/global.js
index 15b8f5e7e6..63fcd7d63a 100644
--- a/media/js/global.js
+++ b/media/js/global.js
@@ -24,5 +24,8 @@ jQuery(document).ready(function( $ ) {
 		var console = {};
 		console.log = console.error = console.info = console.debug = console.warn = console.trace = console.dir = console.dirxml = console.group = console.groupEnd = console.time = console.timeEnd = console.assert = console.profile = function() {};
 	}
+	
+	// Trigger pngFix
+	$(document).pngFix();
 
 });
\ No newline at end of file

From 3cfa8d92695483dc381209152d9875c7d6977b89 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 26 Oct 2012 17:49:42 +1300
Subject: [PATCH 03/30] Porting Requirements library #338

---
 application/libraries/JSMin.php        |  386 +++++++++
 application/libraries/Requirements.php | 1011 ++++++++++++++++++++++++
 themes/default/views/footer.php        |    1 +
 themes/default/views/header.php        |    1 +
 4 files changed, 1399 insertions(+)
 create mode 100644 application/libraries/JSMin.php
 create mode 100644 application/libraries/Requirements.php

diff --git a/application/libraries/JSMin.php b/application/libraries/JSMin.php
new file mode 100644
index 0000000000..ee1b442bce
--- /dev/null
+++ b/application/libraries/JSMin.php
@@ -0,0 +1,386 @@
+<?php
+/**
+ * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
+ *
+ * This is pretty much a direct port of jsmin.c to PHP with just a few
+ * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and
+ * outputs to stdout, this library accepts a string as input and returns another
+ * string as output.
+ *
+ * PHP 5 or higher is required.
+ *
+ * Permission is hereby granted to use this version of the library under the
+ * same terms as jsmin.c, which has the following license:
+ *
+ * --
+ * Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * The Software shall be used for Good, not Evil.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * --
+ *
+ * @package JSMin
+ * @author Ryan Grove <ryan@wonko.com>
+ * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
+ * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
+ * @copyright 2012 Adam Goforth <aag@adamgoforth.com> (Updates)
+ * @license http://opensource.org/licenses/mit-license.php MIT License
+ * @version 1.1.2 (2012-05-01)
+ * @link https://github.com/rgrove/jsmin-php
+ */
+
+class JSMin {
+  const ORD_LF            = 10;
+  const ORD_SPACE         = 32;
+  const ACTION_KEEP_A     = 1;
+  const ACTION_DELETE_A   = 2;
+  const ACTION_DELETE_A_B = 3;
+
+  protected $a           = '';
+  protected $b           = '';
+  protected $input       = '';
+  protected $inputIndex  = 0;
+  protected $inputLength = 0;
+  protected $lookAhead   = null;
+  protected $output      = '';
+
+  // -- Public Static Methods --------------------------------------------------
+
+  /**
+   * Minify Javascript
+   *
+   * @uses __construct()
+   * @uses min()
+   * @param string $js Javascript to be minified
+   * @return string
+   */
+  public static function minify($js) {
+    $jsmin = new JSMin($js);
+    return $jsmin->min();
+  }
+
+  // -- Public Instance Methods ------------------------------------------------
+
+  /**
+   * Constructor
+   *
+   * @param string $input Javascript to be minified
+   */
+  public function __construct($input) {
+    $this->input       = str_replace("\r\n", "\n", $input);
+    $this->inputLength = strlen($this->input);
+  }
+
+  // -- Protected Instance Methods ---------------------------------------------
+
+  /**
+   * Action -- do something! What to do is determined by the $command argument.
+   *
+   * action treats a string as a single character. Wow!
+   * action recognizes a regular expression if it is preceded by ( or , or =.
+   *
+   * @uses next()
+   * @uses get()
+   * @throws JSMinException If parser errors are found:
+   *         - Unterminated string literal
+   *         - Unterminated regular expression set in regex literal
+   *         - Unterminated regular expression literal
+   * @param int $command One of class constants:
+   *      ACTION_KEEP_A      Output A. Copy B to A. Get the next B.
+   *      ACTION_DELETE_A    Copy B to A. Get the next B. (Delete A).
+   *      ACTION_DELETE_A_B  Get the next B. (Delete B).
+  */
+  protected function action($command) {
+    switch($command) {
+      case self::ACTION_KEEP_A:
+        $this->output .= $this->a;
+
+      case self::ACTION_DELETE_A:
+        $this->a = $this->b;
+
+        if ($this->a === "'" || $this->a === '"') {
+          for (;;) {
+            $this->output .= $this->a;
+            $this->a       = $this->get();
+
+            if ($this->a === $this->b) {
+              break;
+            }
+
+            if (ord($this->a) <= self::ORD_LF) {
+              throw new JSMinException('Unterminated string literal.');
+            }
+
+            if ($this->a === '\\') {
+              $this->output .= $this->a;
+              $this->a       = $this->get();
+            }
+          }
+        }
+
+      case self::ACTION_DELETE_A_B:
+        $this->b = $this->next();
+
+        if ($this->b === '/' && (
+            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
+            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
+            $this->a === '&' || $this->a === '|' || $this->a === '?' ||
+            $this->a === '{' || $this->a === '}' || $this->a === ';' ||
+            $this->a === "\n" )) {
+
+          $this->output .= $this->a . $this->b;
+
+          for (;;) {
+            $this->a = $this->get();
+
+            if ($this->a === '[') {
+              /*
+                inside a regex [...] set, which MAY contain a '/' itself. Example: mootools Form.Validator near line 460:
+                  return Form.Validator.getValidator('IsEmpty').test(element) || (/^(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(element.get('value'));
+              */
+              for (;;) {
+                $this->output .= $this->a;
+                $this->a = $this->get();
+
+                if ($this->a === ']') {
+                    break;
+                } elseif ($this->a === '\\') {
+                  $this->output .= $this->a;
+                  $this->a       = $this->get();
+                } elseif (ord($this->a) <= self::ORD_LF) {
+                  throw new JSMinException('Unterminated regular expression set in regex literal.');
+                }
+              }
+            } elseif ($this->a === '/') {
+              break;
+            } elseif ($this->a === '\\') {
+              $this->output .= $this->a;
+              $this->a       = $this->get();
+            } elseif (ord($this->a) <= self::ORD_LF) {
+              throw new JSMinException('Unterminated regular expression literal.');
+            }
+
+            $this->output .= $this->a;
+          }
+
+          $this->b = $this->next();
+        }
+    }
+  }
+
+  /**
+   * Get next char. Convert ctrl char to space.
+   *
+   * @return string|null
+   */
+  protected function get() {
+    $c = $this->lookAhead;
+    $this->lookAhead = null;
+
+    if ($c === null) {
+      if ($this->inputIndex < $this->inputLength) {
+        $c = substr($this->input, $this->inputIndex, 1);
+        $this->inputIndex += 1;
+      } else {
+        $c = null;
+      }
+    }
+
+    if ($c === "\r") {
+      return "\n";
+    }
+
+    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+      return $c;
+    }
+
+    return ' ';
+  }
+
+  /**
+   * Is $c a letter, digit, underscore, dollar sign, or non-ASCII character.
+   *
+   * @return bool
+   */
+  protected function isAlphaNum($c) {
+    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+  }
+
+  /**
+   * Perform minification, return result
+   *
+   * @uses action()
+   * @uses isAlphaNum()
+   * @uses get()
+   * @uses peek()
+   * @return string
+   */
+  protected function min() {
+    if (0 == strncmp($this->peek(), "\xef", 1)) {
+        $this->get();
+        $this->get();
+        $this->get();
+    } 
+
+    $this->a = "\n";
+    $this->action(self::ACTION_DELETE_A_B);
+
+    while ($this->a !== null) {
+      switch ($this->a) {
+        case ' ':
+          if ($this->isAlphaNum($this->b)) {
+            $this->action(self::ACTION_KEEP_A);
+          } else {
+            $this->action(self::ACTION_DELETE_A);
+          }
+          break;
+
+        case "\n":
+          switch ($this->b) {
+            case '{':
+            case '[':
+            case '(':
+            case '+':
+            case '-':
+            case '!':
+            case '~':
+              $this->action(self::ACTION_KEEP_A);
+              break;
+
+            case ' ':
+              $this->action(self::ACTION_DELETE_A_B);
+              break;
+
+            default:
+              if ($this->isAlphaNum($this->b)) {
+                $this->action(self::ACTION_KEEP_A);
+              }
+              else {
+                $this->action(self::ACTION_DELETE_A);
+              }
+          }
+          break;
+
+        default:
+          switch ($this->b) {
+            case ' ':
+              if ($this->isAlphaNum($this->a)) {
+                $this->action(self::ACTION_KEEP_A);
+                break;
+              }
+
+              $this->action(self::ACTION_DELETE_A_B);
+              break;
+
+            case "\n":
+              switch ($this->a) {
+                case '}':
+                case ']':
+                case ')':
+                case '+':
+                case '-':
+                case '"':
+                case "'":
+                  $this->action(self::ACTION_KEEP_A);
+                  break;
+
+                default:
+                  if ($this->isAlphaNum($this->a)) {
+                    $this->action(self::ACTION_KEEP_A);
+                  }
+                  else {
+                    $this->action(self::ACTION_DELETE_A_B);
+                  }
+              }
+              break;
+
+            default:
+              $this->action(self::ACTION_KEEP_A);
+              break;
+          }
+      }
+    }
+
+    return $this->output;
+  }
+
+  /**
+   * Get the next character, skipping over comments. peek() is used to see
+   *  if a '/' is followed by a '/' or '*'.
+   *
+   * @uses get()
+   * @uses peek()
+   * @throws JSMinException On unterminated comment.
+   * @return string
+   */
+  protected function next() {
+    $c = $this->get();
+
+    if ($c === '/') {
+      switch($this->peek()) {
+        case '/':
+          for (;;) {
+            $c = $this->get();
+
+            if (ord($c) <= self::ORD_LF) {
+              return $c;
+            }
+          }
+
+        case '*':
+          $this->get();
+
+          for (;;) {
+            switch($this->get()) {
+              case '*':
+                if ($this->peek() === '/') {
+                  $this->get();
+                  return ' ';
+                }
+                break;
+
+              case null:
+                throw new JSMinException('Unterminated comment.');
+            }
+          }
+
+        default:
+          return $c;
+      }
+    }
+
+    return $c;
+  }
+
+  /**
+   * Get next char. If is ctrl character, translate to a space or newline.
+   *
+   * @uses get()
+   * @return string|null
+   */
+  protected function peek() {
+    $this->lookAhead = $this->get();
+    return $this->lookAhead;
+  }
+}
+
+// -- Exceptions ---------------------------------------------------------------
+class JSMinException extends Exception {}
+?>
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
new file mode 100644
index 0000000000..7fe0875ff5
--- /dev/null
+++ b/application/libraries/Requirements.php
@@ -0,0 +1,1011 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Requirements tracker, for javascript and css.
+ * 
+ * Based on Requirements class from sapphire framework
+ * https://github.com/silverstripe/sapphire/blob/master/view/Requirements.php
+ * 
+ * LICENSE: This source file is subject to BSD license
+ *
+ * Copyright (c) 2007-2011, SilverStripe Limited - www.silverstripe.com
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ * 
+ * @author	   Ushahidi Team <team@ushahidi.com>
+ * @package	   Ushahidi - http://source.ushahididev.com
+ * @copyright  Ushahidi - http://www.ushahidi.com
+ * @license	   https://github.com/silverstripe/sapphire Modified BSD License
+ */
+class Requirements {
+	
+	/**
+	 * Enable combining of css/javascript files.
+	 * @param boolean $enable
+	 */
+	public static function set_combined_files_enabled($enable) {
+		self::backend()->set_combined_files_enabled($enable);
+	}
+
+	/**
+	 * Checks whether combining of css/javascript files is enabled.
+	 * @return boolean
+	 */
+	public static function get_combined_files_enabled() {
+	  return self::backend()->get_combined_files_enabled();
+	}
+
+	/**
+	 * Set the relative folder e.g. "assets" for where to store combined files
+	 * @param string $folder Path to folder
+	 */
+	public static function set_combined_files_folder($folder) {
+		self::backend()->setCombinedFilesFolder($folder);
+	}
+
+	/**
+	 * Set whether we want to suffix requirements with the time / 
+	 * location on to the requirements
+	 * 
+	 * @param bool
+	 */
+	public static function set_suffix_requirements($var) {
+		self::backend()->set_suffix_requirements($var);
+	}
+	
+	/**
+	 * Return whether we want to suffix requirements
+	 * 
+	 * @return bool
+	 */
+	public static function get_suffix_requirements() {
+		return self::backend()->get_suffix_requirements();
+	}
+	
+	/**
+	 * Instance of requirements for storage
+	 *
+	 * @var Requirements
+	 */
+	private static $backend = null;
+	
+	public static function backend() {
+		if(!self::$backend) {
+			self::$backend = new Requirements_Backend();
+		}
+		return self::$backend;
+	}
+	
+	/**
+	 * Setter method for changing the Requirements backend
+	 *
+	 * @param Requirements $backend
+	 */
+	public static function set_backend(Requirements_Backend $backend) {
+		self::$backend = $backend;
+	}
+	
+	/**
+	 * Register the given javascript file as required.
+	 * 
+	 * See {@link Requirements_Backend::javascript()} for more info
+	 * 
+	 */
+	static function js($file) {		
+		self::backend()->js($file);
+	}
+	
+	/**
+	 * Add the javascript code to the header of the page
+	 * 
+	 * See {@link Requirements_Backend::customJS()} for more info
+	 * @param script The script content
+	 * @param uniquenessID Use this to ensure that pieces of code only get added once.
+	 */
+	static function customJS($script, $uniquenessID = null) {
+		self::backend()->customJS($script, $uniquenessID);
+	}
+
+	/**
+	 * Include custom CSS styling to the header of the page.
+	 * 
+	 * See {@link Requirements_Backend::customCSS()}
+	 * 
+	 * @param string $script CSS selectors as a string (without <style> tag enclosing selectors).
+	 * @param int $uniquenessID Group CSS by a unique ID as to avoid duplicate custom CSS in header
+	 */
+	static function customCSS($script, $uniquenessID = null) {
+		self::backend()->customCSS($script, $uniquenessID);
+	}
+	
+	/**
+	 * Add the following custom code to the <head> section of the page.
+	 * See {@link Requirements_Backend::customHeadTags()}
+	 * 
+	 * @param string $html
+	 * @param string $uniquenessID
+	 */
+	static function customHeadTags($html, $uniquenessID = null) {
+		self::backend()->customHeadTags($html, $uniquenessID);
+	}
+	
+	/**
+	 * Register the given stylesheet file as required.
+	 * See {@link Requirements_Backend::css()}
+	 * 
+	 * @param $file String Filenames should be relative to the base, eg, 'framework/javascript/tree/tree.css'
+	 * @param $media String Comma-separated list of media-types (e.g. "screen,projector") 
+	 * @see http://www.w3.org/TR/REC-CSS2/media.html
+	 */
+	static function css($file, $media = null) {
+		self::backend()->css($file, $media);
+	}
+	
+	/**
+	 * Registers the given themeable stylesheet as required.
+	 *
+	 * A CSS file in the current theme path name "themename/css/$name.css" is
+	 * first searched for, and it that doesn't exist and the module parameter is
+	 * set then a CSS file with that name in the module is used.
+	 *
+	 * NOTE: This API is experimental and may change in the future.
+	 *
+	 * @param string $name The name of the file - e.g. "/css/File.css" would have
+	 *        the name "File".
+	 * @param string $module The module to fall back to if the css file does not
+	 *        exist in the current theme.
+	 * @param string $media The CSS media attribute.
+	 */
+	public static function themedCSS($name, $module = null, $media = null) {
+		return self::backend()->themedCSS($name, $module, $media);
+	}
+
+	/**
+	 * Clear either a single or all requirements.
+	 * Caution: Clearing single rules works only with customCSS and customJS if you specified a {@uniquenessID}. 
+	 * 
+	 * See {@link Requirements_Backend::clear()}
+	 * 
+	 * @param $file String
+	 */
+	static function clear($fileOrID = null) {
+		self::backend()->clear($fileOrID);
+	}
+
+	/**
+	 * Blocks inclusion of a specific file
+	 * See {@link Requirements_Backend::block()}
+	 *
+	 * @param unknown_type $fileOrID
+	 */
+	static function block($fileOrID) {
+		self::backend()->block($fileOrID);
+	}
+
+	/**
+	 * Removes an item from the blocking-list.
+	 * See {@link Requirements_Backend::unblock()}
+	 * 
+	 * @param string $fileOrID
+	 */
+	static function unblock($fileOrID) {
+		self::backend()->unblock($fileOrID);
+	}
+
+	/**
+	 * Removes all items from the blocking-list.
+	 * See {@link Requirements_Backend::unblock_all()}
+	 */
+	static function unblock_all() {
+		self::backend()->unblock_all();
+	}
+	
+	/**
+	 * Restore requirements cleared by call to Requirements::clear
+	 * See {@link Requirements_Backend::restore()}
+	 */
+	static function restore() {
+		self::backend()->restore();
+	}
+	
+	/**
+	 * Render the appropriate include tags for the registered requirements. 
+	 * See {@link Requirements_Backend::render()} for more information.
+	 * 
+	 * @param string $for where is the html going? accepts values 'head' or 'body'
+	 * @return string HTML include tags for inclusion in template
+	 */
+	static function render($renderFor) {
+		return self::backend()->render($renderFor);
+	}
+	
+	/**
+	 * Add i18n files from the given javascript directory.
+	 * 
+	 * @param String
+	 * @param Boolean
+	 * @param Boolean
+	 * 
+	 * See {@link Requirements_Backend::add_i18n_js()} for more information.
+	 */
+	/*public static function add_i18n_js($langDir, $return = false, $langOnly = false) {
+		return self::backend()->add_i18n_js($langDir, $return, $langOnly);
+	}*/
+	
+	/**
+	 * Concatenate several css or javascript files into a single dynamically generated file.
+	 * See {@link Requirements_Backend::combine_files()} for more info.
+	 *
+	 * @param string $combinedFileName
+	 * @param array $files
+	 */
+	static function combine_files($combinedFileName, $files) {
+		self::backend()->combine_files($combinedFileName, $files);
+	}
+	
+	/**
+	 * Returns all combined files.
+	 * See {@link Requirements_Backend::get_combine_files()}
+	 * 
+	 * @return array
+	 */
+	static function get_combine_files() {
+		return self::backend()->get_combine_files();
+	}
+	
+	/**
+	 * Deletes all dynamically generated combined files from the filesystem. 
+	 * See {@link Requirements_Backend::delete_combine_files()}
+	 * 
+	 * @param string $combinedFileName If left blank, all combined files are deleted.
+	 */
+	static function delete_combined_files($combinedFileName = null) {
+		return self::backend()->delete_combined_files($combinedFileName);
+	}
+	
+
+	/**
+	 * Re-sets the combined files definition. See {@link Requirements_Backend::clear_combined_files()}
+	 */
+	static function clear_combined_files() {
+		self::backend()->clear_combined_files();
+	}
+		
+	/**
+	 * See {@link combine_files()}.
+ 	 */
+	static function process_combined_files() {
+		return self::backend()->process_combined_files();
+	}
+
+	/**
+	 * Returns all custom scripts
+	 * See {@link Requirements_Backend::get_custom_scripts()}
+	 *
+	 * @return array
+	 */
+	static function get_custom_scripts() {
+		return self::backend()->get_custom_scripts();
+	}
+	
+	/**
+	 * Set whether you want to write the JS to the body of the page or 
+	 * in the head section 
+	 * 
+	 * @see Requirements_Backend::set_write_js_to_body()
+	 * @param boolean
+	 */
+	static function set_write_js_to_body($var) {
+		self::backend()->set_write_js_to_body($var);
+	}
+	
+	static function debug() {
+		return self::backend()->debug();
+	}
+
+}
+
+/**
+ * @package framework
+ * @subpackage view
+ */
+class Requirements_Backend {
+
+	/**
+	 * Do we want requirements to suffix onto the requirement link
+	 * tags for caching or is it disabled. Getter / Setter available
+	 * through {@link Requirements::set_suffix_requirements()}
+	 *
+	 * @var bool
+	 */
+	protected $suffix_requirements = true;
+
+	/**
+	 * Enable combining of css/javascript files.
+	 *
+	 * @var boolean
+	 */
+	protected $combined_files_enabled = true;
+
+	/**
+	 * Paths to all required .js files relative to the webroot.
+	 *
+	 * @var array $js
+	 */
+	protected $js = array();
+
+	/**
+	 * Paths to all required .css files relative to the webroot.
+	 *
+	 * @var array $css
+	 */
+	protected $css = array();
+
+	/**
+	 * All custom javascript code that is inserted
+	 * directly at the bottom of the HTML <head> tag.
+	 *
+	 * @var array $customJS
+	 */
+	protected $customJS = array();
+
+	/**
+	 * All custom CSS rules which are inserted
+	 * directly at the bottom of the HTML <head> tag.
+	 *
+	 * @var array $customCSS
+	 */
+	protected $customCSS = array();
+
+	/**
+	 * All custom HTML markup which is added before
+	 * the closing <head> tag, e.g. additional metatags.
+	 * This is preferred to entering tags directly into
+	 */
+	protected $customHeadTags = array();
+
+	/**
+	 * Remembers the filepaths of all cleared Requirements
+	 * through {@link clear()}.
+	 *
+	 * @var array $disabled
+	 */
+	protected $disabled = array();
+
+	/**
+	 * The filepaths (relative to webroot) or
+	 * uniquenessIDs of any included requirements
+	 * which should be blocked when executing {@link inlcudeInHTML()}.
+	 * This is useful to e.g. prevent core classes to modifying
+	 * Requirements without subclassing the entire functionality.
+	 * Use {@link unblock()} or {@link unblock_all()} to revert changes.
+	 *
+	 * @var array $blocked
+	 */
+	protected $blocked = array();
+
+	/**
+	 * See {@link combine_files()}.
+	 *
+	 * @var array $combine_files
+	 */
+	public $combine_files = array();
+
+	/**
+	 * Using the JSMin library to minify any
+	 * javascript file passed to {@link combine_files()}.
+	 *
+	 * @var boolean
+	 */
+	public $combine_js_with_jsmin = true;
+
+	/**
+	 * @var string By default, combined files are stored in assets/_combinedfiles.
+	 * Set this by calling Requirements::set_combined_files_folder()
+	 */
+	protected $combinedFilesFolder = null;
+
+	/**
+	 * Put all javascript includes at the bottom of the template
+	 * before the closing <body> tag instead of the <head> tag.
+	 * This means script downloads won't block other HTTP-requests,
+	 * which can be a performance improvement.
+	 * Caution: Doesn't work when modifying the DOM from those external
+	 * scripts without listening to window.onload/document.ready
+	 * (e.g. toplevel document.write() calls).
+	 *
+	 * @see http://developer.yahoo.com/performance/rules.html#js_bottom
+	 *
+	 * @var boolean
+	 */
+	public $write_js_to_body = true;
+
+	function set_combined_files_enabled($enable) {
+		$this->combined_files_enabled = (bool) $enable;
+	}
+	
+	function get_combined_files_enabled() {
+		return $this->combined_files_enabled;
+	}
+
+	/**
+	 * @param String $folder
+	 */
+	function setCombinedFilesFolder($folder) {
+		$this->combinedFilesFolder = $folder;
+	}
+	
+	/**
+	 * @return String Folder relative to the webroot
+	 */
+	function getCombinedFilesFolder() {
+		return ($this->combinedFilesFolder) ? $this->combinedFilesFolder : Kohana::config('upload.directory', FALSE);
+	}
+	
+	/**
+	 * Set whether we want to suffix requirements with the time / 
+	 * location on to the requirements
+	 * 
+	 * @param bool
+	 */
+	function set_suffix_requirements($var) {
+		$this->suffix_requirements = $var;
+	}
+	
+	/**
+	 * Return whether we want to suffix requirements
+	 * 
+	 * @return bool
+	 */
+	function get_suffix_requirements() {
+		return $this->suffix_requirements;
+	}
+	
+	/**
+	 * Set whether you want the files written to the head or the body. It
+	 * writes to the body by default which can break some scripts
+	 *
+	 * @param boolean
+	 */
+	public function set_write_js_to_body($var) {
+		$this->write_js_to_body = $var;
+	}
+	/**
+	 * Register the given javascript file as required.
+	 * Filenames should be relative to the base, eg, 'framework/javascript/loader.js'
+	 */
+	
+	public function js($file) {
+		$this->js[$file] = true;
+	}
+	
+	/**
+	 * Returns an array of all included javascript
+	 *
+	 * @return array
+	 */
+	public function get_js() {
+		return array_keys(array_diff_key($this->js,$this->blocked));
+	}
+	
+	/**
+	 * Add the javascript code to the header of the page
+	 * @todo Make Requirements automatically put this into a separate file :-)
+	 * @param script The script content
+	 * @param uniquenessID Use this to ensure that pieces of code only get added once.
+	 */
+	public function customJS($script, $uniquenessID = null) {
+		if($uniquenessID) $this->customJS[$uniquenessID] = $script;
+		else $this->customJS[] = $script;
+		
+		$script .= "\n";
+	}
+	
+	/**
+	 * Include custom CSS styling to the header of the page.
+	 *
+	 * @param string $script CSS selectors as a string (without <style> tag enclosing selectors).
+	 * @param int $uniquenessID Group CSS by a unique ID as to avoid duplicate custom CSS in header
+	 */
+	function customCSS($script, $uniquenessID = null) {
+		if($uniquenessID) $this->customCSS[$uniquenessID] = $script;
+		else $this->customCSS[] = $script;
+	}
+	
+	/**
+	 * Add the following custom code to the <head> section of the page.
+	 *
+	 * @param string $html
+	 * @param string $uniquenessID
+	 */
+	function customHeadTags($html, $uniquenessID = null) {
+		if($uniquenessID) $this->customHeadTags[$uniquenessID] = $html;
+		else $this->customHeadTags[] = $html;
+	}
+
+	
+	/**
+	 * Register the given stylesheet file as required.
+	 * 
+	 * @param $file String Filenames should be relative to the base, eg, 'framework/javascript/tree/tree.css'
+	 * @param $media String Comma-separated list of media-types (e.g. "screen,projector") 
+	 * @see http://www.w3.org/TR/REC-CSS2/media.html
+	 */
+	function css($file, $media = null) {
+		$this->css[$file] = array(
+			"media" => $media
+		);
+	}
+	
+	function get_css() {
+		return array_diff_key($this->css, $this->blocked);
+	}
+	
+	/**
+	 * Needed to actively prevent the inclusion of a file,
+	 * e.g. when using your own prototype.js.
+	 * Blocking should only be used as an exception, because
+	 * it is hard to trace back. You can just block items with an
+	 * ID, so make sure you add an unique identifier to customCSS() and customJS().
+	 * 
+	 * @param string $fileOrID
+	 */
+	function block($fileOrID) {
+		$this->blocked[$fileOrID] = $fileOrID;
+	}
+	
+	/**
+	 * Clear either a single or all requirements.
+	 * Caution: Clearing single rules works only with customCSS and customJS if you specified a {@uniquenessID}. 
+	 * 
+	 * @param $file String
+	 */
+	function clear($fileOrID = null) {
+		if($fileOrID) {
+			foreach(array('js','css', 'customJS', 'customCSS', 'customHeadTags') as $type) {
+				if(isset($this->{$type}[$fileOrID])) {
+					$this->disabled[$type][$fileOrID] = $this->{$type}[$fileOrID];
+					unset($this->{$type}[$fileOrID]);
+				}
+			}
+		} else {
+			$this->disabled['js'] = $this->js;
+			$this->disabled['css'] = $this->css;
+			$this->disabled['customJS'] = $this->customJS;
+			$this->disabled['customCSS'] = $this->customCSS;
+			$this->disabled['customHeadTags'] = $this->customHeadTags;
+		
+			$this->js = array();
+			$this->css = array();
+			$this->customJS = array();
+			$this->customCSS = array();
+			$this->customHeadTags = array();
+		}
+	}
+	
+	/**
+	 * Removes an item from the blocking-list.
+	 * CAUTION: Does not "re-add" any previously blocked elements.
+	 * @param string $fileOrID
+	 */
+	function unblock($fileOrID) {
+		if(isset($this->blocked[$fileOrID])) unset($this->blocked[$fileOrID]);
+	}
+	/**
+	 * Removes all items from the blocking-list.
+	 */
+	function unblock_all() {
+		$this->blocked = array();
+	}
+	
+	/**
+	 * Restore requirements cleared by call to Requirements::clear
+	 */
+	function restore() {
+		$this->js = $this->disabled['js'];
+		$this->css = $this->disabled['css'];
+		$this->customJS = $this->disabled['customJS'];
+		$this->customCSS = $this->disabled['customCSS'];
+		$this->customHeadTags = $this->disabled['customHeadTags'];
+	}
+	
+	/**
+	 * Generate the appropriate include tags for the registered requirements. 
+	 * 
+	 * @param string $for where is the html going? accepts values 'head' or 'body'
+	 * @return string HTML include tags for inclusion in template
+	 */
+	function render($renderFor = 'head') {
+		$content = '';
+
+		if($this->css || $this->js || $this->customCSS || $this->customJS || $this->customHeadTags) {
+			$requirements = '';
+			$jsRequirements = '';
+			
+			// Combine files - updates $this->js and $this->css 
+			$this->process_combined_files(); 
+	
+			foreach(array_diff_key($this->js,$this->blocked) as $file => $dummy) {
+				$path = $this->path_for_file($file, 'js');
+				if($path) {
+					//$jsRequirements .= html::script($path, TRUE);
+					$jsRequirements .= "<script type=\"text/javascript\" src=\"$path\"></script>\n";
+				}
+			}
+			
+			// add all inline javascript *after* including external files which
+			// they might rely on
+			if($this->customJS) {
+				foreach(array_diff_key($this->customJS,$this->blocked) as $script) { 
+					$jsRequirements .= "<script type=\"text/javascript\">\n//<![CDATA[\n";
+					$jsRequirements .= "$script\n";
+					$jsRequirements .= "\n//]]>\n</script>\n";
+				}
+			}
+			
+			foreach(array_diff_key($this->css,$this->blocked) as $file => $params) {
+				$path = $this->path_for_file($file, 'css');
+				if($path) {
+					//$media = (isset($params['media']) && !empty($params['media'])) ? $params['media'] : "";
+					//$requirements .= html::stylesheet($path, $media, TRUE);
+					$media = (isset($params['media']) && !empty($params['media'])) ? " media=\"{$params['media']}\"" : "";
+					$requirements .= "<link rel=\"stylesheet\" type=\"text/css\"{$media} href=\"$path\" />\n";
+					
+				}
+			}
+			
+			foreach(array_diff_key($this->customCSS, $this->blocked) as $css) { 
+				$requirements .= "<style type=\"text/css\">\n$css\n</style>\n";
+			}
+			
+			foreach(array_diff_key($this->customHeadTags,$this->blocked) as $customHeadTag) { 
+				$requirements .= "$customHeadTag\n"; 
+			}
+			
+			if ($renderFor == 'head')
+			{
+				$content .= $requirements;
+				if(! $this->write_js_to_body) {
+					$content .= $jsRequirements;
+				}
+			} elseif ($renderFor == 'body' && $this->write_js_to_body) {
+				$content .= $jsRequirements;
+			}
+		} 
+		
+		return $content;
+	}
+	
+	/**
+	 * Finds the path for specified file.
+	 *
+	 * @param string $fileOrUrl
+	 * @param string $type file type ie. css or js
+	 * @return string|boolean 
+	 */
+	protected function path_for_file($fileOrUrl, $type) {
+		if(preg_match('/^http[s]?/', $fileOrUrl)) {
+			return $fileOrUrl;
+		} else {
+			// Add extension if not present
+			$suffix = ".$type";
+			$length = strlen($suffix);
+			if ( $length > 0 AND substr_compare($fileOrUrl, $suffix, -$length, $length, FALSE) !== 0)
+			{
+				// Add the defined suffix
+				$fileOrUrl .= $suffix;
+			}
+			
+			if (file_exists(DOCROOT . $fileOrUrl)) {
+				// Get url prefix, either site base url or CDN url
+				$prefix = url::file_loc($type);
+				
+				$mtimesuffix = "";
+				$suffix = '';
+				if(strpos($fileOrUrl, '?') !== false) {
+					$suffix = '&' . substr($fileOrUrl, strpos($fileOrUrl, '?')+1);
+					$fileOrUrl = substr($fileOrUrl, 0, strpos($fileOrUrl, '?'));
+				}
+				if($this->suffix_requirements) {
+					$mtimesuffix = "?m=" . filemtime(DOCROOT . $fileOrUrl);
+				}
+				return "{$prefix}{$fileOrUrl}{$mtimesuffix}{$suffix}";
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Concatenate several css or javascript files into a single dynamically generated
+	 * file. This increases performance by fewer HTTP requests.
+	 * 
+	 * The combined file is regenerated
+	 * based on every file modification time. Optionally a rebuild can be triggered
+	 * by appending ?flush=1 to the URL.
+	 * If all files to be combined are javascript, we use the external JSMin library
+	 * to minify the javascript. This can be controlled by {@link $combine_js_with_jsmin}.
+	 * 
+	 * CAUTION: You're responsible for ensuring that the load order for combined files
+	 * is retained - otherwise combining javascript files can lead to functional errors
+	 * in the javascript logic, and combining css can lead to wrong styling inheritance.
+	 * Depending on the javascript logic, you also have to ensure that files are not included
+	 * in more than one combine_files() call.
+	 * Best practice is to include every javascript file in exactly *one* combine_files()
+	 * directive to avoid the issues mentioned above - this is enforced by this function.
+	 * 
+	 * CAUTION: Combining CSS Files discards any "media" information.
+	 *
+	 * Example for combined JavaScript:
+	 * <code>
+	 * Requirements::combine_files(
+	 *  'foobar.js',
+	 *  array(
+	 * 		'mysite/javascript/foo.js',
+	 * 		'mysite/javascript/bar.js',
+	 * 	)
+	 * );
+	 * </code>
+	 *
+	 * Example for combined CSS:
+	 * <code>
+	 * Requirements::combine_files(
+	 *  'foobar.css',
+	 * 	array(
+	 * 		'mysite/javascript/foo.css',
+	 * 		'mysite/javascript/bar.css',
+	 * 	)
+	 * );
+	 * </code>
+	 *
+	 * @see http://code.google.com/p/jsmin-php/
+	 * 
+	 * @todo Should we enforce unique inclusion of files, or leave it to the developer? Can auto-detection cause breaks?
+	 * 
+	 * @param string $combinedFileName Filename of the combined file
+	 * @param array $files Array of filenames relative to the webroot
+	 */
+	function combine_files($combinedFileName, $files) {
+		// duplicate check
+		foreach($this->combine_files as $_combinedFileName => $_files) {
+			$duplicates = array_intersect($_files, $files);
+			if($duplicates && $combinedFileName != $_combinedFileName) {
+				user_error("Requirements_Backend::combine_files(): Already included files " . implode(',', $duplicates) . " in combined file '{$_combinedFileName}'", E_USER_NOTICE);
+				return false;
+			}
+		}
+		foreach($files as $index=>$file) {
+			if(is_array($file)) {
+				// Either associative array path=>path type=>type or numeric 0=>path 1=>type
+				// Otherwise, assume path is the first item
+				if (isset($file['type']) && ($file['type'] == 'css' || $file['type'] == 'javascript' || $file['type'] == 'js')) {
+					switch ($file['type']) {
+						case 'css':
+							$this->css($file['path']);
+							break;
+						default:
+							$this->js($file['path']);
+							break;
+					}
+					$files[$index] = $file['path'];
+				} elseif (isset($file[1]) && ($file[1] == 'css' || $file[1] == 'javascript' || $file[1] == 'js')) {
+					switch ($file[1]) {
+						case 'css':
+							$this->css($file[0]);
+							break;
+						default:
+							$this->js($file[0]);
+							break;
+					}
+					$files[$index] = $file[0];
+				} else {
+					$file = array_shift($file);
+				}
+			}
+			if (!is_array($file)) {
+				if(substr($file, -2) == 'js') {
+					$this->js($file);
+				} elseif(substr($file, -3) == 'css') {
+					$this->css($file);
+				} else {
+					user_error("Requirements_Backend::combine_files(): Couldn't guess file type for file '$file', please specify by passing using an array instead.", E_USER_NOTICE);
+				}
+			}
+		}
+		$this->combine_files[$combinedFileName] = $files;
+	}
+	
+		/**
+	 * Returns all combined files.
+	 * @return array
+	 */
+	function get_combine_files() {
+		return $this->combine_files;
+	}
+	
+	/**
+	 * Deletes all dynamically generated combined files from the filesystem. 
+	 * 
+	 * @param string $combinedFileName If left blank, all combined files are deleted.
+	 */
+	function delete_combined_files($combinedFileName = null) {
+		$combinedFiles = ($combinedFileName) ? array($combinedFileName => null) : $this->combine_files;
+		$combinedFolder = ($this->getCombinedFilesFolder()) ? (DOCROOT . $this->combinedFilesFolder) : DOCROOT . Kohana::config('upload.directory', FALSE);
+		foreach($combinedFiles as $combinedFile => $sourceItems) {
+			$filePath = $combinedFolder . '/' . $combinedFile;
+			if(file_exists($filePath)) {
+				unlink($filePath);
+			}
+		}
+	}
+	
+	function clear_combined_files() {
+		$this->combine_files = array();
+	}
+
+	/**
+	 * See {@link combine_files()}
+	 *
+	 */
+	function process_combined_files() {
+		if( !$this->combined_files_enabled) {
+			return;
+		}
+		
+		// Make a map of files that could be potentially combined
+		$combinerCheck = array();
+		foreach($this->combine_files as $combinedFile => $sourceItems) {
+			foreach($sourceItems as $sourceItem) {
+				if(isset($combinerCheck[$sourceItem]) && $combinerCheck[$sourceItem] != $combinedFile){ 
+					user_error("Requirements_Backend::process_combined_files - file '$sourceItem' appears in two combined files:" .	" '{$combinerCheck[$sourceItem]}' and '$combinedFile'", E_USER_WARNING);
+				}
+				$combinerCheck[$sourceItem] = $combinedFile;
+				
+			}
+		}
+
+		// Work out the relative URL for the combined files from the base folder
+		$combinedFilesFolder = ($this->getCombinedFilesFolder()) ? ($this->getCombinedFilesFolder() . '/') : '';
+
+		// Figure out which ones apply to this pageview
+		$combinedFiles = array();
+		$newJSRequirements = array();
+		$newCSSRequirements = array();
+		foreach($this->js as $file => $dummy) {
+			if(isset($combinerCheck[$file])) {
+				$newJSRequirements[$combinedFilesFolder . $combinerCheck[$file]] = true;
+				$combinedFiles[$combinerCheck[$file]] = true;
+			} else {
+				$newJSRequirements[$file] = true;
+			}
+		}
+		
+		foreach($this->css as $file => $params) {
+			if(isset($combinerCheck[$file])) {
+				$newCSSRequirements[$combinedFilesFolder . $combinerCheck[$file]] = true;
+				$combinedFiles[$combinerCheck[$file]] = true;
+			} else {
+				$newCSSRequirements[$file] = $params;
+			}
+		}
+
+		// Process the combined files
+		$base = DOCROOT;
+		foreach(array_diff_key($combinedFiles, $this->blocked) as $combinedFile => $dummy) {
+			$fileList = $this->combine_files[$combinedFile];
+			$combinedFilePath = $base . $combinedFilesFolder . '/' . $combinedFile;
+
+
+			// Make the folder if necessary
+			if(!file_exists(dirname($combinedFilePath))) {
+				mkdir(dirname($combinedFilePath));
+			}
+			
+			// If the file isn't writebale, don't even bother trying to make the combined file
+			// Complex test because is_writable fails if the file doesn't exist yet.
+			if((file_exists($combinedFilePath) && !is_writable($combinedFilePath)) ||
+				(!file_exists($combinedFilePath) && !is_writable(dirname($combinedFilePath)))) {
+				user_error("Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'", E_USER_WARNING);
+				continue;
+			}
+
+			 // Determine if we need to build the combined include
+			if(file_exists($combinedFilePath) && !isset($_GET['flush'])) {
+				// file exists, check modification date of every contained file
+				$srcLastMod = 0;
+				foreach($fileList as $file) {
+					$srcLastMod = max(filemtime($base . $file), $srcLastMod);
+				}
+				$refresh = $srcLastMod > filemtime($combinedFilePath);
+			} else {
+				// file doesn't exist, or refresh was explicitly required
+				$refresh = true;
+			}
+
+			if(!$refresh) continue;
+
+			$combinedData = "";
+			foreach(array_diff($fileList, $this->blocked) as $file) {
+				$fileContent = file_get_contents($base . $file);
+				// if we have a javascript file and jsmin is enabled, minify the content
+				$isJS = stripos($file, '.js');
+				if($isJS && $this->combine_js_with_jsmin) {
+					increase_time_limit_to();
+					$fileContent = JSMin::minify($fileContent);
+				}
+				// write a header comment for each file for easier identification and debugging
+				// also the semicolon between each file is required for jQuery to be combinable properly
+				$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n".($isJS ? ';' : '')."\n";
+			}
+
+			$successfulWrite = false;
+			$fh = fopen($combinedFilePath, 'wb');
+			if($fh) {
+				if(fwrite($fh, $combinedData) == strlen($combinedData)) $successfulWrite = true;
+				fclose($fh);
+				unset($fh);
+			}
+
+			// Unsuccessful write - just include the regular JS files, rather than the combined one
+			if(!$successfulWrite) {
+				user_error("Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'", E_USER_WARNING);
+				continue;
+			}
+		}
+
+		// @todo Alters the original information, which means you can't call this
+		// method repeatedly - it will behave different on the second call!
+		$this->js = $newJSRequirements;
+		$this->css = $newCSSRequirements;
+  }
+  
+  function get_custom_scripts() {
+		$requirements = "";
+		
+		if($this->customJS) {
+			foreach($this->customJS as $script) {
+				$requirements .= "$script\n";
+			}
+		}
+		
+		return $requirements;
+	}
+
+	/**
+	 * @see Requirements::themedCSS()
+	 */
+	public function themedCSS($name, $module = null, $media = null) {
+		$theme = Kohana::config("settings.site_style");
+		$path  = THEMEPATH . Kohana::config("settings.site_style") . "/css/$name.css";
+
+		if (file_exists($path)) {
+			$this->css($path, $media);
+			return;
+		}
+
+		if ($module) {
+			$this->css("$module/css/$name.css", $media);
+		}
+	}
+	
+	function debug() {
+		Debug::show($this->js);
+		Debug::show($this->css);
+		Debug::show($this->customCSS);
+		Debug::show($this->customJS);
+		Debug::show($this->customHeadTags);
+		Debug::show($this->combine_files);
+	}
+	
+}
diff --git a/themes/default/views/footer.php b/themes/default/views/footer.php
index 8ea8673a32..5034637568 100644
--- a/themes/default/views/footer.php
+++ b/themes/default/views/footer.php
@@ -76,6 +76,7 @@
 	<!-- / footer -->
 
 	<?php
+	echo Requirements::render('body');
 	echo $footer_block;
 	// Action::main_footer - Add items before the </body> tag
 	Event::run('ushahidi_action.main_footer');
diff --git a/themes/default/views/header.php b/themes/default/views/header.php
index 979b773ab3..a31ca562f5 100644
--- a/themes/default/views/header.php
+++ b/themes/default/views/header.php
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 	<title><?php echo html::specialchars($page_title.$site_name); ?></title>
+	<?php echo Requirements::render('head'); ?>
 	<?php if (!Kohana::config('settings.enable_timeline')) { ?>
 		<style type="text/css">
 			#graph{display:none;}

From 6cea6a481f9f9ac57353123a30c07d9eedf04ef1 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 26 Oct 2012 17:55:17 +1300
Subject: [PATCH 04/30] Convert existing frontend code to use Requirements
 library #338

* Convert Themes library to use requirements
* Convert register_themes.php to use requirements
* Convert plugin helper to use requirements
* Move theme js to use Requirements library
* Stop passing script tag in api_url config settings.
  Set url in settings and handle the actual tag through Requirements
* Fix path for file to stop it suffix'ing remote urls
* Render Requirements through Themes library for frontend #338
  This makes it easier to update old themes as they can still use header_block()
* Make admin/members layout call Requirement::render() since they
  don't have header_block()
---
 application/helpers/plugin.php        |  80 +++++------------
 application/hooks/2_settings.php      |   7 +-
 application/hooks/register_themes.php |  18 ++--
 application/libraries/Themes.php      | 123 ++++++++++----------------
 application/views/admin/layout.php    |   5 +-
 application/views/members/layout.php  |   5 +-
 themes/default/views/footer.php       |   1 -
 themes/default/views/header.php       |   1 -
 8 files changed, 77 insertions(+), 163 deletions(-)

diff --git a/application/helpers/plugin.php b/application/helpers/plugin.php
index fe71cda7e0..897046f63d 100644
--- a/application/helpers/plugin.php
+++ b/application/helpers/plugin.php
@@ -10,16 +10,6 @@
  */
 class plugin_Core {
 	
-	/**
-	 * @var array
-	 */
-	protected static $javascripts = array();
-	
-	/**
-	 * @var array
-	 */
-	protected static $stylesheets = array();
-	
 	/**
 	 * @var array
 	 */
@@ -32,12 +22,16 @@ class plugin_Core {
 	 */
 	public static function add_javascript($javascripts = array())
 	{
-		if ( ! is_array($javascripts))
-			$javascripts = array($javascripts);
-
-		foreach ($javascripts as $key => $javascript)
+		if (is_array($javascripts))
+		{
+			foreach($javascripts as $javascript)
+			{
+				Requirements::js('plugins/'.$javascript);
+			}
+		}
+		else
 		{
-			self::$javascripts[] = $javascript;
+			Requirements::js('plugins/'.$javascripts);
 		}
 	}
 	
@@ -49,10 +43,9 @@ public static function add_javascript($javascripts = array())
 	 */
 	public static function remove_javascript($javascripts = array())
 	{
-		foreach (self::$javascripts as $key => $javascript)
+		foreach ($javascripts as $javascript)
 		{
-			if (in_array($javascript, $javascripts))
-				unset(self::$javascripts[$key]);
+			Requirements::block('plugins/'.$javascripts);
 		}
 	}
 	
@@ -64,12 +57,16 @@ public static function remove_javascript($javascripts = array())
 	 */
 	public static function add_stylesheet($stylesheets = array())
 	{
-		if ( ! is_array($stylesheets))
-			$stylesheets = array($stylesheets);
-
-		foreach ($stylesheets as $key => $stylesheet)
+		if (is_array($stylesheets))
 		{
-			self::$stylesheets[] = $stylesheet;
+			foreach($stylesheets as $stylesheet)
+			{
+				Requirements::css('plugins/'.$stylesheet);
+			}
+		}
+		else
+		{
+			Requirements::css('plugins/'.$stylesheets);
 		}
 	}
 	
@@ -89,43 +86,6 @@ public static function add_sms_provider($sms_providers = array())
 		}
 	}
 	
-	/**
-	 * Adds a the stylesheet/javascript to the header of the view file
-	 *
-	 * @param string $type
-	 */
-	public static function render($type)
-	{
-		$files = $type.'s';
-		
-		$html = '';
-
-		foreach (self::$$files as $key => $file)
-		{
-			switch ($type)
-			{
-				case 'stylesheet':
-					if (substr_compare($file, '.css', -3, 3, FALSE) !== 0)
-					{
-						// Add the javascript suffix
-						$file .= '.css';
-					}
-					$html .= '<link rel="stylesheet" type="text/css" href="'.url::base()."plugins/".$file.'" />';
-					break;
-				case 'javascript':
-					if (substr_compare($file, '.js', -3, 3, FALSE) !== 0)
-					{
-						// Add the javascript suffix
-						$file .= '.js';
-					}
-					$html .= '<script type="text/javascript" src="'.url::base()."plugins/".$file.'"></script>';
-					break;
-			}
-		}
-		
-		return $html;
-	}
-	
 	/**
 	 * Rettuns the list of SMS providers
 	 *
diff --git a/application/hooks/2_settings.php b/application/hooks/2_settings.php
index 6516640890..336495e2b1 100644
--- a/application/hooks/2_settings.php
+++ b/application/hooks/2_settings.php
@@ -42,10 +42,9 @@
 
 $default_map = isset($settings['default_map']) ? $settings['default_map'] : 'osm_mapnik';
 $map_layer = map::base($default_map);
-if (isset($map_layer->api_url) AND $map_layer->api_url != '')
+if (! empty($map_layer->api_url))
 {
-	Kohana::config_set('settings.api_url', 
-		"<script type=\"text/javascript\" src=\"".$map_layer->api_url."\"></script>");
+	Kohana::config_set('settings.api_url', $map_layer->api_url);
 }
 
 // And in case you want to display all maps on one page...
@@ -56,7 +55,7 @@
 	// Add to array, use url as key to avoid dupes
 	$api_url_all[$layer->api_url] = '<script type="text/javascript" src="'.$layer->api_url.'"></script>';
 }
-Kohana::config_set('settings.api_url_all', implode("\n",$api_url_all));
+Kohana::config_set('settings.api_url_all', $api_url_all);
 
 // Additional Mime Types (KMZ/KML)
 Kohana::config_set('mimes.kml', array('text/xml'));
diff --git a/application/hooks/register_themes.php b/application/hooks/register_themes.php
index f71eb79045..81cf53fb16 100755
--- a/application/hooks/register_themes.php
+++ b/application/hooks/register_themes.php
@@ -31,15 +31,10 @@ public function __construct()
 	 */
 	public function register()
 	{
-		// Array to hold all the CSS files
-		$theme_css = array();
-		// Array to hold all the Javascript files
-		$theme_js = array();
-
 		// 1. Load the default theme
-		Kohana::config_set('core.modules', array_merge(array(THEMEPATH."default"),
-			Kohana::config("core.modules")));
-		$theme_css[] = url::file_loc('css')."themes/default/css/style.css";
+		Kohana::config_set('core.modules', array_merge(array(THEMEPATH."default"), Kohana::config("core.modules")));
+
+		Requirements::css("themes/default/css/style");
 
 		// 2. Extend the default theme
 		$theme = THEMEPATH.Kohana::config("settings.site_style");
@@ -54,7 +49,7 @@ public function register()
 				while (($css_file = $css->read()) !== FALSE)
 					if (preg_match('/\.css/i', $css_file))
 					{
-						$theme_css[] = url::file_loc('css')."themes/".Kohana::config("settings.site_style")."/css/".$css_file;
+						Requirements::css("themes/".Kohana::config("settings.site_style")."/css/".$css_file);
 					}
 			}
 
@@ -64,7 +59,7 @@ public function register()
 				while (($js_file = $js->read()) !== FALSE)
 					if (preg_match('/\.js/i', $js_file))
 					{
-						$theme_js[] = url::base()."themes/".Kohana::config("settings.site_style")."/js/".$js_file;
+						Requirements::js("themes/".Kohana::config("settings.site_style")."/js/".$js_file);
 					}
 			}
 		}
@@ -80,9 +75,6 @@ public function register()
 					include $theme.'/hooks/'.$entry;
 				}
 		}
-
-		Kohana::config_set('settings.site_style_css',$theme_css);
-		Kohana::config_set('settings.site_style_js',$theme_js);
 	}
 }
 
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index d7bb36f3d7..a7f21b9994 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -38,10 +38,6 @@ public function __construct()
 
 		// Load Session
 		$this->session = Session::instance();
-
-		// Grab the proper URL for the css and js files
-		$this->css_url = url::file_loc('css');
-		$this->js_url = url::file_loc('js');
 	}
 
 	/**
@@ -50,11 +46,14 @@ public function __construct()
 	 */
 	public function header_block()
 	{
-		$content = Kohana::config("globalcode.head").
-			$this->_header_css().
-			$this->_header_feeds().
+		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
+		
+		// These just need to run now
+		$this->_header_css();
+		$this->_header_feeds();
 		$this->_header_js();
 
+		$content = Requirements::render('head');
 		// Filter::header_block - Modify Header Block
 		Event::run('ushahidi_filter.header_block', $content);
 
@@ -67,8 +66,9 @@ public function header_block()
 	*/
 	public function admin_header_block()
 	{
-		$content = Kohana::config("globalcode.head");
+		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
 
+		$content = '';
 		// Filter::admin_header_block - Modify Admin Header Block
 		Event::run('ushahidi_filter.admin_header_block', $content);
 
@@ -80,142 +80,110 @@ public function admin_header_block()
 	 */
 	private function _header_css()
 	{
-		$core_css = "";
-		$core_css .= html::stylesheet($this->css_url."media/css/jquery-ui-themeroller", "", TRUE);
-
-		foreach (Kohana::config("settings.site_style_css") as $theme_css)
-		{
-			$core_css .= html::stylesheet($theme_css,"",TRUE);
-		}
+		Requirements::css("media/css/jquery-ui-themeroller");
 
-		$core_css .= "<!--[if lte IE 7]>".html::stylesheet($this->css_url."media/css/iehacks","",TRUE)."<![endif]-->";
-		$core_css .= "<!--[if IE 7]>".html::stylesheet($this->css_url."media/css/ie7hacks","",TRUE)."<![endif]-->";
-		$core_css .= "<!--[if IE 6]>".html::stylesheet($this->css_url."media/css/ie6hacks","",TRUE)."<![endif]-->";
+		Requirements::customHeadTags("<!--[if lte IE 7]>".html::stylesheet($this->css_url."media/css/iehacks","",TRUE)."<![endif]-->",'iehacks');
+		Requirements::customHeadTags("<!--[if IE 7]>".html::stylesheet($this->css_url."media/css/ie7hacks","",TRUE)."<![endif]-->",'ie7hacks');
+		Requirements::customHeadTags("<!--[if IE 6]>".html::stylesheet($this->css_url."media/css/ie6hacks","",TRUE)."<![endif]-->",'ie6hacks');
 
 		if ($this->map_enabled)
 		{
-			$core_css .= html::stylesheet($this->css_url."media/css/openlayers","",TRUE);
+			Requirements::css("media/css/openlayers");
 		}
 
 		if ($this->treeview_enabled)
 		{
-			$core_css .= html::stylesheet($this->css_url."media/css/jquery.treeview","",TRUE);
+			Requirements::css("media/css/jquery.treeview");
 		}
 
 		if ($this->photoslider_enabled)
 		{
-			$core_css .= html::stylesheet($this->css_url."media/css/picbox/picbox","",TRUE);
+			Requirements::css("media/css/picbox/picbox");
 		}
 
 		if ($this->colorpicker_enabled)
 		{
-			$core_css .= html::stylesheet($this->css_url."media/css/colorpicker","",TRUE);
+			Requirements::css("media/css/colorpicker");
 		}
 
 		if ($this->site_style AND $this->site_style != "default")
 		{
-			$core_css .= html::stylesheet($this->css_url."themes/".$site_style."/style.css");
+			Requirements::css("themes/".$site_style."/style.css");
 		}
 
-		$core_css .= html::stylesheet($this->css_url."media/css/global","",TRUE);
-		$core_css .= html::stylesheet($this->css_url."media/css/jquery.jqplot.min", "", TRUE);
-		
-		// Render CSS
-		$plugin_css = plugin::render('stylesheet');
-
-		return $core_css.$plugin_css;
-		}
+		Requirements::css("media/css/global");
+		Requirements::css("media/css/jquery.jqplot.min");
+	}
 
 	/**
 	 * Javascript Files and Inline JS
 	 */
 	private function _header_js()
 	{
-		$core_js = "";
+		Requirements::set_write_js_to_body(FALSE);
+		
 		if ($this->map_enabled)
 		{
-			$core_js .= html::script($this->js_url."media/js/OpenLayers", TRUE);
-			$core_js .= "<script type=\"text/javascript\">OpenLayers.ImgPath = '".$this->js_url."media/img/openlayers/"."';</script>";
-			$core_js .= html::script($this->js_url."media/js/ushahidi", TRUE);
+			Requirements::js("media/js/OpenLayers");
+			Requirements::customJS("OpenLayers.ImgPath = '".url::file_loc('js')."media/img/openlayers/"."';",'openlayers-imgpath');
+			Requirements::js("media/js/ushahidi");
 		}
 
-		$core_js .= html::script($this->js_url."media/js/jquery", TRUE);
-		//$core_js .= html::script($this->js_url."media/js/jquery.ui.min", TRUE);
-		$core_js .= html::script(Kohana::config('core.site_protocol')."://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js", TRUE);
-		$core_js .= html::script($this->js_url."media/js/jquery.pngFix.pack", TRUE);
-		$core_js .= html::script($this->js_url."media/js/jquery.timeago", TRUE);
+		Requirements::js("media/js/jquery");
+		//Requirements::js("media/js/jquery.ui.min");
+		Requirements::js(Kohana::config('core.site_protocol')."://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js");
+		Requirements::js("media/js/jquery.pngFix.pack");
+		Requirements::js("media/js/jquery.timeago");
 
 		if ($this->map_enabled)
 		{
-
-			$core_js .= $this->api_url;
+			Requirements::js($this->api_url);
 
 			if ($this->main_page || $this->this_page == "alerts")
 			{
-				$core_js .= html::script($this->js_url."media/js/selectToUISlider.jQuery", TRUE);
+				Requirements::js($this->js_url."media/js/selectToUISlider.jQuery");
 			}
 
 			if ($this->main_page)
 			{
 				// Notes: E.Kala <emmanuel(at)ushahidi.com>
 				// TODO: Only include the jqplot JS when the timeline is enabled
-				$core_js .= html::script($this->js_url."media/js/jquery.jqplot.min");
-				$core_js .= html::script($this->js_url."media/js/jqplot.dateAxisRenderer.min");
+				Requirements::js("media/js/jquery.jqplot.min");
+				Requirements::js("media/js/jqplot.dateAxisRenderer.min");
 
-				$core_js .= "<!--[if IE]>".html::script($this->js_url."media/js/excanvas.min", TRUE)."<![endif]-->";
+				Requirements::customHeadTags("<!--[if IE]>".html::script($this->js_url."media/js/excanvas.min", TRUE)."<![endif]-->");
 			}
 		}
 
 		if ($this->treeview_enabled)
 		{
-			$core_js .= html::script($this->js_url."media/js/jquery.treeview");
+			Requirements::js("media/js/jquery.treeview");
 		}
 
 		if ($this->validator_enabled)
 		{
-			$core_js .= html::script($this->js_url."media/js/jquery.validate.min");
+			Requirements::js("media/js/jquery.validate.min");
 		}
 
 		if ($this->photoslider_enabled)
 		{
-			$core_js .= html::script($this->js_url."media/js/picbox", TRUE);
+			Requirements::js("media/js/picbox");
 		}
 
 		if ($this->colorpicker_enabled)
 		{
-			$core_js .= html::script($this->js_url."media/js/colorpicker");
+			Requirements::js("media/js/colorpicker");
 		}
 
-		$core_js .= html::script($this->js_url."media/js/global");
+		Requirements::js("media/js/global");
 
 		if ($this->editor_enabled)
 		{
-			$core_js .= html::script($this->js_url."media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js");
-		}
-		
-		// Javascript files from plugins
-		$plugin_js = plugin::render('javascript');
-
-		// Javascript files from themes
-		foreach (Kohana::config("settings.site_style_js") as $theme_js)
-		{
-			$core_js .= html::script($theme_js,"",TRUE);
+			Requirements::js("media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js");
 		}
 
 		// Inline Javascript
-		$insert_js = trim($this->js);
-		$inline_js = <<< INLINEJS
-<script type="text/javascript">
-//<![CDATA[
-{$insert_js}
-//]]>
-</script>
-INLINEJS;
-
-		// Filter::header_js - Modify Header Javascript
-		Event::run('ushahidi_filter.header_js', $inline_js);
-
-		return $core_js.$plugin_js.$inline_js;
+		Requirements::customJS($this->js,'pagejs');
 	}
 
 	/**
@@ -223,13 +191,10 @@ private function _header_js()
 	 */
 	private function _header_feeds()
 	{
-		$feeds = "";
 		if (Kohana::config("settings.allow_feed"))
 		{
-			$feeds .= "<link rel=\"alternate\" type=\"application/rss+xml\" href=\"".url::site()."feed/\" title=\"RSS2\" />";
+			Requirements::customHeadTags("<link rel=\"alternate\" type=\"application/rss+xml\" href=\"".url::site('feed')."\" title=\"RSS2\" />",'rss-feed');
 		}
-
-		return $feeds;
 	}
 
 	/**
@@ -243,6 +208,8 @@ public function footer_block()
 				$this->ushahidi_stats_js()."\n".
 				$this->scheduler_js();
 		
+		$content .= Requirements::render('body');
+
 		// Filter::footer_block - Modify Footer Block
 		Event::run('ushahidi_filter.footer_block', $content);
 
diff --git a/application/views/admin/layout.php b/application/views/admin/layout.php
index 6a7a65355f..d9260a4745 100644
--- a/application/views/admin/layout.php
+++ b/application/views/admin/layout.php
@@ -30,7 +30,7 @@
 	{
 		echo html::script(url::file_loc('js').'media/js/OpenLayers', TRUE);
 		echo html::script(url::file_loc('js').'media/js/ushahidi', TRUE);
-		echo $api_url . "\n";
+		echo html::script($api_url) . "\n";
 		echo "<script type=\"text/javascript\">
 			OpenLayers.ImgPath = '".url::file_loc('img').'media/img/openlayers/'."';
 			</script>";
@@ -197,8 +197,7 @@
 	echo html::stylesheet(url::file_loc('css').'media/css/global','',TRUE);
 
 	// Render CSS and Javascript Files from Plugins
-	echo plugin::render('stylesheet');
-	echo plugin::render('javascript');
+	echo Requirements::render('head');
 
 	// Action::header_scripts_admin - Additional Inline Scripts
 	Event::run('ushahidi_action.header_scripts_admin');
diff --git a/application/views/members/layout.php b/application/views/members/layout.php
index 4c98bb3ec6..9981075ccf 100644
--- a/application/views/members/layout.php
+++ b/application/views/members/layout.php
@@ -30,7 +30,7 @@
 	if ($map_enabled)
 	{
 		echo html::script(url::file_loc('js').'media/js/OpenLayers', TRUE);
-		echo $api_url . "\n";
+		echo html::script($api_url) . "\n";
 		echo "<script type=\"text/javascript\">
 			OpenLayers.ImgPath = '".url::file_loc('img').'media/img/openlayers/'."';
 			</script>";
@@ -127,8 +127,7 @@
 	echo html::stylesheet(url::file_loc('css').'media/css/global','',TRUE);
 	
 	// Render CSS and Javascript Files from Plugins
-	echo plugin::render('stylesheet');
-	echo plugin::render('javascript');
+	echo Requirements::render('head');
 	
 	// Action::header_scripts_member - Additional Inline Scripts
 	Event::run('ushahidi_action.header_scripts_member');
diff --git a/themes/default/views/footer.php b/themes/default/views/footer.php
index 5034637568..8ea8673a32 100644
--- a/themes/default/views/footer.php
+++ b/themes/default/views/footer.php
@@ -76,7 +76,6 @@
 	<!-- / footer -->
 
 	<?php
-	echo Requirements::render('body');
 	echo $footer_block;
 	// Action::main_footer - Add items before the </body> tag
 	Event::run('ushahidi_action.main_footer');
diff --git a/themes/default/views/header.php b/themes/default/views/header.php
index a31ca562f5..979b773ab3 100644
--- a/themes/default/views/header.php
+++ b/themes/default/views/header.php
@@ -2,7 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 	<title><?php echo html::specialchars($page_title.$site_name); ?></title>
-	<?php echo Requirements::render('head'); ?>
 	<?php if (!Kohana::config('settings.enable_timeline')) { ?>
 		<style type="text/css">
 			#graph{display:none;}

From 4a3563fc35df0a242c96f880e7f7241a3b6df323 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 26 Jun 2012 11:07:04 +1200
Subject: [PATCH 05/30] Clean up timeline on/off css/js #598

* Only include jqplot js+css if needed
* Remove inline css and use class instead
* Remove graph div when disabled
---
 application/libraries/Themes.php       | 15 ++++++++++-----
 themes/default/css/style.css           |  6 +++++-
 themes/default/views/header.php        |  6 ------
 themes/default/views/main/map.php      |  2 +-
 themes/default/views/main/timeline.php |  4 +++-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index a7f21b9994..46399582a4 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -106,13 +106,17 @@ private function _header_css()
 			Requirements::css("media/css/colorpicker");
 		}
 
+		if (Kohana::config('settings.enable_timeline'))
+		{
+			Requirements::css("media/css/jquery.jqplot.min");
+		}
+
 		if ($this->site_style AND $this->site_style != "default")
 		{
 			Requirements::css("themes/".$site_style."/style.css");
 		}
 
 		Requirements::css("media/css/global");
-		Requirements::css("media/css/jquery.jqplot.min");
 	}
 
 	/**
@@ -146,10 +150,11 @@ private function _header_js()
 
 			if ($this->main_page)
 			{
-				// Notes: E.Kala <emmanuel(at)ushahidi.com>
-				// TODO: Only include the jqplot JS when the timeline is enabled
-				Requirements::js("media/js/jquery.jqplot.min");
-				Requirements::js("media/js/jqplot.dateAxisRenderer.min");
+				if (Kohana::config('settings.enable_timeline'))
+				{
+					Requirements::js("media/js/jquery.jqplot.min");
+					Requirements::js("media/js/jqplot.dateAxisRenderer.min");
+				}
 
 				Requirements::customHeadTags("<!--[if IE]>".html::script($this->js_url."media/js/excanvas.min", TRUE)."<![endif]-->");
 			}
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 94809e1087..aedb189289 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -428,9 +428,13 @@ a.share{
 div.map {
     border: #999 1px solid;
     width: 573px;
-    height: 366px;
+    height: 480px;
     position:relative;
 }
+/* Change map height when timeline is enabled */
+div.map.timeline-enabled {
+	height:366px;
+}
 
 #mapStatus {
     float: left;
diff --git a/themes/default/views/header.php b/themes/default/views/header.php
index 979b773ab3..53e19ad0d2 100644
--- a/themes/default/views/header.php
+++ b/themes/default/views/header.php
@@ -2,12 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 	<title><?php echo html::specialchars($page_title.$site_name); ?></title>
-	<?php if (!Kohana::config('settings.enable_timeline')) { ?>
-		<style type="text/css">
-			#graph{display:none;}
-			#map{height:480px;}
-		</style>
-	<?php } ?>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<?php echo $header_block; ?>
 	<?php
diff --git a/themes/default/views/main/map.php b/themes/default/views/main/map.php
index 0f01a288ab..967381d6ec 100644
--- a/themes/default/views/main/map.php
+++ b/themes/default/views/main/map.php
@@ -1,5 +1,5 @@
 <!-- map -->
-<div class="map" id="map"></div>
+<div class="map <?php if (Kohana::config('settings.enable_timeline')) echo 'timeline-enabled'; ?>" id="map"></div>
 <div style="clear:both;"></div>
 <div id="mapStatus">
 	<div id="mapScale"></div>
diff --git a/themes/default/views/main/timeline.php b/themes/default/views/main/timeline.php
index e461312d8b..94fa0ad17f 100644
--- a/themes/default/views/main/timeline.php
+++ b/themes/default/views/main/timeline.php
@@ -9,4 +9,6 @@
 		</fieldset>
 	<?php echo form::close(); ?>
 </div>
-<div id="graph" class="graph-holder"></div>
\ No newline at end of file
+<?php if (Kohana::config('settings.enable_timeline')): ?>
+<div id="graph" class="graph-holder"></div>
+<?php endif; ?>
\ No newline at end of file

From 3f248f77f7ff5ad47531e309808c15bba392a8c3 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Mon, 3 Dec 2012 15:19:41 +1300
Subject: [PATCH 06/30] Add theme inheritance #338

* Rename style.css in other themes to avoid overriding default style.css #301
* Move the Requirements calls from register_themes.php into Themes library
---
 application/hooks/register_themes.php         | 115 +++++++++++++-----
 application/libraries/Themes.php              |  17 ++-
 .../ci_cumulus/css/{style.css => cumulus.css} |   0
 themes/terra/css/{style.css => terra.css}     |   0
 4 files changed, 93 insertions(+), 39 deletions(-)
 rename themes/ci_cumulus/css/{style.css => cumulus.css} (100%)
 rename themes/terra/css/{style.css => terra.css} (100%)

diff --git a/application/hooks/register_themes.php b/application/hooks/register_themes.php
index 81cf53fb16..454e338fad 100755
--- a/application/hooks/register_themes.php
+++ b/application/hooks/register_themes.php
@@ -14,6 +14,13 @@
  */
 
 class register_themes {
+	
+	protected $themes = array();
+	protected $loaded_themes = array();
+	
+	protected $theme_js = array();
+	protected $theme_css = array();
+	
 	/**
 	 * Adds the register method to load after system.ready
 	 */
@@ -31,48 +38,90 @@ public function __construct()
 	 */
 	public function register()
 	{
-		// 1. Load the default theme
-		Kohana::config_set('core.modules', array_merge(array(THEMEPATH."default"), Kohana::config("core.modules")));
-
-		Requirements::css("themes/default/css/style");
-
-		// 2. Extend the default theme
-		$theme = THEMEPATH.Kohana::config("settings.site_style");
-		if ( Kohana::config("settings.site_style") != "default" )
+		$this->themes = addon::get_addons('theme', FALSE);
+		
+		$theme = Kohana::config("settings.site_style");
+		$theme = empty($theme) ? 'default' : $theme;
+		$this->_load_theme($theme);
+		
+		// Save theme CSS and JS for inclusion later
+		Kohana::config_set('settings.site_style_js', $this->theme_js);
+		Kohana::config_set('settings.site_style_css', $this->theme_css);
+	}
+	
+	/**
+	 * Load theme
+	 * Loads theme into modules, includes its hooks and recursively loads parent themes
+	 * @param string $theme theme name/directory
+	 **/
+	private function _load_theme($theme)
+	{
+		// Record loading this theme, so we can avoid dependency loops
+		$this->loaded_themes[] = $theme;
+		
+		// Get meta data to check the base theme
+		$meta = addon::meta_data($theme, 'theme', array('Base Theme' => 'default'));
+		
+		// If base theme is set, the base theme exists, and we haven't loaded it yet
+		// Load the base theme
+		if (! empty($meta['Base Theme'])
+				AND isset($this->themes[$meta['Base Theme']])
+				AND ! in_array($meta['Base Theme'], $this->loaded_themes)
+			)
 		{
-			Kohana::config_set('core.modules', array_merge(array($theme),
-				Kohana::config("core.modules")));
+			$this->_load_theme($meta['Base Theme']);
+		}
+		
+		// Add theme to modules
+		$theme_base = THEMEPATH . $theme;
+		Kohana::config_set('core.modules', array_merge(array($theme_base), Kohana::config("core.modules")));
 
-			if ( is_dir($theme.'/css') )
+		// We need to manually include the hook file for each theme
+		if (file_exists($theme_base.'/hooks'))
+		{
+			$d = dir($theme_base.'/hooks'); // Load all the hooks
+			while (($entry = $d->read()) !== FALSE)
 			{
-				$css = dir($theme.'/css'); // Load all the themes css files
-				while (($css_file = $css->read()) !== FALSE)
-					if (preg_match('/\.css/i', $css_file))
-					{
-						Requirements::css("themes/".Kohana::config("settings.site_style")."/css/".$css_file);
-					}
+				if ($entry[0] != '.')
+				{
+					include $theme_base.'/hooks/'.$entry;
+				}
 			}
+		}
+		
+		$this->load_theme_css($theme);
+		$this->load_theme_js($theme);
+	}
 
-			if ( is_dir($theme.'/js') )
-			{
-				$js = dir($theme.'/js'); // Load all the themes js files
-				while (($js_file = $js->read()) !== FALSE)
-					if (preg_match('/\.js/i', $js_file))
-					{
-						Requirements::js("themes/".Kohana::config("settings.site_style")."/js/".$js_file);
-					}
-			}
+	/*
+	 * Find theme css and store for inclusion later
+	 */
+	private function load_theme_css($theme)
+	{
+		$css_dir = THEMEPATH.$theme.'/css';
+		if ( is_dir($css_dir) )
+		{
+			$css = dir($css_dir); // Load all the themes css files
+			while (($css_file = $css->read()) !== FALSE)
+				if (preg_match('/\.css/i', $css_file))
+				{
+					$this->theme_css[str_replace('.css','',$css_file)] = "themes/$theme/css/$css_file";
+				}
 		}
+	}
 
-		// 3. Find and add hooks
-		// We need to manually include the hook file for each theme
-		if (file_exists($theme.'/hooks'))
+	/*
+	 * Find theme css and store for inclusion later
+	 */
+	private function load_theme_js($theme)
+	{
+		if ( is_dir(THEMEPATH.$theme.'/js') )
 		{
-			$d = dir($theme.'/hooks'); // Load all the hooks
-			while (($entry = $d->read()) !== FALSE)
-				if ($entry[0] != '.')
+			$js = dir(THEMEPATH.$theme.'/js'); // Load all the themes js files
+			while (($js_file = $js->read()) !== FALSE)
+				if (preg_match('/\.js/i', $js_file))
 				{
-					include $theme.'/hooks/'.$entry;
+					$this->theme_js[str_replace('.js','',$js_file)] = "themes/$theme/js/$js_file";
 				}
 		}
 	}
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 46399582a4..22e2404a61 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -111,12 +111,12 @@ private function _header_css()
 			Requirements::css("media/css/jquery.jqplot.min");
 		}
 
-		if ($this->site_style AND $this->site_style != "default")
+		Requirements::css("media/css/global");
+		
+		foreach(Kohana::config('settings.site_style_css') as $css)
 		{
-			Requirements::css("themes/".$site_style."/style.css");
+			Requirements::css($css);
 		}
-
-		Requirements::css("media/css/global");
 	}
 
 	/**
@@ -152,8 +152,8 @@ private function _header_js()
 			{
 				if (Kohana::config('settings.enable_timeline'))
 				{
-					Requirements::js("media/js/jquery.jqplot.min");
-					Requirements::js("media/js/jqplot.dateAxisRenderer.min");
+				Requirements::js("media/js/jquery.jqplot.min");
+				Requirements::js("media/js/jqplot.dateAxisRenderer.min");
 				}
 
 				Requirements::customHeadTags("<!--[if IE]>".html::script($this->js_url."media/js/excanvas.min", TRUE)."<![endif]-->");
@@ -186,6 +186,11 @@ private function _header_js()
 		{
 			Requirements::js("media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js");
 		}
+		
+		foreach(Kohana::config('settings.site_style_js') as $js)
+		{
+			Requirements::js($js);
+		}
 
 		// Inline Javascript
 		Requirements::customJS($this->js,'pagejs');
diff --git a/themes/ci_cumulus/css/style.css b/themes/ci_cumulus/css/cumulus.css
similarity index 100%
rename from themes/ci_cumulus/css/style.css
rename to themes/ci_cumulus/css/cumulus.css
diff --git a/themes/terra/css/style.css b/themes/terra/css/terra.css
similarity index 100%
rename from themes/terra/css/style.css
rename to themes/terra/css/terra.css

From 05f4f2c7d61aeaff3dd3b1b91ecd53019c824bea Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 26 Jun 2012 17:35:44 +1200
Subject: [PATCH 07/30] Split CSS into other files from style.css

* Split style.css into base.css and style.css
* Tweak alerts radius map not to use .map class
  Use map-wrapper class instead as this avoids conflicts
  with div.map on main page. This Simplifies base.css so
  it doesn't need to style the map-wrapper too
* Move accordion styling to its own file
* Add basic style for reports submit and get alerts in base.css
* Remove some old unused CSS too
---
 media/css/all.css                      | 1496 ------------------------
 themes/default/css/accordion.css       |   48 +
 themes/default/css/base.css            |  389 ++++++
 themes/default/css/slider.css          |  107 ++
 themes/default/css/style.css           |  309 +----
 themes/default/views/alerts/radius.php |    2 +-
 6 files changed, 581 insertions(+), 1770 deletions(-)
 delete mode 100644 media/css/all.css
 create mode 100644 themes/default/css/accordion.css
 create mode 100644 themes/default/css/base.css
 create mode 100644 themes/default/css/slider.css

diff --git a/media/css/all.css b/media/css/all.css
deleted file mode 100644
index 60aeb9a048..0000000000
--- a/media/css/all.css
+++ /dev/null
@@ -1,1496 +0,0 @@
-body {
-	margin:0;
-	color:#666;
-	font:12px/15px Arial, Helvetica, sans-serif;
-	background:#fff url(../img/page-bg.gif) repeat-x;
-}
-#main {
-	margin:0 auto;
-	width:960px;
-	clear:both;
-	overflow:hidden;
-}
-a{
-	color:#003399;
-}
-a:visited{
-	color:#0066CC;
-}
-/*-----header-----*/
-
-#header {
-	clear:both;
-	width:960px;
-	height:100px;
-	overflow:hidden;
-	position:relative;
-}
-#header .header-info {
-	float:left;
-	width:360px;
-	padding:26px 0 0 20px
-}
-#header .header-info strong,
-#header .header-info strong a,
-#header .header-info strong a:visited{
-	color:#fff;
-	font:28px/33px Arial, Helvetica, sans-serif;
-	text-decoration:none;
-}
-#header .header-info p {
-	color:#fff;
-	margin:0;
-	font:12px/18px Arial, Helvetica, sans-serif;
-}
-#header #menu {
-	float:right;
-	margin:70px 0 0;
-	padding:0;
-	background:url(../img/nav-bg.gif) no-repeat 100% 0;
-}
-#header #menu li {
-	float:left;
-	padding:0 0 0 1px;
-	list-style:none;
-	font:14px/29px Arial, Helvetica, sans-serif;
-	background:url(../img/nav-separator.gif) no-repeat;
-}
-#header #menu li a {
-	float:left;
-	padding:0 9px;
-	color:#fff;
-	text-decoration:none;
-}
-#header #menu li a.active,
-#header #menu li a:hover {
-	background:url(../img/nav-active.gif) repeat-x;
-	color:#333;
-}
-#header #menu li.first a {background:url(../img/nav-first.gif) no-repeat !important;}
-#header #menu li.first a:hover,
-#header #menu li.first a.active {background-position:0 -29px !important;}
-#header #menu li.last a {background:url(../img/nav-last.gif) no-repeat 100% 0 !important;}
-#header #menu li.last a:hover,
-#header #menu li.last a.active {background-position:100% -29px !important;}
-#header .lang_search{
-	position:absolute;
-	top:0;
-	right:0;
-	float:right;
-	margin:10px 0 0 0;
-}
-#header .lang_box{
-	float:left;
-	margin-right:15px;
-}
-#header .search_box{
-	float:left;
-}
-#header input.searchbtn
-{
-	cursor:pointer;
-	border:outset 1px #ccc;
-	background:#999;
-	color:#666;
-	font-weight:bold;
-	padding: 2px 2px;
-	background:url(../img/btn_bkg_g.gif) repeat-x left top;
-	float:left;
-	margin-left:5px;
-}
-#header .text{
-	font-size:100%;
-	color:#00789F;
-	background-color:#ccc;
-	padding:2px;
-	border:1px #ccc solid;
-	width:120px;
-	float:left;
-}
-
-#languages { float: left; margin:0; padding:0; }
-#languages li { display: inline; }
-#languages a { display: block; float: left; margin-right:10px; padding:2px 3px 0 3px; border: none; background: #333; }
-#languages a:hover { background-color: #999; }
-#languages a.active { background-color: #666; }
-#languages img{
-	border:none;
-}
-
-/*-----content-----*/
-#content {
-	clear:both;
-	width:960px;
-	overflow:hidden;
-	background:#cc9 url(../img/content-top.gif) no-repeat;
-}
-#content .content-bg {
-	overflow:hidden;
-	width:930px;
-	padding:12px 15px 20px;
-	background:url(../img/content-bottom.gif) no-repeat 0 100%;
-}
-/*---big-block---*/
-.big-block {
-	overflow:hidden;
-	width:930px;
-	background:url(../img/big-block-bg.gif) repeat-y;
-}
-.big-block .big-block-top {
-	overflow:hidden;
-	width:100%;
-	background:url(../img/big-block-top.gif) no-repeat;
-}
-.big-block .big-block-bottom {
-	overflow:hidden;
-	width:880px;
-	padding:16px 25px 20px;
-	background:url(../img/big-block-bottom.gif) no-repeat 0 100%;
-}
-.big-block h1 {
-	margin:0;
-	padding:8px 0 0;
-	overflow:hidden;
-	width:100%;
-	clear:both;
-	color:#09c;
-	font:bold 18px/22px Arial, Helvetica, sans-serif;
-}
-/*--big-map-block--*/
-.big-map-block {
-	float:left;
-	width:574px;
-}
-.big-map-block .filter {
-	overflow:hidden;
-	width:100%;
-	position:relative;
-}
-.big-map-block .filter strong {
-	float:left;
-	padding:0 10px 0 0;
-	color:#333;
-	font:bold 10px/13px Arial, Helvetica, sans-serif;
-	text-transform:uppercase;
-	background:url(../img/arrow.gif) no-repeat 100% 50%;
-}
-.big-map-block .filter ul {
-	float:left;
-	margin:0;
-	padding:0 0 5px 6px;
-}
-.big-map-block .filter ul li {
-	float:left;
-	padding:0 1px;
-	list-style:none;
-	font:10px/13px Arial, Helvetica, sans-serif;
-	text-transform:uppercase;
-}
-.big-map-block .filter ul li a {
-	float:left;
-	color:#996;
-	text-decoration:none;
-}
-.big-map-block .filter ul li a span {
-	float:left;
-	padding:0 5px;
-}
-/*.big-map-block .filter ul li a span.active,*/
-.big-map-block .filter ul li a.active, 
-.big-map-block .filter ul li a:hover {
-	background:#3399cc url(../img/filter-item-l.gif) no-repeat;
-	color:#fff;
-}
-.big-map-block .filter ul li a.active span,
-.big-map-block .filter ul li a:hover span {background:url(../img/filter-item-r.gif) no-repeat 100% 0;}
-.big-map-block .map-holder {
-	overflow:hidden;
-	width:100%;
-	border:1px solid #ccc;
-	width:573px;
-	height:366px;
-}
-.big-map-block .map-loader {
-	top:0;
-	position:absolute;
-	width:200px;
-	height:200px;
-	background-color:red;
-	display:none;
-}
-.big-map-block .slider-holder {
-	margin-top:10px;
-	width:573px;
-	height:70px;
-	font-size: 70%;
-}
-.slider-holder form, .slider-holder fieldset {
-	border:0;
-}
-.slider-holder form, .slider-holder fieldset {
-	border:0;
-}
-.slider-holder .play{
-	float:right;
-	border:1px solid #ccc;
-	background-color:#eee;
-	padding:3px 6px 3px 15px;
-	color:#666;
-	font-weight:bold;
-	background-image:url(../img/arrow-play.gif);
-	background-position:5px 50%;
-	background-repeat:no-repeat;
-	font-size:1.2em;
-}
-.slider-holder .pause{
-	background-image:url(../img/pause.gif);
-}
-.slider-holder .play a{
-	color:#666;
-	text-decoration:none;
-}
-.slider-holder .play:hover{
-	background-color:#ffffcc;
-}
-.slider-holder .play a:hover{
-	text-decoration:underline;
-}
-.olControlLoadingPanel {
-	background-image:url(../img/loading.gif);
-	background-position:center;
-	background-repeat:no-repeat;
-}
-.olPopupCloseBox {
-  background: url("../img/openlayers/close.gif") no-repeat;
-  cursor: pointer;
-}
-.infowindow{
-	padding:10px;
-	margin-right:-15px;
-}
-.infowindow h2{
-	margin:0 0 5px 0;
-	padding:0;
-	font-size:12px;
-	font-weight:bold;
-	font-size:14px;
-}
-.infowindow .infowindow_list{
-	padding:10px 0 10px 0;
-	border:1px solid #ccc;
-	border-width:1px 0 1px 0;
-}
-.infowindow ul{
-	font-weight:bold;
-	margin:0 0 0 1em;
-	padding:0;
-}
-.infowindow li{
-	list-style-type: square;
-}
-.infowindow a, .infowindow a:visited{
-	color:#000;
-}
-.infowindow a:hover{
-	text-decoration:none;
-}
-.infowindow .infowindow_meta{
-	background-color:#eee;
-	font-size:90%;
-	padding:1px 5px 3px 5px;
-}
-/*--category--*/
-.category {
-	float:right;
-	width:282px;
-}
-.category strong.title {
-	display:block;
-	padding:0 0 5px 10px;
-	color:#333;
-	font:bold 10px/13px Arial, Helvetica, sans-serif;
-	text-transform:uppercase;
-	background:url(../img/arrow-down.gif) no-repeat 0 4px;
-}
-.category .grey-box {
-	overflow:hidden;
-	width:100%;
-	background:#eee url(../img/grey-box-top.gif) no-repeat;
-}
-.category .grey-box .grey-box-bg {
-	overflow:hidden;
-	width:100%;
-	background:url(../img/grey-box-bottom.gif) no-repeat 0 100%;
-}
-.category .grey-box ul {
-	overflow:hidden;
-	width:264px;
-	margin:8px 0 0;
-	padding:0 0 8px 9px;
-}
-.category .grey-box ul li {
-	float:left;
-	width:100%;
-	list-style:none;
-}
-.category .grey-box ul li a {
-	float:left;
-	padding:0 0 3px 11px;
-	width:253px;
-	color:#0091c4;
-	font:14px/28px Arial, Helvetica, sans-serif;
-	text-decoration:none;
-}
-.category .grey-box ul li a:hover,
-.category .grey-box ul li a.active {
-	color:#fff;
-	background:url(../img/category-item-active.gif) no-repeat;
-}
-.category .grey-box ul li a span {
-	float:left;
-	cursor:pointer;
-}
-.category .swatch{
-	float:left;
-	margin:6px 8px 0 0;
-	width:16px;
-	height:16px;
-}
-.category .report-btns {
-	overflow:hidden;
-	width:100%;
-	clear:both;
-	padding:18px 0 0;
-}
-.category .report-btns a {
-	float:left;
-	color:#fff;
-	font:bold 14px/34px Arial, Helvetica, sans-serif;
-	text-decoration:none;
-}
-.category .report-btns a span {
-	float:left;
-	padding:0 9px 3px;
-	cursor:pointer;
-}
-.category .report-btns a:hover,
-.category .report-btns a:hover span {text-decoration:underline;}
-.category .report-btns a.btn-red {background:url(../img/red-btn-l.gif) no-repeat;}
-.category .report-btns a.btn-red span {background:url(../img/red-btn-r.gif) no-repeat 100% 0;}
-.category .report-btns a.btn-grey {
-	background:url(../img/grey-btn-l.gif) no-repeat;
-	margin-top:5px;
-}
-.category .report-btns a.btn-grey span {background:url(../img/grey-btn-r.gif) no-repeat 100% 0;}
-.category p {
-	margin:14px 0 0;
-	width:100%;
-	text-align:center;
-	font:14px/20px Arial, Helvetica, sans-serif;
-	color:#666;
-}
-/*---blocks-holder---*/
-.blocks-holder {
-	overflow:hidden;
-	width:100%;
-	padding:18px 0 0;
-}
-.blocks-holder .incidents,
-.blocks-holder .images {float:left;}
-.blocks-holder .news,
-.blocks-holder .side-block {float:right;}
-.blocks-holder .side-block .block-bg {margin:0 0 20px;}
-.small-block {width:460px;}
-.small-block h3 {
-	overflow:hidden;
-	margin:0 0 -1px;
-	padding:0 0 0 26px;
-	color:#666;
-	font:bold 14px/17px Arial, Helvetica, sans-serif;
-}
-.small-block h3 span {font-size:10px;}
-.small-block .block-bg {
-	overflow:hidden;
-	width:100%;
-	background:url(../img/small-block-bg.gif) repeat-y;
-}
-.small-block .block-top {
-	overflow:hidden;
-	width:100%;
-	background:url(../img/small-block-top.gif) no-repeat;
-}
-.small-block .block-bottom {
-	overflow:hidden;
-	width:410px;
-	padding:20px 25px 10px;
-	background:url(../img/small-block-bottom.gif) no-repeat 0 100%;
-}
-.small-block .block-bg ul {
-	overflow:hidden;
-	width:100%;
-	margin:0;
-	padding:0 0 10px;
-}
-.small-block .block-bg ul li {
-	float:left;
-	width:100%;
-	padding:4px 0;
-	list-style:none;
-	font:11px/14px Arial, Helvetica, sans-serif;
-	border-bottom:1px solid #eee;
-}
-.small-block .block-bg ul li:first-child {border:none;}
-.small-block .block-bg ul li.w-01 {
-	width:238px;
-	padding:0 10px 0 0;
-}
-.small-block .block-bg ul li.w-02 {
-	width:92px;
-	padding:0 10px 0 0;
-}
-.small-block .block-bg ul li.w-03 {width:60px;}
-.small-block .block-bg ul li a {
-	color:#09c;
-	text-decoration:none;
-}
-.small-block .block-bg ul li a:hover {text-decoration:underline;}
-.small-block .block-bg ul li ul {padding:0;}
-.small-block .block-bg ul li ul li {
-	border:none;
-	padding:0;
-}
-.small-block .block-bg ul li ul.title li {font:10px/14px Arial, Helvetica, sans-serif;}
-.small-block .block-bg a.btn-more {
-	float:right;
-	color:#fff;
-	font:bold 10px/12px Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	background:#39c url(../img/filter-item-l.gif) no-repeat;
-}
-.small-block .block-bg a.btn-more span {
-	float:left;
-	padding:0 5px 1px;
-	cursor:pointer;
-	background:url(../img/filter-item-r.gif) no-repeat 100% 0;
-}
-.small-block .block-bg a.btn-more:hover,
-.small-block .block-bg a.btn-more:hover span {text-decoration:underline;}
-/*---alerts-block---*/
-.step-1 {
-	float:left;
-	width:430px;
-	margin:20px 0 0;
-	padding:0 0 10px;
-	border:1px solid #cc9;
-}
-.step-1 h2 {
-	margin:0;
-	padding:0 0 0 10px;
-	background:#cc9;
-	font:14px/28px Arial, Helvetica, sans-serif;
-	color:#666;
-}
-.step-1 .location {
-	overflow:hidden;
-	width:388px;
-	padding:10px;
-	margin:10px 0 0 10px;
-	border:1px solid #eee;
-}
-.step-1 .location label {
-	display:block;
-	color:#666;
-	padding:0 0 8px;
-	font:12px/15px Arial, Helvetica, sans-serif;
-}
-.step-1 .map {
-	overflow:hidden;
-	width:388px;
-	padding:10px;
-	margin:10px 0 0 10px;
-	border:1px solid #eee;
-}
-.step-1 .map p {
-	margin:0;
-	padding:0 0 6px;
-	font:12px/15px Arial, Helvetica, sans-serif;
-}
-.step-1 .map .map-holder {
-	overflow:hidden;
-	border:1px solid #ccc;
-	width:387px;
-	height:290px;
-}
-.step-2-holder {
-	float:right;
-	width:432px;
-}
-.step-2 {
-	overflow:hidden;
-	width:430px;
-	margin:20px 0 0;
-	padding:0 0 10px;
-	border:1px solid #cc9;
-}
-.step-2 h2 {
-	margin:0;
-	padding:0 0 0 10px;
-	background:#cc9;
-	font:14px/28px Arial, Helvetica, sans-serif;
-	color:#666;
-}
-.step-2 .holder {
-	overflow:hidden;
-	width:100%;
-}
-.step-2 .box {
-	overflow:hidden;
-	width:388px;
-	padding:10px;
-	margin:10px 0 0 10px;
-	border:1px solid #eee;
-}
-.step-2 .box input {
-	overflow:hidden;
-	margin:0 0 0 22px;
-	clear:both;
-}
-.step-2 .box label {
-	display:block;
-	width:100%;
-	overflow:hidden;
-	color:#666;
-	padding:0 0 8px;
-	font:12px/15px Arial, Helvetica, sans-serif;
-	clear:both;
-}
-.step-2 .box label input {
-	float:left;
-	margin:2px 0 0;
-	padding:0;
-	padding:0;
-	clear:both;
-	width:auto;
-}
-* html .step-2 .box label input {
-	width:15px;
-	height:15px;
-}
-* +html .step-2 .box label input {
-	width:15px;
-	height:15px;
-}
-.step-2 .box label span {
-	float:left;
-	padding:0 0 0 10px;
-}
-.step-2-holder #btn-send-alerts {
-	float:right;
-	margin:20px 0 0;
-	padding:0 0 2px;
-	width:118px;
-	height:31px;
-	color:#fff;
-	font:14px Arial, Helvetica, sans-serif;
-	background:url(../img/btn-blue.gif) no-repeat;
-	border:0;
-	cursor:pointer;
-}
-/*--incident-name--*/
-.incident-name {
-	float:left;
-	width:430px;
-	margin:0 0 20px;
-}
-.incident-name ul {
-	overflow:hidden;
-	width:100%;
-	margin:12px 0 0;
-	padding:0;
-}
-.incident-name ul li {
-	float:left;
-	width:100%;
-	padding:6px 0;
-	list-style:none;
-	border-top:1px solid #eee;
-}
-.incident-name ul li:first-child {border:none;}
-.incident-name ul li strong {
-	display:block;
-	width:100%;
-	font:bold 10px/13px Arial, Helvetica, sans-serif;
-}
-.incident-name ul li p {
-	margin:0;
-	font:12px/15px Arial, Helvetica, sans-serif;
-}
-.incident-name ul li p strong.green {
-	display:inline;
-	color:#339933;
-	font:bold 12px/15px Arial, Helvetica, sans-serif;
-}
-.incident-name ul li p strong.red {
-	display:inline;
-	color:#CC0000;
-	font:bold 12px/15px Arial, Helvetica, sans-serif;
-}
-.incident-name ul li p a {
-	color:#09c;
-	text-decoration:none;
-}
-.incident-name ul li p a:hover {text-decoration:underline;}
-/*--incident-map--*/
-.incident-map {
-	float:right;
-	width:430px;
-	margin:0 0 20px;
-}
-.incident-map ul.legend {
-	float:right;
-	margin:0;
-	padding:0 0 5px;
-}
-.incident-map ul.legend li {
-	float:left;
-	margin:0 0 0 11px;
-	display:inline;
-	list-style:none;
-	color:#996;
-	font:10px/13px Arial, Helvetica, sans-serif;
-	text-transform:uppercase;
-	padding:0 0 0 16px;
-}
-.incident-map ul.legend li.ico-red {background:url(../img/ico-red.gif) no-repeat;}
-.incident-map ul.legend li.ico-orange {background:url(../img/ico-orange.gif) no-repeat;}
-.incident-map .map-holder {
-	overflow:hidden;
-	clear:both;
-	border:1px solid #ccc;
-	width:428px;
-	height:298px;
-}
-/*--report-description--*/
-.report-description {
-	overflow:hidden;
-	border:1px solid #cc9;
-	clear:both;
-	width:878px;
-	padding:0 0 30px;
-}
-.report-description .title {
-	overflow:hidden;
-	background:#cc9;
-	width:100%;
-}
-.report-description .title h2 {
-	float:left;
-	margin:0;
-	padding:0 0 0 10px;
-	font:bold 14px/28px Arial, Helvetica, sans-serif;
-}
-.report-description .title a {
-	float:right;
-	margin:7px 10px 0 0;
-	display:inline;
-	font:10px/13px Arial, Helvetica, sans-serif;
-	color:#fff;
-	text-decoration:none;
-	background:#09c url(../img/lnk-info-l.gif) no-repeat;
-	text-transform:uppercase;
-}
-.report-description .title a:hover,
-.report-description .title a:hover  span {text-decoration:underline;}
-.report-description .title a span {
-	float:left;
-	padding:0 4px;
-	cursor:pointer;
-	background:url(../img/lnk-info-r.gif) no-repeat 100% 0;
-}
-.report-description .orig-report {
-	overflow:hidden;
-	border:1px solid #eee;
-	width:838px;
-	margin:20px 0 -10px 19px;
-}
-.report-description .orig-report .report {
-	overflow:hidden;
-	background:#ffc;
-	padding:10px;
-	width:818px;
-}
-.report-description .orig-report .report h4 {
-	margin:0;
-	width:100%;
-	clear:both;
-	font:bold 12px/17px Arial, Helvetica, sans-serif;
-	text-transform:uppercase;
-}
-.report-description .orig-report .report p {
-	margin:0;
-	font:12px/17px Arial, Helvetica, sans-serif;
-}
-.report-description .orig-report .report a.lnk {
-	float:left;
-	margin:7px 0 0;
-	font:10px/13px Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	color:#fff;
-	background:#393 url(../img/green-btn-l.gif) no-repeat;
-	text-transform:uppercase;
-}
-.report-description .orig-report .report a.lnk:hover,
-.report-description .orig-report .report a.lnk:hover span {text-decoration:underline;}
-.report-description .orig-report .report a.lnk span {
-	float:left;
-	padding:0 4px;
-	cursor:pointer;
-	background:url(../img/green-btn-r.gif) no-repeat 100% 0;
-}
-.report-description .orig-report .discussion {
-	overflow:hidden;
-	padding:16px 20px 20px;
-	width:798px;
-}
-.report-description .orig-report .discussion h5 {
-	margin:0;
-	width:100%;
-	clear:both;
-	font:bold 12px/17px Arial, Helvetica, sans-serif;
-	text-transform:uppercase;
-}
-.discussion h5 a, .discussion h5 a:visited{
-	text-transform:none;
-}
-.report-description .orig-report .discussion .discussion-box {
-	overflow:hidden;
-	width:778px;
-	margin:10px 0 0;
-	padding:10px;
-	background:#eee;
-}
-.report-description .orig-report .discussion .discussion-box p {
-	margin:0;
-	font:12px/17px Arial, Helvetica, sans-serif;
-}
-.report-description .orig-report .discussion .discussion-box a.lnk {
-	float:left;
-	margin:7px 0 0;
-	font:10px/13px Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	color:#fff;
-	background:#393 url(../img/green-btn-l.gif) no-repeat;
-	text-transform:uppercase;
-}
-.report-description .orig-report .discussion .discussion-box a.lnk:hover,
-.report-description .orig-report .discussion .discussion-box a.lnk:hover span {text-decoration:underline;}
-.report-description .orig-report .discussion .discussion-box a.lnk span {
-	float:left;
-	padding:0 4px;
-	cursor:pointer;
-	background:url(../img/green-btn-r.gif) no-repeat 100% 0;
-}
-/*-search-*/
-.search_block{
-	padding:30px;
-}
-.search_info{
-	margin:0 0 15px 0;
-	border:1px solid #999;
-	padding:5px;
-	background-color:#eee;
-}
-.search_result{
-	margin:0 0 15px 0;
-}
-.search_highlight{
-	font-weight:bold;
-}
-.search_result{
-	font-size:13px;
-}
-.search_result h3{
-	margin:0;
-	padding:0;
-	font-weight:normal;
-	font-size:16px;
-}
-.search_date{
-	font-size:12px;
-	color:#006600;
-	font-style: italic;
-	margin-top:3px;
-}
-/*-gallery-*/
-.gallery {
-	overflow:hidden;
-	width:100%;
-	padding:0 0 10px;
-}
-.gallery .gal-nav {
-	overflow:hidden;
-	width:98%;
-}
-.gallery .gal-nav a.btn-prev {
-	float:left;
-	width:34px;
-	height:31px;
-	margin:7px 0 0;
-	text-indent:-9999px;
-	overflow:hidden;
-	background:url(../img/btn-prev.gif) no-repeat;
-}
-.gallery .gal-nav a.btn-prev:hover {background-position:0 -31px;}
-.gallery .gal-nav a.btn-next {
-	float:right;
-	width:34px;
-	height:31px;
-	margin:7px 0 0;
-	text-indent:-9999px;
-	overflow:hidden;
-	background:url(../img/btn-next.gif) no-repeat;
-}
-.gallery .gal-nav a.btn-next:hover {background-position:0 -31px;}
-.gallery .gal-nav .mask {
-	float:left;
-	width:320px;
-	height:43px;
-	margin:0 0 0 12px;
-	display:inline;
-	overflow:hidden;
-}
-.gallery .gal-nav .mask ul {
-	overflow:hidden;
-	width:9999px;
-	margin:0;
-	padding:0;
-}
-.gallery .gal-nav .mask ul li {
-	float:left;
-	padding:0 10px 0 0;
-	list-style:none;
-	border:none;
-	width:auto;
-}
-.gallery .gal-nav .mask ul li img {
-	display:block;
-	margin:0;
-	border:1px solid #ccc;
-}
-.gallery .big-img {
-	overflow:hidden;
-	width:100%;
-	padding:10px 0 0;
-}
-.gallery .big-img img {
-	display:block;
-	margin:0;
-	border:1px solid #ccc;
-}
-/*-----footer-----*/
-#footer {
-  background:#A8A8A8 url(../images/footer-bg2.jpg) no-repeat scroll 50% -5px;
-	clear:both;
-	width:960px;
-	padding:20px 0 0;
-	margin:0 0 30px;
-	overflow:hidden;
-}
-#footer .footer-info {
-	float:left;
-	width:740px;
-	padding:0 0 0 20px;
-}
-#footer .footer-info ul {
-	overflow:hidden;
-	width:100%;
-	margin:0;
-	padding:0;
-}
-#footer .footer-info ul li {
-	float:left;
-	padding:0 10px 0 11px;
-	list-style:none;
-	font:10px/13px Verdana, Arial, Helvetica, sans-serif;
-	background:url(../img/f-nav-separator.gif) no-repeat 0 60%;
-}
-#footer .footer-info ul li:first-child {
-	padding:0 10px 0 0;
-	background:none;
-}
-#footer .footer-info ul li a {
-	color:#996;
-	text-decoration:none;
-}
-#footer .footer-info ul li a:hover {text-decoration:underline;}
-#footer .footer-info p {
-	margin:2px 0 0;
-	color:#ccc;
-	font:10px/17px Verdana, Arial, Helvetica, sans-serif;
-}
-#footer .f-logo {
-	float:right;
-	margin:0 20px 0 0;
-	display:inline;
-}
-#footer .f-logo a {
-	display:block;
-	width:164px;
-	height:32px;
-	text-indent:-9999px;
-	overflow:hidden;
-	background:url(../img/f-logo.gif) no-repeat;
-}
-/* report */
-.report_left{
-	float:left;
-	width:400px;
-	margin:20px 0 0;
-	padding:0 0 10px;
-}
-.report_right{
-	overflow:hidden;
-	width:455px;
-	margin:20px 0 0 25px;
-	padding:0 0 10px;
-}
-.report_bottom{
-	clear:both;
-}
-.report_row{
-	margin:0 0 15px 0;
-	clear:both;
-}
-.report_row h4{
-	margin:0 0 5px 0;
-	padding:0;
-	font-size:120%;
-	font-weight:bold;
-}
-.report_row h4 span{
-	font-weight: normal;
-	font-size: 10px;
-	line-height: 12px;
-	color: #a1a1a1;
-}
-.report_row .date-box{
-	float:left;
-	margin-right:10px;
-}
-.report_row .date-box img{
-	padding:0 5px 0 5px;
-}
-.report_row .time{
-	float:left;
-}
-.report_row .optional-info{
-	float:left;
-	margin-right:10px;
-}
-.report_category {
-	clear:both;
-	overflow:hidden;
-	font-size:90%;
-}
-.report_category ul{
-	width:50%;
-	float:left;
-	margin:0;
-	padding:0 0 11px;
-}
-.report_category ul li{
-	overflow:hidden;
-	list-style:none;
-}
-.report_category ul li label{
-	color:#555;
-}
-.report_optional{
-	padding:15px;
-	background-color:#eee;
-	width:80%;
-}
-.report_optional h3
-{
-	margin:0 0 15px 0;
-	padding:0;
-	font-size:130%;
-	color:#999;
-	font-weight:bold;
-}
-.report_comment{
-	border:1px #ccc solid;
-	margin-top:15px;
-	padding:20px;
-	background:#eee;
-	clear:both;
-	overflow:hidden;
-}
-.report_rating{
-	margin:15px 0 0 10px;
-	font-size:90%;
-}
-.report_rating div{
-	float:left;
-	margin-right:3px;
-	
-}
-.rating_value{
-	height:14px;
-	font-weight:bold;
-	text-align:center;
-	background-color:#666;
-	color:#fff;
-	padding:0 4px 0 4px;
-}
-.rating_loading{
-	margin:0 0 0 10px;
-}
-span.dots {
-	width:17px;
-	text-align:center;
-	color:#404040;
-	font-size:18px;
-	font-weight:bold;
-}
-a.add,
-a.rem{
-	margin:3px 0 0 5px;
-	text-indent:-3000px;
-	overflow:hidden;
-	width:13px;
-	height:13px;
-	float:left;
-	background:url(../img/icon-plus.gif) no-repeat;
-}
-a.rem { background:url(../img/icon-minus.gif) no-repeat;}
-.report_map{
-	overflow:hidden;
-	width:100%;
-	border:2px solid #ccc;
-	width:450px;
-	height:300px;
-}
-.report-find-location {
-	margin-right:1px;
-	padding:0 9px 9px 9px;
-	background-color:#eee;
-	border:1px solid #ccc;
-	border-width:0 1px 1px 1px;
-	font-size:90%;
-	color:#666;
-}
-.report-find-location input.findtext {
-	margin-top:9px;
-	padding:5px 3px 0 3px;
-	height:24px;
-	float:left;
-	font-size:14px;
-	font-weight:bold;
-	color:#666;
-	width:250px;
-	border:1px #ccc solid;
-}
-.report-find-loading{
-	float:left;
-	height:31px;
-	margin:9px 0 0 3px;
-}
-a.show-more {
-	text-decoration:underline;
-	font-size:10px;
-	padding:1px 0 0 18px;
-	background:url(../img/icon-plus.gif) no-repeat 0 2px;
-	float:right;
-	margin-right:23px;
-}
-.hide{
-	display:none;
-}
-a.show-more:hover{ text-decoration:none;}
-.texthint{
-	font-style:italic;
-	font-weight:normal;
-	color:red;
-	background-color:#FFFF99;
-}
-
-
-/* View Reports / Help */
-.report_rowtitle, .org_rowtitle{
-	margin: 10px 0 5px 0;
-	padding-bottom:3px;
-	border-bottom:2px #000 solid;
-	overflow:auto;
-}
-.report_col1,
-.report_col2,
-.report_col3,
-.report_col4,
-.report_col5{
-	float:left;
-	padding-right:15px;
-}
-.report_col1{
-	width:85px;
-}
-.report_col2{
-	width:425px;
-}
-.report_col3{
-	width:85px;
-	text-align:center;
-}
-.report_col4{
-	width:105px;
-	text-align:center;
-}
-.report_col5{
-	width:105px;
-	text-align:center;
-}
-.report_row1, .report_row2, .org_row1, .org_row2{
-	clear:both;
-	overflow:auto;
-	margin:0 0 10px 0;
-	padding:5px 0 5px 0;
-}
-.report_row1, .org_row1{
-	background-color:#eee;
-}
-.report_row1 h3, .report_row2 h3, .org_row1 h3, .org_row2 h3{
-	margin:0;
-	padding:0;
-	font-size:13px;
-}
-.org_row1, .org_row2{
-	padding:5px;
-}
-.report_yes,
-.report_no{
-	font-weight:bold;
-}
-.report_yes{
-	color:#009900;
-}
-.report_no{
-	color:#990000;
-}
-.org_contact{
-	border:1px #ccc solid;
-	margin-top:15px;
-	padding:10px;
-	background:#eee;
-	clear:both;
-	overflow:hidden;
-}
-.org_contact_row{
-	margin:0 0 15px 0;
-	clear:both;
-}
-.org_contact h3{
-	margin:0 0 5px 0;
-	padding:0 0 3px 0;
-	border-bottom:1px solid #ccc;
-}
-.org_contact h4{
-	margin:0 0 5px 0;
-	padding:0;
-	font-weight:bold;
-}
-
-/* form */
-form {
-	margin:0;
-	padding:0;
-}
-.text,
-.textarea,
-.select,
-.file{
-	color:#00789F;
-	font-size:120%;
-}
-.text:focus,
-.textarea:focus,
-.select:focus,
-.file:focus{
-	background-color:#ffffcc;
-}
-.text.error,
-.textarea.error,
-.select.error,
-.file.error{
-	background-color:#FFE0DD;
-	border:1px dotted red;
-}
-label.error {
-	margin-left: 10px;
-	color:red;
-	font-style: italic;
-	width: auto;
-	display: block;
-}
-.text {
-	padding:3px 7px 3px 7px;
-	border:1px #ccc solid;
-}
-.textarea {
-	padding:7px 7px 3px 7px;
-	border:1px #ccc solid;
-}
-.select{
-	overflow:hidden;
-}
-.long{
-	width:90%;
-}
-.long2{
-	width:80%;
-	float:left;
-	margin-bottom:10px;
-}
-.short{
-	width:100px;
-}
-.btn_blue, .btn_gray{
-	padding:0 0 2px;
-	width:118px;
-	height:31px;
-	color:#fff;
-	font:14px Arial, Helvetica, sans-serif;
-	border:0;
-	cursor:pointer;	
-}
-.btn_blue{
-	background:url(../img/btn-blue.gif) no-repeat;	
-}
-.btn_gray{
-	background:url(../img/btn-gray.gif) no-repeat;	
-}
-/*-- pager --*/
-ul.pager {
-	margin:0;
-	padding:0 0 0 17px;
-}
-ul.pager li{
-	display:inline;
-	margin:0 6px 0 0;
-	font-size:10px;
-	font-weight:bold;
-	color:#555;
-	border:1px solid #bbb;
-	float:left;
-	list-style:none;
-}
-ul.pager li.first {
-	padding:0 5px;
-}
-ul.pager li a{
-	text-decoration:none;
-	color:#555;
-	padding:0 5px;
-
-}
-ul.pager li a:hover,
-ul.pager li a.active {background:#f2f7fa;}
-
-/*-----Accessible Slider CSS-----*/
-.ui-slider {clear: both; top: 5px;}
-.ui-slider  {
-	text-decoration: none !important;
-}
-.ui-slider .ui-slider-handle  {
-	overflow: visible !important;
-}
-.ui-slider .ui-slider-tooltip {
-	display: none;
-}
-.ui-slider .screenReaderContext {
-	position: absolute;
-	width: 0;
-	height: 0;
-	overflow: hidden;
-	left: -999999999px;
-}
-.ui-slider .ui-state-active .ui-slider-tooltip, .ui-slider .ui-state-focus .ui-slider-tooltip, .ui-slider .ui-state-hover .ui-slider-tooltip {
-	display: block;
-	position: absolute;
-	bottom: 2.5em;
-	text-align: center;
-	padding: .3em .2em .4em;
-	font-size: .9em;
-	width: 8em;
-	margin-left: -3.7em;
-}
-.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down, .ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
-	position: absolute; 
-	display: block;
-	width:0; 
-	height:0; 
-	border-bottom-width: 0;
-	background: none;
-}
-.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down {	
-	border-left: 7px dashed transparent; 
-	border-right: 7px dashed transparent;
-	border-top-width: 8px;
-	bottom:	-8px;
-	right: auto;
-	left: 50%;
-	margin-left: -7px;
-}
-.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
-	border-left: 6px dashed transparent; 
-	border-right: 6px dashed transparent;
-	border-top: 7px solid #fff;
-	bottom:	auto;
-	top: -9px;
-	left: -6px;
-}
-.ui-slider a {
-	text-decoration: none;
-}
-.ui-slider ol, .ui-slider li, .ui-slider dl, .ui-slider dd, .ui-slider dt {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-.ui-slider ol, .ui-slider dl {
-	position: relative;
-	top: 1.3em;
-	width: 100%;
-}
-.ui-slider dt {
-	top: 1.5em;
-	position: absolute;
-	padding-top: .2em;
-	text-align: center;
-	border-bottom: 1px dotted #ddd;
-	height: .7em;
-	color: #999;
-}
-.ui-slider dt span {
-	background: #fff;
-	padding: 0 .5em;
-}
-.ui-slider li, .ui-slider dd {
-	position: absolute;
-	overflow: visible;
-	color: #666;
-}
-.ui-slider span.ui-slider-label {
-	position: absolute;
-}
-.ui-slider li span.ui-slider-label, .ui-slider dd span.ui-slider-label {
-	display: none;
-}
-.ui-slider li span.ui-slider-label-show, .ui-slider dd span.ui-slider-label-show {
-	display: block;
-}
-.ui-slider span.ui-slider-tic {
-	position: absolute;
-	left: 0;
-	height: .8em;
-	top: -1.3em;
-}
-.ui-slider li span.ui-widget-content, .ui-slider dd span.ui-widget-content {
-	border-right: 0;
-	border-left-width: 1px;
-	border-left-style: solid;
-	border-top: 0;
-	border-bottom: 0;
-}
-.ui-slider .first .ui-slider-tic, .ui-slider .last .ui-slider-tic {
-	display: none;
-}
-/* graph */
-.graph-holder {
-	overflow:hidden;
-	width:573px;
-	height:150px;
-}
-/* error/success */
-.green-box {
-	margin:10px 0 10px 0;
-	padding:9px 0 8px;
-	background:#d8f1d8;
-	border:2px solid #a7d1a7;
-	clear:both;
-	overflow:hidden;
-}
-.red-box {
-	margin:10px 0 10px 0;
-	padding:9px 0 8px;
-	background:#FFD8D9;
-	border:2px solid #990000;
-	clear:both;
-	overflow:hidden;
-}
-.green-box h3, .red-box h3{
-	margin:0;
-	padding:0 0 0 15px; 
-	font-size:14px;
-	color:#555;
-}
-.alert_response, .thanks_msg {
-	margin:10px 15px 10px 15px;
-	border:2px #ccc solid;
-	background-color:#fff;
-	padding: 15px;
-	font:14px/17px Arial, Helvetica, sans-serif;
-}
-.alert_confirm {
-	margin:10px 0 0 0;
-	padding:10px;
-	border:1px #ccc solid;
-	background-color:#FFFFCC;
-}
-.alert_confirm .label{
-	margin-bottom:10px;
-}
-
-/*-- feedback --*/
-.feedback_forms{
-	display:none;
-	
-}
-
-.feedback_forms textarea, .feedback_forms textarea input{
-	color : #000;
-	border : 1px solid #996;
-}
-
-.feedback_forms button {
-	height : 22px;
-	border : 1px solid #000;
-	background : #ccc;
-}
-
-.feedback_title a{
-	margin : 15px 0 0 0;
-	color : #996;
-	font:17px/19px Arial, Helvetica, sans-serif;
-	text-decoration :none;
-}
-
-.or_txt {
-	padding : 0 10px 0 10px;
-	font:14px/17px Arial, Helvetica, sans-serif;
-}
-
-.detailed_feedback {
-	text-align : center;
-	padding: 10px 0 0 0;
-	width : 150px;
-	height : 50px;
-	border : 1px solid #000;
-	background : #ccc;
-	
-}
-
-.detailed_feedback a {
-	color : #000;
-	font:14px/17px Arial, Helvetica, sans-serif;
-	text-decoration :none;
-}
diff --git a/themes/default/css/accordion.css b/themes/default/css/accordion.css
new file mode 100644
index 0000000000..99c1816d1c
--- /dev/null
+++ b/themes/default/css/accordion.css
@@ -0,0 +1,48 @@
+/**
+ * JQueryUI theme overrides for accordion
+ * Used by the slider on the reports page
+ */
+
+#accordion .ui-accordion-header .ui-icon {
+	right: .5em;
+}
+.ui-accordion .ui-accordion-header a {
+	padding: 0.5em 2.2em 0.5em 0.5em;
+	color: #797979;
+	font-weight: bold;
+}
+#accordion .ui-accordion-header .small-link-button {
+	position: absolute;
+	top: 0;
+	right: 0;
+	display: inline-block;
+	font-size: .9em;
+	font-weight: normal;
+	text-decoration: underline;
+}
+
+/* Active state */
+.ui-state-active, .ui-widget-content .ui-state-active {
+	background: #efefef url(../images/bg_filter-accordion-title.png) top repeat-x;
+}
+.ui-state-active a.f-title {
+	color: #2f4079;
+}
+.ui-accordion .ui-accordion-content {
+	background: #efefef;
+}
+
+/* Content area */
+.ui-accordion .ui-accordion-content {
+	padding: 0 8px 18px 8px;
+	font-size: 11px;
+}
+.ui-accordion .ui-accordion-content p {
+	margin-bottom: 8px;
+}
+.ui-accordion .ui-accordion-content a {
+	color: #1f5e82;
+}
+.ui-accordion .ui-accordion-content a.reset, .ui-accordion .ui-accordion-header a.reset, a.reset {
+	color: #981e01;
+}
\ No newline at end of file
diff --git a/themes/default/css/base.css b/themes/default/css/base.css
new file mode 100644
index 0000000000..0941bbd05a
--- /dev/null
+++ b/themes/default/css/base.css
@@ -0,0 +1,389 @@
+/**
+ * Ushahidi Base CSS
+ *
+ * This is a minimal set of styling with just enough to still have the map and
+ * other JS work. Don't override this in your theme unless you really need to.
+ */
+
+/* reset */
+body, div, dl, dt, dd, ul, ol, li, pre, form, fieldset, input, textarea, p, blockquote, th, td {
+	margin: 0;
+	padding: 0;
+}
+
+fieldset, img {
+	border: 0;
+}
+
+html {
+	height: 100%;
+	margin-bottom: 1px;
+}
+
+body {
+	position: relative;
+}
+
+/* links */
+a {
+	color: #3764aa;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #008cff;
+	text-decoration: underline;
+}
+
+/* header elements */
+h1, h2, h3, h4, h5, h6 {
+	font-family: Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	margin-top: 0;
+	padding: 0;
+}
+
+h1 {
+	font-size: 150%;
+	color: #004276;
+}
+
+h2 {
+	font-size: 125%;
+	color: #004276;
+	margin-bottom: .2em;
+}
+
+h3 {
+	font-size: 150%;
+	color: #333333;
+}
+
+h4 {
+	font-size: 175%;
+	color: #333333;
+}
+
+h5 {
+	font-size: 150%;
+	color: #333333;
+	margin-bottom: 10px;
+}
+
+h6 {
+	font-size: 125%;
+	color: #333333;
+}
+
+/* page setup */
+body {
+	font-family: Arial, Helvetica, sans-serif;
+	color: #333333;
+	font-size: 12px;
+}
+
+/* left column */
+div#left {
+	width: 200px;
+}
+
+div#middle .layoutleft div#left {
+	float: left;
+}
+
+div#middle .layoutright div#left {
+	float: right;
+}
+
+/* right column */
+div#right {
+	width: 285px;
+	float: right;
+}
+
+/* right column (width: 50%) */
+div#equalright {
+	width: 50%;
+	padding: 0px;
+	float: right;
+}
+
+/* content column */
+div#main {
+}
+
+div#mainmiddle {
+}
+
+div#main .withoutright {
+}
+
+div#content {
+}
+
+div#main .withright div#content {
+}
+
+div#main .withoutright div#content {
+}
+
+/* footer */
+div#footer {
+	width: auto;
+	clear: both;
+}
+
+div#underfooter {
+	width: auto;
+}
+
+/* clearing & floating */
+.clearingfix:after {
+	content: ".";
+	display: block;
+	line-height: 0px;
+	clear: both;
+	visibility: hidden;
+}
+.clear {
+	clear: both;
+}
+
+.clearingfix {
+	display: block;
+}
+
+.floatbox {
+	overflow: hidden;
+}
+
+.hide {
+	display: none;
+}
+
+/* Map */
+/* Map container div - must have a height set */
+div.map {
+	border: #999 1px solid;
+	width: 573px;
+	height: 480px;
+}
+
+#mapStatus {
+	float: left;
+	background-color: #e1e1e1;
+	border-left: solid 1px #999;
+	border-right: solid 1px #999;
+	border-bottom: solid 1px #999;
+	font-size: 10px;
+	width: 573px;
+}
+
+#mapStatus div {
+	float: left;
+	display: inline-block;
+	padding: 4px 6px 4px 6px;
+	border-right: solid 1px #999;
+}
+#mapMousePosition {
+	min-width: 135px;
+	text-align: center;
+}
+
+#mapOutput sup {
+	height: 0;
+	line-height: 1;
+	vertical-align: text-top;
+	position: relative;
+	font-size: 8px;
+}
+
+div.graph-holder {
+	height: 150px;
+	overflow: hidden;
+	width: 573px;
+}
+
+div.slider-holder {
+	font-size: 70%;
+	height: 70px;
+	margin-top: 1em;
+	width: 554px;
+	padding-left: 1em;
+}
+
+div.slider-holder label {
+	color: #666666;
+}
+
+/* Category filter lists - give basic indenting back (for categories) */
+ul {
+	padding-left: 1.5em;
+}
+
+/* Reports page */
+/* Reports/Filters Layout */
+/* basic styling on reports and filters for convenience */
+#reports-box {
+	float: left;
+	width: 600px;
+}
+#filters-box {
+	float: left;
+	width: 280px;
+	margin-left: 20px;
+}
+.f-clear {
+	float: right;
+}
+.report-stats-container {
+	clear: both;
+}
+
+/* Set initial state to hidden for elements that have JS show/hide functions */
+.btn-less {
+	display: none;
+}
+.r_categories, .r_location {
+	display: none;
+}
+#tooltip-box {
+	display: none;
+}
+/* Map container divs - must have a height set*/
+.f-location-box .rb_location-radius {
+	width: 259px;
+	height: 280px;
+}
+#rb_map-view {
+	display: none;
+	width: 590px;
+	height: 384px;
+}
+/* Highlight select categories */
+ul.filter-list li a.selected {
+	background: #DBDBDB;
+}
+
+/* Report submit - map and controls */
+.report_map {
+	overflow: hidden;
+	width: 100%;
+	width: 450px;
+	height: 350px;
+	position: relative;
+}
+.report-find-location .btns {
+	float: left;
+}
+.report-find-location .btns ul {
+	padding: 4px;
+}
+.report-find-location .btn_find {
+	float: left;
+	margin: 10px 0 0 5px;
+}
+.report-find-location input.findtext {
+	margin-top: 9px;
+	padding: 5px 3px 0 3px;
+	height: 24px;
+	float: left;
+	font-size: 14px;
+	font-weight: bold;
+	color: #666;
+	width: 250px;
+	border: 1px #ccc solid;
+}
+.report-find-loading {
+	float: left;
+	height: 31px;
+	margin: 9px 0 0 3px;
+}
+
+/* Get Alerts page */
+.step-1 .map-wrapper .map-holder {
+	overflow: hidden;
+	width: 387px;
+	height: 325px;
+}
+.step-1 .alert_slider {
+	padding: 15px 15px 35px 15px;
+}
+
+/*-- Buttons --*/
+.btns ul {
+	margin: 0;
+	padding: 9px 10px 0;
+	clear: both;
+	overflow: hidden;
+	font-size: 90%;
+}
+.btns ul li {
+	padding: 0 2px;
+	float: left;
+	list-style: none;
+}
+.btns ul li a {
+	padding: 0 6px;
+	color: #5c5c5c;
+	background: #f2f7fa;
+	float: left;
+	line-height: 24px;
+	text-decoration: none;
+	border: 1px solid #d1d1d1;
+}
+.btns ul li a.btns_red {
+	background: #FFE9EC;
+}
+.btns ul li a.btns_gray {
+	background: #eee;
+}
+.btns ul li a:hover {
+	text-decoration: underline;
+}
+/*-- / Button --*/
+
+/* Map Labeler */
+#geometryLabelerHolder {
+	position: absolute;
+	bottom: 0;
+	display: none;
+	width: 100%;
+	background-color: #00008b;
+	opacity: 0.8;
+	z-index: 5000;
+}
+#geometryLabeler {
+	padding: 10px;
+}
+#geometryLabeler label {
+	font-weight: bold;
+	color: #fff;
+	margin-right: 5px;
+}
+#geometryLabeler .lbl_text {
+	width: 80px;
+	margin-right: 15px;
+}
+#geometryLabeler .lbl_text2 {
+	width: 180px;
+}
+#geometryLabeler #geometryLabelComment {
+	padding-bottom: 7px;
+	margin-bottom: 7px;
+	border-bottom: 1px dotted #fff;
+}
+#geometryLat, #geometryLon {
+	display: none;
+}
+#geometryLabelerClose {
+	z-index: 5001;
+	position: absolute;
+	top: 2px;
+	right: 0;
+	width: 18px;
+	height: 18px;
+	background: url("../../../media/img/openlayers/layer-switcher-minimize.png") no-repeat;
+	cursor: pointer;
+}
+
diff --git a/themes/default/css/slider.css b/themes/default/css/slider.css
new file mode 100644
index 0000000000..272bbeb26f
--- /dev/null
+++ b/themes/default/css/slider.css
@@ -0,0 +1,107 @@
+/**
+ * UI Slider CSS
+ * Used by the slider on the main map page
+ */
+
+/*-----UI Slider CSS-----*/
+.ui-slider { clear: both; top: 5px; text-decoration: none !important; }
+.ui-slider .ui-slider-handle  { overflow: visible !important; }
+.ui-slider .ui-slider-tooltip { display: none; }
+.ui-slider .screenReaderContext {
+    position: absolute;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    left: -999999999px;
+}
+.ui-slider .ui-state-active .ui-slider-tooltip, .ui-slider .ui-state-focus .ui-slider-tooltip, .ui-slider .ui-state-hover .ui-slider-tooltip {
+    display: block;
+    position: absolute;
+    bottom: 2.5em;
+    text-align: center;
+    padding: .3em .2em .4em;
+    font-size: .9em;
+    width: 8em;
+    margin-left: -3.7em;
+}
+.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down, .ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
+    position: absolute; 
+    display: block;
+    width:0; 
+    height:0; 
+    border-bottom-width: 0;
+    background: none;
+}
+.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down {    
+    border-left: 7px dashed transparent; 
+    border-right: 7px dashed transparent;
+    border-top-width: 8px;
+    bottom:    -8px;
+    right: auto;
+    left: 50%;
+    margin-left: -7px;
+}
+.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
+    border-left: 6px dashed transparent; 
+    border-right: 6px dashed transparent;
+    border-top: 7px solid #fff;
+    bottom:    auto;
+    top: -9px;
+    left: -6px;
+}
+.ui-slider a {
+    text-decoration: none;
+}
+.ui-slider ol, .ui-slider li, .ui-slider dl, .ui-slider dd, .ui-slider dt {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+.ui-slider ol, .ui-slider dl {
+    position: relative;
+    top: 1.3em;
+    width: 100%;
+}
+.ui-slider dt {
+    top: 1.5em;
+    position: absolute;
+    padding-top: .2em;
+    text-align: center;
+    border-bottom: 1px dotted #ddd;
+    height: .7em;
+    color: #999;
+}
+.ui-slider dt span {
+    background: #fff;
+    padding: 0 .5em;
+}
+.ui-slider li, .ui-slider dd {
+    position: absolute;
+    overflow: visible;
+    color: #666;
+}
+.ui-slider span.ui-slider-label {
+    position: absolute;
+}
+.ui-slider li span.ui-slider-label, .ui-slider dd span.ui-slider-label {
+    display: none;
+}
+.ui-slider li span.ui-slider-label-show, .ui-slider dd span.ui-slider-label-show {
+    display: block;
+}
+.ui-slider span.ui-slider-tic {
+    position: absolute;
+    left: 0;
+    height: .8em;
+    top: -1.3em;
+}
+.ui-slider li span.ui-widget-content, .ui-slider dd span.ui-widget-content {
+    border-right: 0;
+    border-left-width: 1px;
+    border-left-style: solid;
+    border-top: 0;
+    border-bottom: 0;
+}
+.ui-slider .first .ui-slider-tic, .ui-slider .last .ui-slider-tic {
+    display: none;
+}
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index aedb189289..88d21e37c2 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -1,34 +1,12 @@
-/* Handcoded by RapidxHTML - htp://www.rapidxhtml.com */
+/**
+ * Ushahidi Default theme styling
+ * 
+ * You can reuse this in your theme or replace it completely by include a 
+ * style.css file in your theme.
+ */
 
-/* reset */
-body,div,dl,dt,dd,ul,ol,li,pre,form,fieldset,input,textarea,p,blockquote,th,td {
-    margin: 0;
-    padding: 0;
-}
-
-fieldset,img {
-    border: 0;
-}
-
-html {
-    height: 100%;
-    margin-bottom: 1px;
-}
-
-body {
-    position: relative;
-}
-
-/* links */
-a {
-    color: #3764aa;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #008cff;
-    text-decoration: underline;
-}
+/* Reset again after base.css */
+ul { padding: 0; }
 
 /* header elements */
 h1, h2, h3, h4, h5, h6 {
@@ -212,26 +190,6 @@ div#underfooter{
     z-index: -1;
 }
 
-/* clearing & floating */
-.clearingfix:after{
-    content: ".";
-    display: block;
-    line-height: 0px;
-    clear: both;
-    visibility: hidden;
-}
-.clear {
-	clear: both;
-}
-
-.clearingfix{
-    display: block;
-}
-
-.floatbox{
-    overflow: hidden;
-}
-
 /* searchbox */
 div#searchbox{
     position: absolute;
@@ -482,6 +440,26 @@ div.slider-holder label{
     color: #666666;
 }
 
+/* Slider play button - no longer used */
+.slider-holder .play{
+    float:right;
+    border:1px solid #ccc;
+    background-color:#eee;
+    padding:3px 6px 3px 15px;
+    color:#666;
+    font-weight:bold;
+    background-image:url(../images/arrow-play.gif);
+    background-position:5px 50%;
+    background-repeat:no-repeat;
+    font-size:1.2em;
+}
+
+.slider-holder .pause { background-image:url(../images/pause.gif); }
+.slider-holder .play a { color:#666; text-decoration:none; }
+.slider-holder .play:hover{ background-color:#ffffcc; }
+.slider-holder .play a:hover{ text-decoration:underline; }
+
+
 /* category filters */
 div.cat-filters{
     font-size: 85%;
@@ -507,7 +485,9 @@ div.cat-filters span a{
     color:#666;
 }
 
-ul.category-filters{
+ul.category-filters, ul.category-filters ul { margin-left: 0; }
+
+ul.category-filters {
     background: #E7E3DA;
     border-top: #C7C2BC 7px solid;
     border-bottom: #C7C2BC 7px solid;
@@ -1047,127 +1027,6 @@ div.incident-notation ul li{
 	float:left;padding-right:5px;
 }
 
-/*-----UI Slider CSS-----*/
-.ui-slider { clear: both; top: 5px; text-decoration: none !important; }
-.ui-slider .ui-slider-handle  { overflow: visible !important; }
-.ui-slider .ui-slider-tooltip { display: none; }
-.ui-slider .screenReaderContext {
-    position: absolute;
-    width: 0;
-    height: 0;
-    overflow: hidden;
-    left: -999999999px;
-}
-.ui-slider .ui-state-active .ui-slider-tooltip, .ui-slider .ui-state-focus .ui-slider-tooltip, .ui-slider .ui-state-hover .ui-slider-tooltip {
-    display: block;
-    position: absolute;
-    bottom: 2.5em;
-    text-align: center;
-    padding: .3em .2em .4em;
-    font-size: .9em;
-    width: 8em;
-    margin-left: -3.7em;
-}
-.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down, .ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
-    position: absolute; 
-    display: block;
-    width:0; 
-    height:0; 
-    border-bottom-width: 0;
-    background: none;
-}
-.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down {    
-    border-left: 7px dashed transparent; 
-    border-right: 7px dashed transparent;
-    border-top-width: 8px;
-    bottom:    -8px;
-    right: auto;
-    left: 50%;
-    margin-left: -7px;
-}
-.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
-    border-left: 6px dashed transparent; 
-    border-right: 6px dashed transparent;
-    border-top: 7px solid #fff;
-    bottom:    auto;
-    top: -9px;
-    left: -6px;
-}
-.ui-slider a {
-    text-decoration: none;
-}
-.ui-slider ol, .ui-slider li, .ui-slider dl, .ui-slider dd, .ui-slider dt {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-.ui-slider ol, .ui-slider dl {
-    position: relative;
-    top: 1.3em;
-    width: 100%;
-}
-.ui-slider dt {
-    top: 1.5em;
-    position: absolute;
-    padding-top: .2em;
-    text-align: center;
-    border-bottom: 1px dotted #ddd;
-    height: .7em;
-    color: #999;
-}
-.ui-slider dt span {
-    background: #fff;
-    padding: 0 .5em;
-}
-.ui-slider li, .ui-slider dd {
-    position: absolute;
-    overflow: visible;
-    color: #666;
-}
-.ui-slider span.ui-slider-label {
-    position: absolute;
-}
-.ui-slider li span.ui-slider-label, .ui-slider dd span.ui-slider-label {
-    display: none;
-}
-.ui-slider li span.ui-slider-label-show, .ui-slider dd span.ui-slider-label-show {
-    display: block;
-}
-.ui-slider span.ui-slider-tic {
-    position: absolute;
-    left: 0;
-    height: .8em;
-    top: -1.3em;
-}
-.ui-slider li span.ui-widget-content, .ui-slider dd span.ui-widget-content {
-    border-right: 0;
-    border-left-width: 1px;
-    border-left-style: solid;
-    border-top: 0;
-    border-bottom: 0;
-}
-.ui-slider .first .ui-slider-tic, .ui-slider .last .ui-slider-tic {
-    display: none;
-}
-
-.slider-holder .play{
-    float:right;
-    border:1px solid #ccc;
-    background-color:#eee;
-    padding:3px 6px 3px 15px;
-    color:#666;
-    font-weight:bold;
-    background-image:url(../images/arrow-play.gif);
-    background-position:5px 50%;
-    background-repeat:no-repeat;
-    font-size:1.2em;
-}
-
-.slider-holder .pause { background-image:url(../images/pause.gif); }
-.slider-holder .play a { color:#666; text-decoration:none; }
-.slider-holder .play:hover{ background-color:#ffffcc; }
-.slider-holder .play a:hover{ text-decoration:underline; }
-
 /* Stylized Forms */
 form {
     margin:0;
@@ -1236,8 +1095,6 @@ label.error {
     border: 0;    
 }
 
-.hide { display:none; }
-
 .report_left{ float:left; width:450px; margin:20px 0 0; padding:0 0 10px; }
 .report_left table { width: 100%; }
 .report_left table tr th { text-align: left; }
@@ -1481,18 +1338,19 @@ a.show-more {
     padding:0 0 8px;
     font:12px/15px Arial, Helvetica, sans-serif;
 }
-.step-1 .map {
+.step-1 .map-wrapper {
     overflow:hidden;
     width:407px;
     padding:10px;
     margin:10px 0 0 0;
+    border: #999 1px solid;
 }
-.step-1 .map p {
+.step-1 .map-wrapper p {
     margin:0;
     padding:0 0 6px;
     font:12px/15px Arial, Helvetica, sans-serif;
 }
-.step-1 .map .map-holder {
+.step-1 .map-wrapper .map-holder {
     overflow:hidden;
     width:387px;
     height:325px;
@@ -1869,75 +1727,6 @@ span.private {
     border-bottom-left-radius: 0px;
 }
 
-/*-- btns --*/
-.btns ul{
-    margin:0;
-    padding:9px 10px 0;
-    clear:both;
-    overflow:hidden;
-    font-size:90%;
-}
-.btns ul li{
-    padding:0 2px;
-    float:left;
-    list-style:none;
-}
-.btns ul li a{
-    padding:0 6px;
-    color:#5c5c5c;
-    background:#f2f7fa;
-    float:left;
-    line-height:24px;
-    text-decoration:none;
-    border:1px solid #d1d1d1;
-}
-.btns ul li a.btns_red{ background:#FFE9EC; }
-.btns ul li a.btns_gray{ background:#eee; }
-.btns ul li a:hover{ text-decoration:underline;}
-/*-- btns --*/
-
-/* Map Labeler */    
-#geometryLabelerHolder{
-    position:absolute;
-    bottom:0;
-    display:none;
-    width:100%;
-    background-color:#00008b;
-    opacity:0.8;
-    z-index:5000;
-}
-#geometryLabeler{ padding:10px; }
-#geometryLabeler label {
-    font-weight:bold;
-    color:#fff;
-    margin-right:5px;
-}
-#geometryLabeler .lbl_text{
-    width:80px;
-    margin-right:15px;
-}
-#geometryLabeler .lbl_text2{
-    width:180px;
-}
-#geometryLabeler #geometryLabelComment{
-    padding-bottom:7px;
-    margin-bottom:7px;
-    border-bottom:1px dotted #fff;
-}
-#geometryLat, #geometryLon{
-    display:none;
-}
-#geometryLabelerClose{
-    z-index:5001;
-    position:absolute;
-    top:2px;
-    right:0;
-    width:18px;
-    height:18px;
-    background: url("../../../media/img/openlayers/layer-switcher-minimize.png") no-repeat;
-    cursor: pointer;
-}
-
 /* 
 Theme Name: Front-End Reports Filtering
 Description: Markup for Front-End Reports Filtering
@@ -2183,35 +1972,9 @@ a.btn-show { display:none; }
 .loading-reports {width: 100%; margin-top: 100px; text-align: center;}
 .loading-reports h3 { padding: 10px 2px; }
 
-/* jquery UI theme overrides for accordion */
-#accordion .ui-accordion-header .ui-icon { right:.5em; }
-.ui-accordion .ui-accordion-header a { padding:0.5em 2.2em 0.5em 0.5em; color:#797979; font-weight:bold; }
-#accordion .ui-accordion-header .small-link-button { 
-    position:absolute; 
-    top:0;
-    right:0;
-    display:inline-block;
-    font-size:.9em;
-    font-weight:normal;
-    text-decoration:underline;
-}
-
-/* Active state */
-.ui-state-active, .ui-widget-content .ui-state-active { background:#efefef url(../images/bg_filter-accordion-title.png) top repeat-x; }
-.ui-state-active a.f-title { color:#2f4079; }
-.ui-accordion .ui-accordion-content { background:#efefef; }
-
-/* Content area */
-.ui-accordion .ui-accordion-content { padding:0 8px 18px 8px; font-size:11px; }
-.ui-accordion .ui-accordion-content p { margin-bottom:8px; } 
-.ui-accordion .ui-accordion-content a { color:#1f5e82;  }
-.ui-accordion .ui-accordion-content a.reset,
-.ui-accordion .ui-accordion-header a.reset, a.reset { color:#981e01;  }
-
 /* Filter content boxes */
 .f-category-box { height:258px; }
-.f-location-box .map { width: 259px !important; height: 280px !important; padding: 0; margin: 0;}
-.f-location-box .rb_location-radius { width: 255px; height: 275px; }
+.f-location-box .rb_location-radius { width: 259px; height: 280px; border: #999 1px solid; }
 .f-type-box {}
 .f-verification-box {}
 .f-media-box {}
diff --git a/themes/default/views/alerts/radius.php b/themes/default/views/alerts/radius.php
index 101fb6883a..494ae8164d 100644
--- a/themes/default/views/alerts/radius.php
+++ b/themes/default/views/alerts/radius.php
@@ -12,7 +12,7 @@
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */
 ?>
-	<div class="map">
+	<div class="map-wrapper">
 	<?php if ($show_usage_info): ?>
 		<p><?php echo Kohana::lang('ui_main.alerts_place_spot'); ?></p>
 	<?php endif; ?>

From be48891784522176bf3b93015a8819ed272589cf Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Wed, 27 Jun 2012 17:00:53 +1200
Subject: [PATCH 08/30] Switch themes to only include a limited set of CSS
 files by default #550

* Allow themes to specify addition css/js files to include in readme.txt
* Only include _default.css, style.css or THEMENAME.css by default
* Update existing themes to specify JS files
---
 application/helpers/addon.php                 |  5 +-
 application/hooks/register_themes.php         | 69 ++++++++++++++-----
 .../css/{cumulus.css => ci_cumulus.css}       |  0
 themes/ci_cumulus/readme.txt                  |  3 +-
 themes/default/readme.txt                     |  2 +
 themes/polaroid/readme.txt                    |  2 +-
 6 files changed, 61 insertions(+), 20 deletions(-)
 rename themes/ci_cumulus/css/{cumulus.css => ci_cumulus.css} (100%)

diff --git a/application/helpers/addon.php b/application/helpers/addon.php
index f8c1a98b48..b128813f53 100644
--- a/application/helpers/addon.php
+++ b/application/helpers/addon.php
@@ -46,7 +46,10 @@ public static function get_addons($type, $include_meta = TRUE)
 				'Author' => "",
 				'Author Email' => "",
 				'Template_Dir' => "",
-				'Checkins' => 0
+				'Checkins' => 0,
+				'Base Theme' => 'default',
+				'CSS' => '',
+				'JS' => '',
 			);
 		}
 
diff --git a/application/hooks/register_themes.php b/application/hooks/register_themes.php
index 454e338fad..34183964e5 100755
--- a/application/hooks/register_themes.php
+++ b/application/hooks/register_themes.php
@@ -38,7 +38,7 @@ public function __construct()
 	 */
 	public function register()
 	{
-		$this->themes = addon::get_addons('theme', FALSE);
+		$this->themes = addon::get_addons('theme', TRUE);
 		
 		$theme = Kohana::config("settings.site_style");
 		$theme = empty($theme) ? 'default' : $theme;
@@ -60,7 +60,7 @@ private function _load_theme($theme)
 		$this->loaded_themes[] = $theme;
 		
 		// Get meta data to check the base theme
-		$meta = addon::meta_data($theme, 'theme', array('Base Theme' => 'default'));
+		$meta = $this->themes[$theme];
 		
 		// If base theme is set, the base theme exists, and we haven't loaded it yet
 		// Load the base theme
@@ -98,15 +98,34 @@ private function _load_theme($theme)
 	 */
 	private function load_theme_css($theme)
 	{
-		$css_dir = THEMEPATH.$theme.'/css';
-		if ( is_dir($css_dir) )
+		$meta = $this->themes[$theme];
+		// Add special cases for old themes
+		if (empty($meta['CSS']))
 		{
-			$css = dir($css_dir); // Load all the themes css files
-			while (($css_file = $css->read()) !== FALSE)
-				if (preg_match('/\.css/i', $css_file))
-				{
-					$this->theme_css[str_replace('.css','',$css_file)] = "themes/$theme/css/$css_file";
-				}
+			$meta['CSS'] = array();
+			$meta['CSS'][] = 'base';
+			$meta['CSS'][] = 'style';
+			$meta['CSS'][] = '_default';
+			$meta['CSS'][] = $theme;
+		}
+		else
+		{
+			$meta['CSS'] = explode(',', $meta['CSS']);
+			$meta['CSS'] = array_map('trim',$meta['CSS']);
+		}
+		
+		// Add specified theme stylesheets
+		foreach ($meta['CSS'] as $css)
+		{
+			if (file_exists(THEMEPATH."$theme/css/$css.css"))
+				$this->theme_css[$css] = "themes/$theme/css/$css";
+		}
+		
+		// Check for overrides of already added stylesheets
+		foreach ($this->theme_css as $css => $path)
+		{
+			if (file_exists(THEMEPATH."$theme/css/$css.css"))
+				$this->theme_css[$css] = "themes/$theme/css/$css";
 		}
 	}
 
@@ -115,14 +134,30 @@ private function load_theme_css($theme)
 	 */
 	private function load_theme_js($theme)
 	{
-		if ( is_dir(THEMEPATH.$theme.'/js') )
+		$meta = $this->themes[$theme];
+		// Add special cases for old themes
+		if (empty($meta['JS']))
 		{
-			$js = dir(THEMEPATH.$theme.'/js'); // Load all the themes js files
-			while (($js_file = $js->read()) !== FALSE)
-				if (preg_match('/\.js/i', $js_file))
-				{
-					$this->theme_js[str_replace('.js','',$js_file)] = "themes/$theme/js/$js_file";
-				}
+			$meta['JS'] = array();
+		}
+		else
+		{
+			$meta['JS'] = explode(',', $meta['JS']);
+			$meta['JS'] = array_map('trim',$meta['JS']);
+		}
+		
+		// Add specified theme js
+		foreach ($meta['JS'] as $js)
+		{
+			if (file_exists(THEMEPATH."$theme/js/$js.js"))
+				$this->theme_js[$js] = "themes/$theme/js/$js";
+		}
+		
+		// Check for overrides of already added js
+		foreach ($this->theme_css as $js => $path)
+		{
+			if (file_exists(THEMEPATH."$theme/js/$js.js"))
+				$this->theme_js[$js] = "themes/$theme/js/$js";
 		}
 	}
 }
diff --git a/themes/ci_cumulus/css/cumulus.css b/themes/ci_cumulus/css/ci_cumulus.css
similarity index 100%
rename from themes/ci_cumulus/css/cumulus.css
rename to themes/ci_cumulus/css/ci_cumulus.css
diff --git a/themes/ci_cumulus/readme.txt b/themes/ci_cumulus/readme.txt
index 0b1f80dda4..967ed01293 100644
--- a/themes/ci_cumulus/readme.txt
+++ b/themes/ci_cumulus/readme.txt
@@ -4,4 +4,5 @@ Demo: http://ushahidi.com/
 Version: 1.0
 Author: Brian Herbert
 Author Email: brian@ushahidi.com
-Checkins: 1
\ No newline at end of file
+Checkins: 1
+JS: jquery.timeago
\ No newline at end of file
diff --git a/themes/default/readme.txt b/themes/default/readme.txt
index 7aa65a2939..7a29b6b623 100644
--- a/themes/default/readme.txt
+++ b/themes/default/readme.txt
@@ -4,3 +4,5 @@ Version: 1.0
 Author: Ushahidi
 Author Email: team@ushahidi.com
 Demo: http://www.ushahidi.com
+CSS: base,accordion,slider,style
+JS: 
diff --git a/themes/polaroid/readme.txt b/themes/polaroid/readme.txt
index dbb5268f28..028de7fa72 100644
--- a/themes/polaroid/readme.txt
+++ b/themes/polaroid/readme.txt
@@ -3,7 +3,7 @@ Description: NOTE: Polaroid requires you to change additional settings -> http:/
 Version: 1.1
 Author: Caleb Bell
 Author Email: caleb@ushahidi.com
-
+JS: initialize,_jquery.colorbox-min,_jquery.isotope.min
 
 ===INSTALLATION===
 1. Activate the theme

From 3b0eb4dc87200e2cfb26f0ee6e7c69bd7e0fdbaa Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Thu, 28 Jun 2012 12:03:44 +1200
Subject: [PATCH 09/30] Make Requirements::themedCSS() work and allow themes to
 override more css #301

* Can now override openlayers.css and jquery-ui-themeroller.css
* themedCSS() will search for CSS in themes, then module (ie. plugin)
  then media/css
---
 application/hooks/register_themes.php  |  2 ++
 application/libraries/Requirements.php | 24 +++++++++++++++++-------
 application/libraries/Themes.php       |  5 +++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/application/hooks/register_themes.php b/application/hooks/register_themes.php
index 34183964e5..5623799eb3 100755
--- a/application/hooks/register_themes.php
+++ b/application/hooks/register_themes.php
@@ -47,6 +47,8 @@ public function register()
 		// Save theme CSS and JS for inclusion later
 		Kohana::config_set('settings.site_style_js', $this->theme_js);
 		Kohana::config_set('settings.site_style_css', $this->theme_css);
+		// Save loaded themes for use by Requirements library
+		Kohana::config_set('settings.site_styles_loaded', $this->loaded_themes);
 	}
 	
 	/**
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index 7fe0875ff5..6356df6954 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -986,16 +986,26 @@ function get_custom_scripts() {
 	 * @see Requirements::themedCSS()
 	 */
 	public function themedCSS($name, $module = null, $media = null) {
-		$theme = Kohana::config("settings.site_style");
-		$path  = THEMEPATH . Kohana::config("settings.site_style") . "/css/$name.css";
-
-		if (file_exists($path)) {
-			$this->css($path, $media);
-			return;
+		// try to include from a loaded theme
+		foreach (Kohana::config("settings.site_styles_loaded") as $theme)
+		{
+			$path  = THEMEPATH . "$theme/css/$name.css";
+			if (file_exists($path)) {
+				$this->css("themes/$theme/css/$name.css", $media);
+				return;
+			}
 		}
 
-		if ($module) {
+		// Try to include from fall back module
+		if ($module AND file_exists(DOCROOT . "$module/css/$name.css")) {
 			$this->css("$module/css/$name.css", $media);
+			return;
+		}
+		
+		// Try to include from global media
+		if (file_exists(DOCROOT . "media/css/$name.css")) {
+			$this->css("media/css/$name.css", $media);
+			return;
 		}
 	}
 	
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 22e2404a61..d73822fcc3 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -80,7 +80,8 @@ public function admin_header_block()
 	 */
 	private function _header_css()
 	{
-		Requirements::css("media/css/jquery-ui-themeroller");
+		Requirements::clear();
+		Requirements::themedCSS("jquery-ui-themeroller");
 
 		Requirements::customHeadTags("<!--[if lte IE 7]>".html::stylesheet($this->css_url."media/css/iehacks","",TRUE)."<![endif]-->",'iehacks');
 		Requirements::customHeadTags("<!--[if IE 7]>".html::stylesheet($this->css_url."media/css/ie7hacks","",TRUE)."<![endif]-->",'ie7hacks');
@@ -88,7 +89,7 @@ private function _header_css()
 
 		if ($this->map_enabled)
 		{
-			Requirements::css("media/css/openlayers");
+			Requirements::themedCSS("openlayers");
 		}
 
 		if ($this->treeview_enabled)

From 4f816226f7d4ce6cdfcc724db9c059b0e948d2f4 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Thu, 28 Jun 2012 14:28:03 +1200
Subject: [PATCH 10/30] Add support for IE stylesheets to Requirements #338

* Move iehacks CSS into default theme
* Added Requirements::ieCSS() and Requirements::ieThemedCSS()
---
 application/libraries/Requirements.php     | 61 +++++++++++++++++++---
 application/libraries/Themes.php           |  6 +--
 {media => themes/default}/css/ie6hacks.css |  2 +-
 {media => themes/default}/css/ie7hacks.css |  2 +-
 {media => themes/default}/css/iehacks.css  |  0
 5 files changed, 58 insertions(+), 13 deletions(-)
 rename {media => themes/default}/css/ie6hacks.css (80%)
 rename {media => themes/default}/css/ie7hacks.css (85%)
 rename {media => themes/default}/css/iehacks.css (100%)

diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index 6356df6954..9c097d4b97 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -159,8 +159,8 @@ static function css($file, $media = null) {
 	 * A CSS file in the current theme path name "themename/css/$name.css" is
 	 * first searched for, and it that doesn't exist and the module parameter is
 	 * set then a CSS file with that name in the module is used.
-	 *
-	 * NOTE: This API is experimental and may change in the future.
+	 * If neither theme nor module css exists, then a file from media/css will
+	 * be used.
 	 *
 	 * @param string $name The name of the file - e.g. "/css/File.css" would have
 	 *        the name "File".
@@ -171,6 +171,32 @@ static function css($file, $media = null) {
 	public static function themedCSS($name, $module = null, $media = null) {
 		return self::backend()->themedCSS($name, $module, $media);
 	}
+	
+	/**
+	 * Registers the given stylesheet in an IE conditional comment
+	 *
+	 * @param string $version The conditional IE version string e.g. "lt IE 7"
+	 * @param string $name The name of the file - e.g. "/css/File.css" would have
+	 *        the name "File".
+	 * @param string $media The CSS media attribute.
+	 */
+	public static function ieCSS($version, $name, $media = null) {
+		return self::backend()->ieCSS($version, $name, $media);
+	}
+	
+	/**
+	 * Registers an IE themeable stylesheet 
+	 *
+	 * @param string $version The conditional IE version string e.g. "lt IE 7"
+	 * @param string $name The name of the file - e.g. "/css/File.css" would have
+	 *        the name "File".
+	 * @param string $module The module to fall back to if the css file does not
+	 *        exist in the current theme.
+	 * @param string $media The CSS media attribute.
+	 */
+	public static function ieThemedCSS($version, $name, $module = null, $media = null) {
+		return self::backend()->ieThemedCSS($version, $name, $module, $media);
+	}
 
 	/**
 	 * Clear either a single or all requirements.
@@ -986,26 +1012,45 @@ function get_custom_scripts() {
 	 * @see Requirements::themedCSS()
 	 */
 	public function themedCSS($name, $module = null, $media = null) {
+		$this->css($this->themedCSSPath($name, $module), $media);
+		return;
+	}
+
+	/**
+	 * @see Requirements::ieCSS()
+	 */
+	public function ieCSS($version, $name, $media = null) {
+		Requirements::customHeadTags("<!--[if $version]>".html::stylesheet(url::file_loc('css').$name,$media,TRUE)."<![endif]-->",'iecss-'.$name);
+		return;
+	}
+
+	/**
+	 * @see Requirements::ieThemedCSS()
+	 */
+	public function ieThemedCSS($version, $name, $module = null, $media = null) {
+		$this->ieCSS($version, $this->themedCSSPath($name, $module), $media, FALSE);
+		return;
+	}
+	
+	private function themedCSSPath($name, $module = null)
+	{
 		// try to include from a loaded theme
 		foreach (Kohana::config("settings.site_styles_loaded") as $theme)
 		{
 			$path  = THEMEPATH . "$theme/css/$name.css";
 			if (file_exists($path)) {
-				$this->css("themes/$theme/css/$name.css", $media);
-				return;
+				return "themes/$theme/css/$name.css";
 			}
 		}
 
 		// Try to include from fall back module
 		if ($module AND file_exists(DOCROOT . "$module/css/$name.css")) {
-			$this->css("$module/css/$name.css", $media);
-			return;
+			return "$module/css/$name.css";
 		}
 		
 		// Try to include from global media
 		if (file_exists(DOCROOT . "media/css/$name.css")) {
-			$this->css("media/css/$name.css", $media);
-			return;
+			return "media/css/$name.css";
 		}
 	}
 	
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index d73822fcc3..e9c23b7be1 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -83,9 +83,9 @@ private function _header_css()
 		Requirements::clear();
 		Requirements::themedCSS("jquery-ui-themeroller");
 
-		Requirements::customHeadTags("<!--[if lte IE 7]>".html::stylesheet($this->css_url."media/css/iehacks","",TRUE)."<![endif]-->",'iehacks');
-		Requirements::customHeadTags("<!--[if IE 7]>".html::stylesheet($this->css_url."media/css/ie7hacks","",TRUE)."<![endif]-->",'ie7hacks');
-		Requirements::customHeadTags("<!--[if IE 6]>".html::stylesheet($this->css_url."media/css/ie6hacks","",TRUE)."<![endif]-->",'ie6hacks');
+		Requirements::ieThemedCSS("lte IE 7", "iehacks");
+		Requirements::ieThemedCSS("IE 7", "ie7hacks");
+		Requirements::ieThemedCSS("IE 6", "ie6hacks");
 
 		if ($this->map_enabled)
 		{
diff --git a/media/css/ie6hacks.css b/themes/default/css/ie6hacks.css
similarity index 80%
rename from media/css/ie6hacks.css
rename to themes/default/css/ie6hacks.css
index adc2d10838..6beeaa0e90 100644
--- a/media/css/ie6hacks.css
+++ b/themes/default/css/ie6hacks.css
@@ -13,7 +13,7 @@ div.search-form input.text{
 }
 
 div.search-form input.searchbtn{
-    background: #EEEEEE url(../img/search-button.jpg) 5px 4px no-repeat;
+    background: #EEEEEE url(../images/search-button.jpg) 5px 4px no-repeat;
     margin: 1px 0 0 -1px;
     text-indent: 0px;
     font-size: 0px;
diff --git a/media/css/ie7hacks.css b/themes/default/css/ie7hacks.css
similarity index 85%
rename from media/css/ie7hacks.css
rename to themes/default/css/ie7hacks.css
index bbcfac98ed..38f760aef4 100644
--- a/media/css/ie7hacks.css
+++ b/themes/default/css/ie7hacks.css
@@ -15,7 +15,7 @@ div.search-form input.text{
 
 div.search-form input.searchbtn{
     border: #868686 1px solid;
-    background: #EEEEEE url(../img/search-button.jpg) 5px 4px no-repeat;
+    background: #EEEEEE url(../images/search-button.jpg) 5px 4px no-repeat;
     width: 24px;
     height: 21px;
     margin: 1px 0 0 -4px;
diff --git a/media/css/iehacks.css b/themes/default/css/iehacks.css
similarity index 100%
rename from media/css/iehacks.css
rename to themes/default/css/iehacks.css

From 0c1d81006b350c7b8b76b3e85f5e058fb1067737 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Thu, 28 Jun 2012 15:20:16 +1200
Subject: [PATCH 11/30] Share images between frontend and admin where possible
 #550

* Also removing some unused images
* Remove duplicate images
* Remove duplicate jquery.timeago JS in ci_cumulus theme
---
 media/css/admin/all.css                       |   2 +-
 media/img/admin/arrow.gif                     | Bin 57 -> 0 bytes
 media/img/admin/icon-minus.gif                | Bin 107 -> 0 bytes
 media/img/admin/icon-plus.gif                 | Bin 110 -> 0 bytes
 media/img/cat-filters-bg.jpg                  | Bin 350 -> 0 bytes
 media/img/filters-bg.jpg                      | Bin 353 -> 0 bytes
 media/img/green-btn-l.gif                     | Bin 72 -> 0 bytes
 media/img/green-btn-r.gif                     | Bin 72 -> 0 bytes
 media/img/page-bg.gif                         | Bin 51 -> 0 bytes
 media/img/page-bg.jpg                         | Bin 520 -> 0 bytes
 media/img/pause.gif                           | Bin 56 -> 0 bytes
 media/img/search-button.jpg                   | Bin 462 -> 0 bytes
 media/img/share.jpg                           | Bin 2192 -> 0 bytes
 media/img/tooltip-arrow.png                   | Bin 225 -> 0 bytes
 themes/ci_cumulus/js/jquery.timeago.js        | 147 ------------------
 themes/ci_cumulus/readme.txt                  |   3 +-
 themes/default/css/style.css                  |  32 ++--
 themes/default/images/arrow-play.gif          | Bin 57 -> 0 bytes
 themes/default/images/btn-next.gif            | Bin 1821 -> 0 bytes
 themes/default/images/btn-prev.gif            | Bin 1822 -> 0 bytes
 themes/default/images/icon-minus.gif          | Bin 107 -> 0 bytes
 themes/default/images/icon-plus.gif           | Bin 110 -> 0 bytes
 themes/default/images/icon_sprite.png         | Bin 1629 -> 0 bytes
 .../default/images/report-thumb-default.jpg   | Bin 997 -> 0 bytes
 24 files changed, 18 insertions(+), 166 deletions(-)
 delete mode 100644 media/img/admin/arrow.gif
 delete mode 100644 media/img/admin/icon-minus.gif
 delete mode 100644 media/img/admin/icon-plus.gif
 delete mode 100644 media/img/cat-filters-bg.jpg
 delete mode 100644 media/img/filters-bg.jpg
 delete mode 100644 media/img/green-btn-l.gif
 delete mode 100644 media/img/green-btn-r.gif
 delete mode 100644 media/img/page-bg.gif
 delete mode 100644 media/img/page-bg.jpg
 delete mode 100644 media/img/pause.gif
 delete mode 100644 media/img/search-button.jpg
 delete mode 100644 media/img/share.jpg
 delete mode 100644 media/img/tooltip-arrow.png
 delete mode 100644 themes/ci_cumulus/js/jquery.timeago.js
 delete mode 100644 themes/default/images/arrow-play.gif
 delete mode 100644 themes/default/images/btn-next.gif
 delete mode 100644 themes/default/images/btn-prev.gif
 delete mode 100644 themes/default/images/icon-minus.gif
 delete mode 100644 themes/default/images/icon-plus.gif
 delete mode 100644 themes/default/images/icon_sprite.png
 delete mode 100644 themes/default/images/report-thumb-default.jpg

diff --git a/media/css/admin/all.css b/media/css/admin/all.css
index b86ac0a18b..eca0d8ba9f 100755
--- a/media/css/admin/all.css
+++ b/media/css/admin/all.css
@@ -709,7 +709,7 @@ table td{
 .table .col-2_sub{
 	width:519px;
 	padding-left:30px;
-	background:url(../../img/admin/arrow.gif) no-repeat 13px 22px;
+	background:url(../../img/arrow-play.gif) no-repeat 13px 22px;
 }
 .table .col-3{
 	width:103px;
diff --git a/media/img/admin/arrow.gif b/media/img/admin/arrow.gif
deleted file mode 100644
index 70e0f6a3435303f53d458d2af5672995532dc418..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 57
zcmZ?wbhEHbWMklAXkcWRIddih1B2pE7DfgJMg|=qn*k)lz$D;Om#{*5?}CX__DvHh
K=AX;NU=094zYL-P

diff --git a/media/img/admin/icon-minus.gif b/media/img/admin/icon-minus.gif
deleted file mode 100644
index 2d1476e576b51acc8849a10a4643d143946fd778..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmZ?wbhEHb<YnMxSj5h7_wHSW%-OeZ-+uP&*{fHt?%cWa9}E<KvM@3*uruf|00BrX
z1G7Pe`_(uXS%aRvX$_%<axD*fn=F!?3X{%??s<Q8U0C8J)m%=O@+RT?>5CI=q$WBu
HF<1it`HL*!

diff --git a/media/img/admin/icon-plus.gif b/media/img/admin/icon-plus.gif
deleted file mode 100644
index 812c345b899bea15a926cd5b48bd4004b36acdd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110
zcmZ?wbhEHb<YnMxSj5h7_wL=>w{Jgt_UzTGR}7i6@7%fb9}E<KvM@3*uruf|00BrX
z1G903`PDdQS%sdxZVjP^V$KhG8#@H!0xC4F#kk1CzkeyJHs{%5QJ%SS8A5+@M0(tn
Ji#!+@tN~y%EJFYQ

diff --git a/media/img/cat-filters-bg.jpg b/media/img/cat-filters-bg.jpg
deleted file mode 100644
index d88547b6025555797d34ff063e34eca9a1c3c9cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 350
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfgu1W^p1hgF(p4Kl_BK-
zP=xXSZH5*GCOBXQvY1(bBr^*u3ka~Xv4Q~`8#_A(J3AXECl?ndCl4xMWM*b&WntxH
zW8>uI=H%w(=K}(Mey}1a#RK7?>VxzCA7BvVU|?flWo8s)U=n0x7G(T?gdr5@Y*fI(
zh%Uk)z`(@F!o-YF$1K7m%)-j9B&w>WE{LK0|1Aa{W=5bL%z_N|3`Mn*qT8k~V^@)V
lxA~t-!;TY^1B2d(Jyc*3D@e3DI<Y5o4hzHG1NHxJ0sv-1F<$@x

diff --git a/media/img/filters-bg.jpg b/media/img/filters-bg.jpg
deleted file mode 100644
index d352fa7dd3fef66b724909dd92a76e08562eea2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 353
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfgu1W^p1hgF(p4Kl_BK-
zP=xXSZH5*GCOBXQvY1(bBr^*u3ka~Xv4Q~`8#_A(J3AXECl?ndCl4xMWM*b&WntxH
zW8>uI=H%w(=K}(Mey}1a#RK7?>VxzCA7BvVU|?lnV`da&U=n0x7G(T?gdrU0Y*fI(
zh%Uk)zyP$Jg&CoanTbV2ScO$cSyY^jU0o1E!~a_hJj{$hTbKnI>=}w`TjQSGdSCFQ
n`Qh}ByE<lyGpM=Up0IS`3?^2E3r|7~r-V;jp}_Zq{r^n>7Me3v

diff --git a/media/img/green-btn-l.gif b/media/img/green-btn-l.gif
deleted file mode 100644
index 1b2225f9dcf8970c6a63fb7913a9f0fda7c5bdc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmZ?wbhEHbWM<%HSj50!Jk$8qn^#T?oVpKo_a5qXU*z7tzuk4AtKv@<1`yBz5g@e;
V%)AmI%nEv^Je65^S&D@itN}&z6H5R9

diff --git a/media/img/green-btn-r.gif b/media/img/green-btn-r.gif
deleted file mode 100644
index 495643e7a04830833dcffccac968a2418b702b0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmZ?wbhEHbWM<%HSj50!Jk$8qn^#T?oVpKo_a5qXU*z7tzuk4AtKv@<1`yBz5g@e;
W%)AjI43`(3^jzKZZpH)#25SIg!xsJk

diff --git a/media/img/page-bg.gif b/media/img/page-bg.gif
deleted file mode 100644
index c75126c76ddc8e357a065932551f15545492fddd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51
zcmZ?wbhEHbWMt@JXkcJ4Ha2EpU{L(Y0wft2bU*}1hJlHzrGMq=xBQFeh=?*+0|4zB
B3RnOD

diff --git a/media/img/page-bg.jpg b/media/img/page-bg.jpg
deleted file mode 100644
index 19c5a9759ed916e95d71cb1e65984c79b935d032..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 520
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfgu1W^p1hgF(p4Kl_BK-
zP=xXSZH5*GCOBXQvY1(bBr^*u3ka~Xv4Q~`8#_A(J3AXECl?ndCl4xMWM*b&WntxH
zW8>uI=H%w(=K}(Mey}1a#RK7?>VxzCA7BvVVA#N5#LOtjz$D1XEXer(2tx$W*~~yk
zA^~Q04n{^KKA0&06k%aU7G(@#7QQ@%l`V{2LJ&jw|62?^%#1*5m<1W^87@y-d6Gdl
ycoIX@autTHejbcjb0#odwNzkTRpcOqY$i?F>-WlEsPV3UZn8$emI7A&|C<2AuS?nh

diff --git a/media/img/pause.gif b/media/img/pause.gif
deleted file mode 100644
index 0614ad28af8e8fd74899e950bbaf5316f55f4d98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 56
zcmZ?wbhEHbWMklAXkcWRIdkU!|Nj+#vM@3*Ff!;c00Bsbfr+0*C~d{`QxBpqZ}rGO
JDkj2U4FIUU51ar1

diff --git a/media/img/search-button.jpg b/media/img/search-button.jpg
deleted file mode 100644
index 586a6029697e6ee588c7b835a3c1c7d7cceebc8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfgu1W^p1hgF(p4Kl_BK-
zP=xXSZH5*GCOBXQvY1(bBr^*u3ka~Xv4Q~`8#_A(J3AXECl?ndCl4xMWM*b&WntxH
zW8>uI=H%w(=K}(Mey}1a#RK7?>VxzCA7BvVVBlupW@Z#*U=n0x7G(T?gdv@Qff?vV
zB*4bb$;gPr2QvkL%Gj9LxZ&bV%)*R<LLzKp3@nO<O01&dM#{m>lT*~((%3l!F|_}`
z#lXYN2(*=1kink8>B>}A{YlGS|2qGs>(Gun{~5NH>&6M@ExK38n(7dFbc-*;Aqj4c
zO|z1jj!Ce!uH3M|WSN=5+B<JoOpf}r?9vn4FROl9RNU$~w@=+`<;I&w7soLi|H350
zw0h>#lC9fk%-BD@hF`?%bm<A}pz6XeCA%4gY`K$u*Ja)Rc}U~F96Pu3-te;t_Wy4J
E0B5je>Hq)$

diff --git a/media/img/share.jpg b/media/img/share.jpg
deleted file mode 100644
index 65c01b43e08e6cb5eea38a75a2a39c3131341d78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2192
zcmY+A2{hE}8^?cR#*A&!3>6vfjBO%I**Y<@Tw9i6!XRb4AsQNqBwV2wA$v$u8rvky
zxMa(gq-;e)Gp@0(Cq%X~%wOGm?*H_8&$~S5dEV#yeP7-u-Wago((JSu00Myki@gEx
zhJoJ!zW)I4oxqU26%65r{D2?I{}U(_1`~k6pn`%zLV|)Kzw)CA2n+`EL-+-uP(iq`
zpfFr?-yWi(KMVieME;3>z58FpYXJ}fz<wYC3_<{W2oM+n;<W=(z@9rW2>3rR0e&a|
z5`^p}wf6%cegN2W2?)S`R)9f#dzN7cq!=K603&elknC|eBL~Oyj1T=13YuERc>0f?
zKVJW9Qz)394+8rksI(^z0z>vD|G%mrJ_NA$9Z1Y^sF9esT`Ek&*drRxV*?_4zW5Me
z1YiKnCoL{A6$XXjcU$`BuB>TQE~%-hVIJM&$5QBjW4#Jn1zb6SH`lRPEF);UNSk<G
zt;5C33+>s0wD1H}YtC>o!f~75Uas_^27-czS>HBu4oJ{wnfTX)Tkx-SxgPfB=IJ=6
zt;<hp>PLOQNG+j!{Jb5Ev=+7n9H_~1WUZptBq+;b{Rp{YMgwaZ<hQMEP)%K6g)&B^
z6!<bBx50oRk#QoV_`_tyn?AXfo)c0wRg~zk{0p}kbVp_9&{md|v!|r>#!1B6JVy>{
zoWUlR(~4*nnklrr(5F>vGnB5D3h>n16TTpf+j~sih>HKi#yaf-5sl|QN(&FStK>&0
zErz(l-(UUi9xQni)PKPdkGd05Kcjsh_;F7u#lzL8#y({riIHXK#F=bKQi)v6Z0J?I
zI#?8vl?;P>UtSLmH*{BCy?$TWTzO`yu7o|r02RMWfXBe?I6h6zE#xO?*5JCZWg%gT
zln$4F5HG0)nG0pBKD4opximlFEoWJxsN65Du;$M<JUsN8B>SoRN&x9h2*PDEVOjJv
zs?frL<aL+*($UM{6-Si4BJ|WMqic~;M~nM?AC3QD<JUN6HK%eF|FT1QN0ad)2q7~%
zLRXx8?@Qq^H>K(35L$COY~u#LY8v-qiAh*>-|Z8!ZBB$fYyC2uASHCKP$Ul*>B(NG
z6hp(u<m2~S$=hg}4+qgNwwuejGN-rfxm&|GcJl*mKho&|NaW(MZ@bx8`M9-(tosT&
zVclu@q=~mov{orsbY)?3!uiI-hDI6X;;9PLwF;v$wBDn_+3k^KZCS#piw^nv`UaV^
zeZ$!WyR@x+F!GLizkbKJNSjg2IVl|zqCF3&(mYjPo&`NWI#Rn&u3{s{`7mxOwwG$%
z5%So@LNH7wI9|2ViD{`=N6nEqEonx$Kj!7qhB#Tr;pUQ;<)0^=uT02g+V`enRUIX(
zb)eDOoLq^?C@ZI{5?%yJJ8H6rLE6hOWm;r~kgX!+UT{*#oi67#UkB$0rr5`C6C_M?
z(5g#yDQK#Ii0O@v<f)X61rxU@gbug5e}~!GQAZU2lUj=Zdd%=D0~0Py+Ai`BpK=M2
z$xiZ{Zj26NhsLts6&lJz9nr0NVM!y&N|^<;&QbgT$Mjtb#Q%Z&L%<?N`i_@8ywKlb
z@M$V4emU6GEox|@gE^WCHbR18TE*s4nmNTEUK}}Qk`loK{=!V`NMFE_Pahz`+-8R{
z43KpE2X&w7{wXPk66W?0MZIr#x;$97`FT@S(<>r9+_GK|wS&`rrrRKijUUhu+@6yy
ziwrnoIX$(ZEE{CD(@Th`I$V>U9j>ZDdZ=Uzf>c7FBd|cfh-6*v#jV-Y`C9h%&m!9@
z3!j~xjp_I<hS?Uo3t5J(YDxC44d+{>gcooYH|;kDh);6GCHBwc8cvc;s2Sse{q^?7
zVtJijXDWQu>w~s)&!lJjsICUN9(Okc=)l1daHysJzHn}1O6S_&`8vH&{wz~7k?vM|
zx&sUQ$C7uB_wn~*ebB@U#Op~HGH>Z$^S#td_FV}?XGu*PW1PzVxUb_x1z9NAhuap&
zoh-Oc@0np1mnhr$H~mKMZC@Y}Lb(Qa%`2Ka*sdNcET?Z=56`J(qhRlJU8|$eQ<t7W
zD`zZ8OaZ8=XB^%@w)7$o_%hzAt~noh7O^(4K>65A<;0wybKSN0X5Ja5)~vca$$itn
z;sNIt7uO^6+A=`~<L0*s%#*mL+<=fi%-!#?)^~1bJCwn#lZqGzA2qIz-DeaC_alGH
z@TH*sOvBdQIg}kHmuiW&Y3<JL`1}HuSTkO>qaWaMS2Ij;06m}nYCer<<0W^({YAHe
zc}eo$1=nQK>RnpbYdgt9O4dVtTB9`{QK+b)woD3cAd(fwCGh|^A%axx^p~^kk=R?r
z7ZZ-@5wEr$q~vNG3Z&&<*3RO%86Yc>=UL)>G0&G`*AIu*DIdL=*~HB#FLI|Ezx`g3
z*Yr%iBt$PFK{Zru=o;k|HE@Tk<Pax_X3Ynbx@9C01N}~a@F^RQC&xk_hsul(ef2BA
zsoT*~%ViM@YXo&|<&kq5wN4FJJ~z~}6ZJM&-;?65Jjv-++00I5<L~*I(^CQ!!VM-8
zwoF#iUiT$1$0X3Lb8m1wz#&n#uZQ^jtyDBp4=HQDp>Nwp0iDe*O~|LR+Vb!N*V1J>
zpE$#j8yz#%1^#C1Mw)5YgEqNeH&--gALyo}&3tOi9_*<`knFW8RaIf3t0*JXP29?-
z6`ZTI7;;7r(|`?HVn-!2VeykokQ}WmRijpkihoIN%=$PgYu6~|T%D6oPEbQL0fccz
ze}T!ZwBmDbz8l4!>elR$A=lb=g%;`Dh7$T166KTaq(ID|)vY<Zsr+a>L`+6tNl#*<
U?(ilgASfs(iA?*5Z|1T72hG*aLjV8(

diff --git a/media/img/tooltip-arrow.png b/media/img/tooltip-arrow.png
deleted file mode 100644
index 61987de9b8bc1c582cef443bb15c0c650696307e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^d_c_3!3HEP+-oF(lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlqGnGQ$B>F!Ng^U5Iq3-r9q9_ZUkr+iir%prEoq3D&cVCC
zaR*Ds^9GY9mNLeTHUilXFMeU{c-&CI-obpC<MJA&Bd;P%Y*`<9DA@4}Cpb;|!+qqY
z!yZ;&VULaG0`cx*DNeyGm-n!rV!wFM;Sbkc&YlASN1w@uDfBTuat%0az~Iop$gt*!
WXz!*Q(mR39VeoYIb6Mw<&;$Vg=S-;p

diff --git a/themes/ci_cumulus/js/jquery.timeago.js b/themes/ci_cumulus/js/jquery.timeago.js
deleted file mode 100644
index 9fcf481115..0000000000
--- a/themes/ci_cumulus/js/jquery.timeago.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * timeago: a jQuery plugin, version: 0.9.3 (2011-01-21)
- * @requires jQuery v1.2.3 or later
- *
- * Timeago is a jQuery plugin that makes it easy to support automatically
- * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
- *
- * For usage and examples, visit:
- * http://timeago.yarp.com/
- *
- * Licensed under the MIT:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * Copyright (c) 2008-2011, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org)
- */
-(function($) {
-  $.timeago = function(timestamp) {
-    if (timestamp instanceof Date) {
-      return inWords(timestamp);
-    } else if (typeof timestamp === "string") {
-      return inWords($.timeago.parse(timestamp));
-    } else {
-      return inWords($.timeago.datetime(timestamp));
-    }
-  };
-  var $t = $.timeago;
-
-  $.extend($.timeago, {
-    settings: {
-      refreshMillis: 60000,
-      allowFuture: false,
-      strings: {
-        prefixAgo: null,
-        prefixFromNow: null,
-        suffixAgo: "ago",
-        suffixFromNow: "from now",
-        seconds: "less than a minute",
-        minute: "about a minute",
-        minutes: "%d minutes",
-        hour: "about an hour",
-        hours: "about %d hours",
-        day: "a day",
-        days: "%d days",
-        month: "about a month",
-        months: "%d months",
-        year: "about a year",
-        years: "%d years",
-        numbers: []
-      }
-    },
-    inWords: function(distanceMillis) {
-      var $l = this.settings.strings;
-      var prefix = $l.prefixAgo;
-      var suffix = $l.suffixAgo;
-      if (this.settings.allowFuture) {
-        if (distanceMillis < 0) {
-          prefix = $l.prefixFromNow;
-          suffix = $l.suffixFromNow;
-        }
-        distanceMillis = Math.abs(distanceMillis);
-      }
-
-      var seconds = distanceMillis / 1000;
-      var minutes = seconds / 60;
-      var hours = minutes / 60;
-      var days = hours / 24;
-      var years = days / 365;
-
-      function substitute(stringOrFunction, number) {
-        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
-        var value = ($l.numbers && $l.numbers[number]) || number;
-        return string.replace(/%d/i, value);
-      }
-
-      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
-        seconds < 90 && substitute($l.minute, 1) ||
-        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
-        minutes < 90 && substitute($l.hour, 1) ||
-        hours < 24 && substitute($l.hours, Math.round(hours)) ||
-        hours < 48 && substitute($l.day, 1) ||
-        days < 30 && substitute($l.days, Math.floor(days)) ||
-        days < 60 && substitute($l.month, 1) ||
-        days < 365 && substitute($l.months, Math.floor(days / 30)) ||
-        years < 2 && substitute($l.year, 1) ||
-        substitute($l.years, Math.floor(years));
-
-      return $.trim([prefix, words, suffix].join(" "));
-    },
-    parse: function(iso8601) {
-      var s = $.trim(iso8601);
-      s = s.replace(/\.\d\d\d+/,""); // remove milliseconds
-      s = s.replace(/-/,"/").replace(/-/,"/");
-      s = s.replace(/T/," ").replace(/Z/," UTC");
-      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
-      return new Date(s);
-    },
-    datetime: function(elem) {
-      // jQuery's `is()` doesn't play well with HTML5 in IE
-      var isTime = $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
-      var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title");
-      return $t.parse(iso8601);
-    }
-  });
-
-  $.fn.timeago = function() {
-    var self = this;
-    self.each(refresh);
-
-    var $s = $t.settings;
-    if ($s.refreshMillis > 0) {
-      setInterval(function() { self.each(refresh); }, $s.refreshMillis);
-    }
-    return self;
-  };
-
-  function refresh() {
-    var data = prepareData(this);
-    if (!isNaN(data.datetime)) {
-      $(this).text(inWords(data.datetime));
-    }
-    return this;
-  }
-
-  function prepareData(element) {
-    element = $(element);
-    if (!element.data("timeago")) {
-      element.data("timeago", { datetime: $t.datetime(element) });
-      var text = $.trim(element.text());
-      if (text.length > 0) {
-        element.attr("title", text);
-      }
-    }
-    return element.data("timeago");
-  }
-
-  function inWords(date) {
-    return $t.inWords(distance(date));
-  }
-
-  function distance(date) {
-    return (new Date().getTime() - date.getTime());
-  }
-
-  // fix for IE6 suckage
-  document.createElement("abbr");
-  document.createElement("time");
-}(jQuery));
diff --git a/themes/ci_cumulus/readme.txt b/themes/ci_cumulus/readme.txt
index 967ed01293..0b1f80dda4 100644
--- a/themes/ci_cumulus/readme.txt
+++ b/themes/ci_cumulus/readme.txt
@@ -4,5 +4,4 @@ Demo: http://ushahidi.com/
 Version: 1.0
 Author: Brian Herbert
 Author Email: brian@ushahidi.com
-Checkins: 1
-JS: jquery.timeago
\ No newline at end of file
+Checkins: 1
\ No newline at end of file
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 88d21e37c2..829036e77c 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -448,7 +448,7 @@ div.slider-holder label{
     padding:3px 6px 3px 15px;
     color:#666;
     font-weight:bold;
-    background-image:url(../images/arrow-play.gif);
+    background-image:url(../../../media/img/arrow-play.gif);
     background-position:5px 50%;
     background-repeat:no-repeat;
     font-size:1.2em;
@@ -682,8 +682,8 @@ div.report-details{
 .report_detail .r_verified { background:#368C00; }
 .report_detail .r_unverified { background:#A60003; }
 
-.report_detail .r_location { background: transparent url(../images/icon_sprite.png) -5px -163px no-repeat; }
-.report_detail .r_date { background: transparent url(../images/icon_sprite.png) -4px -133px no-repeat; }
+.report_detail .r_location { background: transparent url(../../../media/img/icon_sprite.png) -5px -163px no-repeat; }
+.report_detail .r_date { background: transparent url(../../../media/img/icon_sprite.png) -4px -133px no-repeat; }
 
 .report-when-where { color:#908B88; margin-bottom:10px; }
 .report-when-where span { padding:3px 5px 3px 18px;  } 
@@ -822,10 +822,10 @@ ul.map-toggles li { display:none; float:right; list-style-type: none; }
 ul.map-toggles li a, 
 ul.map-toggles li a:active { display:inline-block; padding:3px 5px 3px 17px; outline:none; }
 
-a.wider-map { background:transparent url(../images/icon_sprite.png) -4px -202px no-repeat; }
-a.taller-map { background:transparent url(../images/icon_sprite.png) -4px -221px no-repeat; }
-a.shorter-map { background:transparent url(../images/icon_sprite.png) -4px -241px no-repeat; }
-a.smaller-map { background:transparent url(../images/icon_sprite.png) -4px -182px no-repeat; }
+a.wider-map { background:transparent url(../../../media/img/icon_sprite.png) -4px -202px no-repeat; }
+a.taller-map { background:transparent url(../../../media/img/icon_sprite.png) -4px -221px no-repeat; }
+a.shorter-map { background:transparent url(../../../media/img/icon_sprite.png) -4px -241px no-repeat; }
+a.smaller-map { background:transparent url(../../../media/img/icon_sprite.png) -4px -182px no-repeat; }
     
 div.report-additional-reports { padding-top: 5px; border-bottom:1px dotted #C0C2B8; }
 div.report-additional-reports .rb_report {  }
@@ -838,7 +838,7 @@ div.report-additional-reports h4 {
 }
 
 div.report-additional-reports h5 { font-size:12px; margin:4px 120px 2px 0; }
-div.report-additional-reports .r_date { font-size:10px; background:#f2f2f2 url(../images/icon_sprite.png) 0px -133px no-repeat; }
+div.report-additional-reports .r_date { font-size:10px; background:#f2f2f2 url(../../../media/img/icon_sprite.png) 0px -133px no-repeat; }
 div.report-additional-reports .r_location { font-size:10px; padding:3px 0 3px 18px; color:#828784; }
 div.report-details ul.details{ list-style: none; }
 
@@ -1198,9 +1198,9 @@ a.add, a.rem{
     width:13px;
     height:13px;
     float:left;
-    background:url(../images/icon-plus.gif) no-repeat;
+    background:url(../../../media/img/icon-plus.gif) no-repeat;
 }
-a.rem { background:url(../images/icon-minus.gif) no-repeat;}
+a.rem { background:url(../../../media/img/icon-minus.gif) no-repeat;}
 .report_map{
     overflow:hidden;
     width:100%;
@@ -1241,7 +1241,7 @@ a.show-more {
     text-decoration:underline;
     font-size:10px;
     padding:1px 0 0 18px;
-    background:url(../images/icon-plus.gif) no-repeat 0 2px;
+    background:url(../../../media/img/icon-plus.gif) no-repeat 0 2px;
     float:right;
     margin-right:23px;
 }
@@ -1808,7 +1808,7 @@ a.ic-time {
     font-weight:normal; 
     display:inline-block; 
     padding:3px 0 3px 20px; 
-    background:transparent url("../../default/images/icon_sprite.png") no-repeat scroll -3px -133px;
+    background:transparent url("../../../media/img/icon_sprite.png") no-repeat scroll -3px -133px;
 }
     
 /* Tooltip box */
@@ -1879,7 +1879,7 @@ p.labeled-divider span { position:relative; top:-8px; display:inline-block; back
 .r_photo a { display:inline-block; padding: 2px; border:1px solid #c0c2b8;}
 .r_photo img { max-width:89px; max-height:59px; }
 .r_video { }
-.r_video a { display:inline-block; font-size:11px; background:transparent url(../../default/images/icon_sprite.png) -3px -100px no-repeat; padding:4px 0 3px 23px; }
+.r_video a { display:inline-block; font-size:11px; background:transparent url(../../../media/img/icon_sprite.png) -3px -100px no-repeat; padding:4px 0 3px 23px; }
     
 .r_categories { position:relative; margin-top:10px; display:none; }
 .r_categories h4 { font-size:10px; padding:0; margin:0 0 4px 0; border-bottom:1px solid #c0c2b8; text-transform: uppercase; }
@@ -1909,7 +1909,7 @@ span.r_cat-desc { display:none; }
     height:19px;
     width:24px;
     padding:4px 0 3px;
-    background:transparent url(../../default/images/icon_sprite.png) 0 0 no-repeat;
+    background:transparent url(../../../media/img/icon_sprite.png) 0 0 no-repeat;
 }
 
 .r_details h3 a.r_comments:hover {  }
@@ -1942,7 +1942,7 @@ p.r_date {
     top:0px;
     right:0px;
     padding:3px 5px 4px 23px; 
-    background:#e3e3e3 url(../../default/images/icon_sprite.png) 0px -133px no-repeat;
+    background:#e3e3e3 url(../../../media/img/icon_sprite.png) 0px -133px no-repeat;
     color:#908b88;
 }
         
@@ -1955,7 +1955,7 @@ p.r_location a {
     font-size:11px; 
     line-height:11px; 
     padding:4px 0 6px 18px; 
-    background:transparent url(../../default/images/icon_sprite.png) -6px -163px no-repeat;
+    background:transparent url(../../../media/img/icon_sprite.png) -6px -163px no-repeat;
 }
 
 /* "More Info" state */
diff --git a/themes/default/images/arrow-play.gif b/themes/default/images/arrow-play.gif
deleted file mode 100644
index 70e0f6a3435303f53d458d2af5672995532dc418..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 57
zcmZ?wbhEHbWMklAXkcWRIddih1B2pE7DfgJMg|=qn*k)lz$D;Om#{*5?}CX__DvHh
K=AX;NU=094zYL-P

diff --git a/themes/default/images/btn-next.gif b/themes/default/images/btn-next.gif
deleted file mode 100644
index 82af2c29a925547130494c477d64079ee4aaafce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1821
zcmdUu>tE9M0)W3NIaZXiYD-fSj~S*jFRkpXQ&yzbsn6V&&FyqH+^6sor&+n_%wr;6
z@X|Ci6~SBH`5`DOnj&%+0n3@ks0~MmH&j4FOiekTo&VxIFP_)Wn<wl-Xz+<>4{!>s
z0x&f-1#lD!1!uJ?#o~u`bqU~314yVF94u*QxC3t03WbHWwYRFOZi0tmP$&d9tA>V3
zK`a&Et3k<Nbu}K8$wBFmR9Z}>#>(Yopjb+y#eq0lYikNfY2|WrK`ytqH>b0cz~?_`
zZ%^y#$pVQ@AQ@_D`H9ENZ)!>e5BMOb7lM*mtW=QJ4t{C@sVuA23i5dz4iRMa0754q
zazMF4p(x+l+S2RwX0v&HebBI~DCUhdHl~WjOoK(fwz0Xnxq(h?eE06%{QUgb7*8T0
zkBn4Osc~%f{egjkpbR=F7@)tD*~e2qCO{yjf=Z1C_n2n0QLR>0RK!>;q70^ZSfwT~
z#jjs8A&5Z#mEYc;r&iPH^bBNv_p@iTso6PjpUq|$_!AkElUn;Y>eyKA$-H(3gZSHT
z&8G|4I-_}RZdRk6G#L5-S;A!AOX3bJE%B20BBf4(>)`2h?Jr)`pU7gYu8NIDZcrun
z%^QASAIXElTUil$keKR4+309B@{xcf<UvrTdU3E%BSYqNkfb8zj4ZOHm!jbJ_vc|M
zyUb?6u}p}r8jP&(QmGoAKd<qq;7?ArA@4&$rCpVk_~qq+qyZtOy4!=?Et5Ukfv;2>
z<qSqvQcoZ5i8!c;sn>UV<gq9UK~i_G+AuUb+qJOp<mJmoOk=;=AWPyriDZjBau|^v
z;y$%>TO3uZWzk0k$l?LYu!!<hED{wdb<&9mXmPPOlF=Vj%>(~epw?jj>-GK9e?9@=
zRuH2^lVO+l+Q4@oz9x$Z*?aUt9-MYt^1$_wb7Ji8vi7<#S7(~)_T3wrGB4*Z=+}nW
z4GORC;3=e#j>chX@ZC{!ktYHU3n6ZIz1WG4aEvZT3;3Na&zmCZ0waYOK!Bn;;??p`
ze1zMuqCD5Xa~M&Xo}=`C`r!BnY~$t-sxFS<o6N(@dNpJ_29ErUMC^;mW<~FXpFw}C
z+=s~&koF8X)ns8N74Y-16UwiHnru#`=O#S90T@r4krh$Hy({_)r|dOf598W=Uoes5
zs^PxlKU^kC7Jm68D%Usx4?}<Vl=gG2Kz?DTWt4V8_<^e9<}==P)BXj>-og5c>H0eV
z&Fu5)1IYa&Yk|a<&0iIc5H~m8F7B}Vm+)M%DphyL{jA@fSPj81-G86$He6uH!GrE-
z)LHK<v9GhdW&a7w@<4dmX1h10k8JlWjr~3;BRNFtZ|57W&G+&s;TIeokDYuFJWh(R
zIcb@lEDW)qs{@z(vAT!hUM)Iucv@hn-Cm6MRLPaAaW_hK7N9WpI}_)o%COnqxH2a=
zD$LO-p=P=Q&zYO1I>At34pFd&=k1fHTV|?K4V3eaQRX%~hj{qyi|0sQy(GtYQ=148
zW&-^BlB@A^4du%TV$7%JbXa3ec3x)9?%@!aV?sERPiJuSddMc+YV)2W=F*-p=c^&n
zXLfNd`gs<A8f&xXYCSTi<x5($fUP_>ztAyK6(DIja1FcIrNTjrobfb(*^i2FH}vRA
zZyKIxvqz-PKjJlpK9khP$Tf_&hk{)?$jEzVnK$yFQ|=}{>?6EM0AtC8Ld0<w3HaQX
zCUdaUjG81nSr<i8mn81{5)Pgw2dB-WOG7R!XQAA;+vTjA=Wh0$zt~;VE)Sy^uY^xe
zu5vrP?Lydh1BhALH@`x!YRsdTeEz1u7NR#5Si(`YnI3$-b!GgUjlg{Y!9{15e6A<-
zuh5Uzw_0As7Y0W8#r+YWa>KLw4<nLiT9YPP5$hkmkN5=<06xBF?5870hnT_I$B0I_
zmW-Gl(&n?)1ykiQX=^Au*xeHciM5Z{W}(N}^||IcjU1e7`@YxB&O}~cKr@_0i#;>9
zNSgBBzg2*OMDm8Ihm|5+k{xo80<6pZd=1_6$iJ5%XYA&RDu%UbQL$3^tD2l6TW@ta
z2h#nv*R!_P7rKpG>kTJu1Tgc9AFP{iXFfX(`wWk=fdNDfcrTo9Ya3zv4}T)kbA(|3
zR};appaymj3kx!*?+C5QfE|+wcBPnzZuJ?+9(S~xvUW#W`lIb%#pe1c1)mp@uQcP}
VhcDlje|c1i0--C-PB0kw^uMOqYzzPZ

diff --git a/themes/default/images/btn-prev.gif b/themes/default/images/btn-prev.gif
deleted file mode 100644
index 1f88617fa518680262064df57c7eca89a602d918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1822
zcmdUu=~I(;0)T(qQ6mdjv>>c8AViR9IErZLHc}K_yAJCX%M>eUEw?SUj&zV3L&9Oe
zMFF|OImneaCWZik0Lhz!BqRY57>P%i7{V2fK!}`ybh`h=J|CXX&zC3S!nu%B*U{h~
zU>$&|sVNX&QBe_ZHY-G;Ck+j0;MYcw)*z9TG&cSUey$e?3hV2CuBk}@Peh<l08(lO
z21-F91*F!35=m`sDkzhI(gCr!m_kXE$;v>nxT-1%Bvn0so&hqR_x3&n4|_SB-1c??
z3_oHr?{{@&gFDUOcc``XE|;6%+<XT-f<Z0^f_`T(GQoW&xZ4Uc8D_H?<a0Yai6FZR
z5ZVE;6O_y4^77r?U7b#6G#a<IBune^V(wT|Q>I8nUs{uGZtv{uY-2K;OeWL({QTG$
zx4*w=c(|HENos4u^LPb;SyWKKqrQ>aCR6+f5J;$`P?Etty3wdtsg#wK32SS@EV^h=
zsUpxtA3o3_h(LV>Gnr(Sib|zsIp(upzO0&>odfu`wzdK+kv2K0u}z|kjn#*enKT;l
z-Mf~r3fi=K<J{b=S~Iz{)B}q8>GXT)y}XqbZaOSfX#3+?T&<QlKK|@fHf?=fq}TTb
zR`;&1!aY5C=nC$~j{<ZaU9~738L4%A%Fh#UA&8_}l=P^jj=8Knu~0E1jcVmo$l<;|
za(H!z(Z~-bK~$wA>RE?U**H2{hpvPtCto<?p}^9P>grU3ftSt`gx9jsMQo|`>Auuz
zm0m`pWv6%b#CMAVAJcU@Hk!<+kn_{o9M#gm>}<!vLid|DP2o*_swHW9XLnSa5S>el
zVu^ZGVw)t2M#G?v@EwbJ6@$WxA(2q{SfLe9OhAi^oG4mfU@aH?UvYHP`hUGA{_<Z>
z0E8JNC@@9V|8llK9Pqg+jl?+zT_7W>ZudWO_jbLL_+H9vh;VnUQr`aUCv};Z>t*WI
zfwo4uS1ckU565a6q=fu7Vtnk0L|Eg9d)@!pj)`=*UXJ0z?X9EDkqrS+f^a~9qFKo*
z+2_6jn>Zoa{bDCAn&de`{Q<f=4o)ZSF}a{}{9;Hx2Azt+Ry?pk7&2S{nQ@(ja`L@~
z%p#Rq{Nm)Xb(p~XiG&VFnK)tj8u(ob2dn-M4$O?A9V(*-IUO`!>Xk_s^^ce5-_aaj
zD+ej;A|CT@{wCDQUYS5dU}CwM%iyxieDKDl>eB)zB`e{GG2MCXB)%-se1zftA%Ast
zl(iW%9g2GEF(QvB9478;Z+y92uM!dWj0m*eb#{pEI5h#mi3~etb@K+w5>I%nCLtQ*
zK4gFTJw_0Vj#f%yTypY;_j;Bl-gtNsiA6sAJ0bvf@~+8?v<!NkIQb}KI?*G{#yC4!
zh_gMeEwse);V0+4TD3*rcx?`Ry8m0$RLQqjlBS+s4#ws<xCE)E%Hnd4PnTbdN0Hpl
z+=Tg+shxAvl(cvUlG~SYj^PJgw5>BWnQH?H2hYU4655Bh92Fhke~dbd4r}2H?E~HT
zR-oic@?2wiyiDkLU~$;WsUpY6$BB3;$jT81A3Y0bojM)#!q$wkal<+I|JyAo+9KQL
zlu<X&fNd#6o5<)V=iHhv-OjO51kW$9hR@v-f6{V4jo+b+hZZ~EU)#2DxJAP8yR@Y#
zOWm{oJsfs8WsJ%1Sr+^1dyU)}iK|6Oot|r2o7eM9ZCfyGeJFLAk2s|8*@ry2kS6Rx
zE`N<iM)>1C`P)|tpZ#v>3;vQm6Bg&=_71(`bp)?SMx0<T1jx&f!w5MkuSy~hVZ9X$
zg|5F3!{D7+fu2_7n$=f+FOr2L-<))p#_~?=NMl(+w>}@GY3e?{jwxOti*BlMidb&i
zt>AImMBUok6#dG$d-9B79Fsae7z|;x&(|l~k=t032R7XBo$tLv+>=m%Cw)UxV>)(0
zLpB|gX-a&Dbav$l^i8`K)7d@Kd}Nw*`WYVf+1t`gKdtLU*4gQ3NdE`E(D+a?vTKI^
z#Zomk0O!~BqlSI7M?a+7BlTuv8mJq8>@&n6f!H8tCBq+;35=b!_X#g`7V6y3b~m(T
zpWO!>Ox^C*0$abky-;SbwmvZSi+N{bhJoL42xVqlJ0R+S-Fev375l(RndMS|BG`v4
z6C4Wati3T79_96RSFx7Po-p4&W0{CDp_~ig>@zEI_CG9tO}iouyLjiieIa@5S@>CD
V<SpudYN_@17C4{tgD4dE;!g-HZk_-D

diff --git a/themes/default/images/icon-minus.gif b/themes/default/images/icon-minus.gif
deleted file mode 100644
index 2d1476e576b51acc8849a10a4643d143946fd778..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmZ?wbhEHb<YnMxSj5h7_wHSW%-OeZ-+uP&*{fHt?%cWa9}E<KvM@3*uruf|00BrX
z1G7Pe`_(uXS%aRvX$_%<axD*fn=F!?3X{%??s<Q8U0C8J)m%=O@+RT?>5CI=q$WBu
HF<1it`HL*!

diff --git a/themes/default/images/icon-plus.gif b/themes/default/images/icon-plus.gif
deleted file mode 100644
index 812c345b899bea15a926cd5b48bd4004b36acdd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110
zcmZ?wbhEHb<YnMxSj5h7_wL=>w{Jgt_UzTGR}7i6@7%fb9}E<KvM@3*uruf|00BrX
z1G903`PDdQS%sdxZVjP^V$KhG8#@H!0xC4F#kk1CzkeyJHs{%5QJ%SS8A5+@M0(tn
Ji#!+@tN~y%EJFYQ

diff --git a/themes/default/images/icon_sprite.png b/themes/default/images/icon_sprite.png
deleted file mode 100644
index f665c12f1509a1e8161467eec4222a673cede784..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1629
zcmV-j2BP_iP)<h;3K|Lk000e1NJLTq000>P009RG1^@s6TSDzT0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%|4BqaRCwC#o3T<GF%X93O!`~~Dk@V!
zMNAEa{REJT5>rxPKY{TR*r_P7ODfD0*qMPk4i!{!MFlg?6I^zkm67GsoutzxCRxqg
zoKHUMJ4q|;ztXuB$FV3ny%T>Ry|=mP_VzY{Qw5Hyl0AiEyuZIc%KCjNt+}A^I-HKR
z!u5o(0UT`rPOKqNco|NY8HFb$1f6F>0D#Rhgd_6of*ycQj1a29w;TYOP5{(1S=VI%
z0H#i&2~#sw16geZ<yDhvQVl#j5+TuB9P#5M$Rr>D2k0mXGN3O*BpfT#B?x7H3DivO
ztPzi6rJe&&Q)`jf@iZm0eVQl<kU9%PjfNIuCvyfi`V+-}EX=T4vrM4iv6s^#z_l_s
zr!?UWLVCsqozc#3baV7crGG|9FyxJjyQ`}!qqsXdI?5;Rpl~N~2S9sq2Zei!I{;;i
zI{@SscK|YrJE}ntaR;EkB<`r0f{8mQkHy{pDDJ?7m&F}r{uyxxrk7jXskKP#c$yNt
z#hngForR%BPU6lq0~`H`;y+Tw9Te;*?g+3X?x4V8#a&W6v$$i(8xeOD6row4X=4W`
z)2>bIlC^RdkvyunM7yrd)ldLfP?HW>Xhj*k-jFlpGd?jkPZvKM?(u@m`#_C!wWv1=
zWnB?1y2-w(hO{p95oP*3gu<otth)%1EXY9V*vQbygS^evw`h%iu5m)`|3hiArRD@9
z*bLF}{hT$mg7iGUvxm?UQ&M5QwB;wCanko~Dr*Ssk*J~c$Y$Tf$Dj0lYT>L_$ee|Z
z**dRC7*r(dE{5c^E(#@#lE_B!XRUWxNun&!>PaGaVr-t`B#{~)YO!KCNkmIkvagDh
zL{K<OqBv_Xrb;3(0+vJzt42mil(uNInv#fi78WFt&2Gc$N+L36VPm!|i5S8VhA_lu
zf`s7n&_;Sv`kM42pUo`nys4?KxB~QJ-l={`z5<{_iZTl2Pm*d~VG~{{$V8J$#X!Jh
zYZTs%T&!#C0GZt@*Td-DR#qzvVF*JQ!Vrcqq`=U@lrAnV%8K@#>8;b#(}~S*Gt~+d
zj)is%;RH&dCcwtt5CX{eRB;oa2ggr1J}BV==GW3d?@|Df0>Hv?jZ40h_l2%|^!<?T
zckcKW6)=FOJb?qBxJ>zFyvBU-dxblqd}qiZotqi`+SKlMg5Xn+vn+_d9}Dv;c;+~n
z8m_OQ4-QlAbAnXW4kZh!QK1Ox(Dzkeh}^PhXw8FTV;7DtnR7$C-w7hkwFOUG)j()j
zO&W|X?SALM*ioJo$3$Pe?hYM`*BzlQLA|GyhS1*0)=d}y-CT2*GC86(9Vpp1G*BnG
zCrEZ$3}FaE7{ZWHs-ArO87ca*cwI&9ld$l2S|oQa)6^lU6e(l9nrlb^ETByyThO^p
z`S|^{S52T6=OlL)LIcQ;;d3b=v@i;aw3^6`n$KG7QPULViFUtTP3Q^nKXel)Xw$+l
z<ZCCpNx_iGx}^S%pnxH%`=&wsRn+@^Oc?v)t1!PW^qur@S$OOO$wDKj!Fft-(xV!k
zX}`<vcqOojNT%vmr(Z{DA$OW}$@d{J2B~YYqy*HJ>$dNRSN|9`B2|A$W~=_eHHfNj
z89H`KgRmDu)kidad?J$_lVuIk<}6nA3}HxMwK9vRZ*JnPt*zPE+TPwSrY28MPhvPk
z|0UvwhlgUD3qdb0FY(>oU9o*~e}6BYpP%F4eWIqFot;_V6jqa3ttQsi)=Gs~*T%+%
zkk;k;U_8|`gdq%JNZwf(Jt0i-@-lvWd=v)<2c@78CB@|H!`B28`gU}^g*6xYbW|*b
zcKrJKdWn2{age>ey_s)EA77{mlX9Ga(C4#{X9z<W!jOMPNZ>+2l2^p(-bPGV)r4Y2
z>wMqlTJnf=T?z&Pm4e6I$Kx5VF+W(JfKr*)2>Kz0Yo{=q-7iBJ!VreAk0&3$5XY+?
z5qx|Y2t>Yf0LJm)8DkN8g&UVU;FvEI;2E!#Wso3!vb5A8w>g4AaIwZEpM5+-7_y>}
bUjhsOD7o`e#`SsH00000NkvXXu0mjfGJ*N+

diff --git a/themes/default/images/report-thumb-default.jpg b/themes/default/images/report-thumb-default.jpg
deleted file mode 100644
index 9ab94659cb4c14782f576d7d25c0a97f68658447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 997
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3@r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!C=i0$;>Foz$D1XEXer(2ty&z
z*+9b>f$oF>HV$@9MrKwnMr1*-qyPgW3nLRVD=P;xL@^TsBQp!DppXa~yP~16sJNrj
zmC&hyiAG7AO-eX|r-TV&81erW0}s$PCP8LF2788II~-7fqwc{^>gL6&PWxLAMeX%T
z)v#!^`fx0$*?7jWZ)xpEZtk3Ur!=kZ+!wj?OXj-#XPB||-!=2c0hN;boSyxQUHVLN
zj_j(CSph9;M5Zq5QJEaiyQJ#!nU5QHXPomn^L}ym>P;L?(6HtH?!U~YDdd%4(LRHY
z)ecWwj3x^2aeC+Cuf0=vfA#+C1=F3`#HW6=lTr5PZ98^UrGF)F)zoBV%@iYJHNm?o
zeed4=+G&65h2i;ivbK*c;th9w%)5QOGIbyS-r4a7kG}o=M@3S~<HMed9XE3QjayG1
zVZGs;v~)$A;{@3b*_+?IrR|ensn{J)5o~%{?tj7~e(J_GNA&a_8FQMgUAD+s+hTIH
z?Cwam{Q&}CkaMg5&C34_V*6h*aXtUred<ozdcDL&MtxIn>fhaV=-t_*s2H8nhAkK8
zC_eI;6CYMoSSxvSLTHHC<X^9+?Nq5b+B%`n%XEkJ*BSEz*V;DClV-5mzw4Tmg0A%D
zfb#d{j_Cqfe<8_>?d*zwr{;gm{x?CP<*WEa?c#ePnR^xotGYRF?B3<{MDR@Frl@Zc
zk>^{s9J2oQ`;e2$t+%%xhRH9ob;<4zKb39cQ(f`xRPqmV`A-}6w(Z_{|K@}De^%(K
z`&n}BSA6(n#pl*DbAKw&S1&SD=s9Po*tCZy?mq*6=n~y^QG$Yk8ModhoX9Y(YXF00
zZP#n-7CMU*v_)+@v6$m{nZC@^Evzl2b<$hE<b9Eyx4l&O+10wKy+2a;qjz<F&f4#F
z?2i%q+Pf}4x5h6`u9IYEy>@Srz>c4L)2`0lDidbfxi!}`{o!ue2}vm|xPkotn*eU`
BRx1Di


From 2e799909bdf594baf8a38ecb90cad96c68ce1ef5 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 29 Jun 2012 12:53:59 +1200
Subject: [PATCH 12/30] Convert admin to use Requirements and move admin
 requirements into Themes #338

* Also updates all admin controller to set XYZ_enabled in themes
* Add requirements at the last minute through views_pre_render event
* Pass api_url_all as an array of urls, for easier use with Requirements
* Make Requirements handle arrays of css or js files
* Move some admin js to media/js/admin.js instead of inline
---
 application/controllers/admin.php             |  38 ++--
 .../controllers/admin/addons/plugins.php      |   2 +-
 application/controllers/admin/checkins.php    |   2 +-
 application/controllers/admin/comments.php    |   2 +-
 application/controllers/admin/dashboard.php   |   4 +-
 application/controllers/admin/manage.php      |  22 +-
 .../controllers/admin/manage/actions.php      |  20 +-
 .../controllers/admin/manage/alerts.php       |   2 +-
 .../controllers/admin/manage/badges.php       |   2 +-
 .../controllers/admin/manage/blocks.php       |   4 +-
 .../controllers/admin/manage/forms.php        |   4 +-
 .../controllers/admin/manage/scheduler.php    |   2 +-
 application/controllers/admin/messages.php    |   2 +-
 .../controllers/admin/messages/reporters.php  |  14 +-
 application/controllers/admin/reports.php     |  82 +++----
 application/controllers/admin/settings.php    |  26 +--
 .../controllers/admin/settings/api.php        |   6 +-
 .../admin/settings/externalapps.php           |   2 +-
 application/controllers/admin/stats.php       |  14 +-
 application/controllers/admin/upgrade.php     |  10 +-
 application/controllers/admin/users.php       |   4 +-
 application/hooks/2_settings.php              |   2 +-
 application/libraries/Requirements.php        |  25 ++-
 application/libraries/Themes.php              | 187 +++++++++++++++-
 application/views/admin/layout.php            | 205 +-----------------
 media/js/admin.js                             |  21 ++
 26 files changed, 372 insertions(+), 332 deletions(-)
 create mode 100644 media/js/admin.js

diff --git a/application/controllers/admin.php b/application/controllers/admin.php
index 9484a9dd96..8889567d42 100644
--- a/application/controllers/admin.php
+++ b/application/controllers/admin.php
@@ -118,24 +118,24 @@ public function __construct()
 		// Retrieve Default Settings
 		$this->template->site_name = Kohana::config('settings.site_name');
 		$this->template->mapstraction = Kohana::config('settings.mapstraction');
-		$this->template->api_url = Kohana::config('settings.api_url');
+		$this->themes->api_url = Kohana::config('settings.api_url');
 
 		// Javascript Header
-		$this->template->map_enabled = FALSE;
-		$this->template->datepicker_enabled = FALSE;
-		$this->template->flot_enabled = FALSE;
-		$this->template->treeview_enabled = FALSE;
-		$this->template->protochart_enabled = FALSE;
-		$this->template->colorpicker_enabled = FALSE;
-		$this->template->editor_enabled = FALSE;
-		$this->template->tablerowsort_enabled = FALSE;
-		$this->template->json2_enabled = FALSE;
-		$this->template->js = '';
+		$this->themes->map_enabled = FALSE;
+		$this->themes->datepicker_enabled = FALSE;
+		$this->themes->flot_enabled = FALSE;
+		$this->themes->treeview_enabled = FALSE;
+		$this->themes->protochart_enabled = FALSE;
+		$this->themes->colorpicker_enabled = FALSE;
+		$this->themes->editor_enabled = FALSE;
+		$this->themes->tablerowsort_enabled = FALSE;
+		$this->themes->json2_enabled = FALSE;
+		$this->themes->js = '';
 		$this->template->form_error = FALSE;
 
 		// Initialize some variables for raphael impact charts
-		$this->template->raphael_enabled = FALSE;
-		$this->template->impact_json = '';
+		$this->themes->raphael_enabled = FALSE;
+		$this->themes->impact_json = '';
 
 		// Generate main tab navigation list.
 		$this->template->main_tabs = admin::main_tabs();
@@ -158,6 +158,8 @@ public function __construct()
 
 		// Language switcher
 		$this->template->languages = $this->themes->languages();
+		
+		Event::add('ushahidi_filter.view_pre_render-admin_layout', array($this, '_trigger_requirements'));
 	}
 
 	public function index()
@@ -220,6 +222,16 @@ private function _new_or_not($release_version=NULL, $version_ushahidi=NULL)
 
 		return TRUE;
 	}
+	
+	/**
+	 * Trigger themes->admin_requirements() at the last minute
+	 * 
+	 * This is in case features are enabled/disabled
+	 */
+	public function _trigger_requirements()
+	{
+		$this->themes->admin_requirements();
+	}
 
 
 } // End Admin
diff --git a/application/controllers/admin/addons/plugins.php b/application/controllers/admin/addons/plugins.php
index 0080a44817..ee5e5518b4 100644
--- a/application/controllers/admin/addons/plugins.php
+++ b/application/controllers/admin/addons/plugins.php
@@ -198,7 +198,7 @@ public function index()
 		$this->template->content->status = $status;
 
 		// Javascript Header
-		$this->template->js = new View('admin/addons/addons_js');
+		$this->themes->js = new View('admin/addons/addons_js');
 	}
 
 }
diff --git a/application/controllers/admin/checkins.php b/application/controllers/admin/checkins.php
index 0745c5202b..14488fca89 100644
--- a/application/controllers/admin/checkins.php
+++ b/application/controllers/admin/checkins.php
@@ -111,7 +111,7 @@ function index()
         $this->template->content->total_items = $pagination->total_items;
         
         // Javascript Header
-        $this->template->js = new View('admin/checkins/checkins_js');
+        $this->themes->js = new View('admin/checkins/checkins_js');
 	}
 
 }
diff --git a/application/controllers/admin/comments.php b/application/controllers/admin/comments.php
index 308e67dd1c..6e760aaf31 100644
--- a/application/controllers/admin/comments.php
+++ b/application/controllers/admin/comments.php
@@ -186,7 +186,7 @@ function index($page = 1)
         $this->template->content->status = $status;
         
         // Javascript Header
-        $this->template->js = new View('admin/comments/comments_js');        
+        $this->themes->js = new View('admin/comments/comments_js');        
     }
     
 }
diff --git a/application/controllers/admin/dashboard.php b/application/controllers/admin/dashboard.php
index bd8cecbe51..dcda5cc2eb 100644
--- a/application/controllers/admin/dashboard.php
+++ b/application/controllers/admin/dashboard.php
@@ -96,8 +96,8 @@ public function index()
 											->find_all();
 
 		// Javascript Header
-		$this->template->protochart_enabled = TRUE;
-		$this->template->js = new View('admin/stats/stats_js');
+		$this->themes->protochart_enabled = TRUE;
+		$this->themes->js = new View('admin/stats/stats_js');
 
 		$this->template->content->failure = '';
 
diff --git a/application/controllers/admin/manage.php b/application/controllers/admin/manage.php
index d8261d0a97..028374389c 100644
--- a/application/controllers/admin/manage.php
+++ b/application/controllers/admin/manage.php
@@ -351,13 +351,13 @@ public function index()
 		$this->template->content->parents_array = $parents_array;
 
 		// Javascript Header
-		$this->template->colorpicker_enabled = TRUE;
-		$this->template->tablerowsort_enabled = TRUE;
-		$this->template->js = new View('admin/manage/categories/categories_js');
+		$this->themes->colorpicker_enabled = TRUE;
+		$this->themes->tablerowsort_enabled = TRUE;
+		$this->themes->js = new View('admin/manage/categories/categories_js');
 		$this->template->form_error = $form_error;
 
 		$this->template->content->locale_array = $locales;
-		$this->template->js->locale_array = $locales;
+		$this->themes->js->locale_array = $locales;
 	}
 	
 	/**
@@ -530,8 +530,8 @@ public function pages()
 		$this->template->content->errors = $errors;
 
 		// Javascript Header
-		$this->template->editor_enabled = TRUE;
-		$this->template->js = new View('admin/manage/pages/pages_js');
+		$this->themes->editor_enabled = TRUE;
+		$this->themes->js = new View('admin/manage/pages/pages_js');
 	}
 
 
@@ -634,8 +634,8 @@ public function feeds()
 		$this->template->content->errors = $errors;
 
 		// Javascript Header
-		$this->template->colorpicker_enabled = TRUE;
-		$this->template->js = new View('admin/manage/feeds/feeds_js');
+		$this->themes->colorpicker_enabled = TRUE;
+		$this->themes->js = new View('admin/manage/feeds/feeds_js');
 	}
 
 	/**
@@ -702,7 +702,7 @@ public function feeds_items()
 		$this->template->content->total_items = $pagination->total_items;
 
 		// Javascript Header
-		$this->template->js = new View('admin/manage/feeds/items_js');
+		$this->themes->js = new View('admin/manage/feeds/items_js');
 	}
 
 	/**
@@ -913,8 +913,8 @@ public function layers()
 		$this->template->content->layers = $layers;
 
 		// Javascript Header
-		$this->template->colorpicker_enabled = TRUE;
-		$this->template->js = new View('admin/manage/layers/layers_js');
+		$this->themes->colorpicker_enabled = TRUE;
+		$this->themes->js = new View('admin/manage/layers/layers_js');
 	}
 
 	/**
diff --git a/application/controllers/admin/manage/actions.php b/application/controllers/admin/manage/actions.php
index e47734c2c9..7a755580d5 100644
--- a/application/controllers/admin/manage/actions.php
+++ b/application/controllers/admin/manage/actions.php
@@ -34,18 +34,18 @@ function index()
 		$this->template->content = new View('admin/manage/actions/main');
 		$this->template->content->title = Kohana::lang('ui_admin.actions');
 
-		$this->template->map_enabled = TRUE;
-		$this->template->treeview_enabled = TRUE;
+		$this->themes->map_enabled = TRUE;
+		$this->themes->treeview_enabled = TRUE;
 
-		$this->template->js = new View('admin/manage/actions/actions_js');
-		$this->template->js->default_map = Kohana::config('settings.default_map');
-		$this->template->js->default_zoom = Kohana::config('settings.default_zoom');
-		$this->template->js->latitude = Kohana::config('settings.default_lat');
-		$this->template->js->longitude = Kohana::config('settings.default_lon');
+		$this->themes->js = new View('admin/manage/actions/actions_js');
+		$this->themes->js->default_map = Kohana::config('settings.default_map');
+		$this->themes->js->default_zoom = Kohana::config('settings.default_zoom');
+		$this->themes->js->latitude = Kohana::config('settings.default_lat');
+		$this->themes->js->longitude = Kohana::config('settings.default_lon');
 
 		// TODO: Figure out what to do with this
-		$this->template->js->incident_zoom = array();
-		$this->template->js->geometries = array();
+		$this->themes->js->incident_zoom = array();
+		$this->themes->js->geometries = array();
 
 		$trigger_options = $this->_trigger_options();
 		$response_options = $this->_response_options();
@@ -265,7 +265,7 @@ function index()
 		$this->template->content->errors = $errors;
 
 		// Enable date picker
-		$this->template->datepicker_enabled = TRUE;
+		$this->themes->datepicker_enabled = TRUE;
 	}
 
 	function changestate(){
diff --git a/application/controllers/admin/manage/alerts.php b/application/controllers/admin/manage/alerts.php
index ce2cb45a8d..ab8dea4221 100644
--- a/application/controllers/admin/manage/alerts.php
+++ b/application/controllers/admin/manage/alerts.php
@@ -161,6 +161,6 @@ public function index()
 		$this->template->content->keyword = $keyword;
 
 		// Javascript Header
-		$this->template->js = new View('admin/manage/alerts/alerts_js');
+		$this->themes->js = new View('admin/manage/alerts/alerts_js');
 	}
 }
\ No newline at end of file
diff --git a/application/controllers/admin/manage/badges.php b/application/controllers/admin/manage/badges.php
index 23a162b410..79b6ebc040 100644
--- a/application/controllers/admin/manage/badges.php
+++ b/application/controllers/admin/manage/badges.php
@@ -226,6 +226,6 @@ function index()
 		$this->template->content->users = $users;
 
 		// Javascript Header
-		$this->template->js = new View('admin/manage/badges/badges_js');
+		$this->themes->js = new View('admin/manage/badges/badges_js');
 	}
 }
diff --git a/application/controllers/admin/manage/blocks.php b/application/controllers/admin/manage/blocks.php
index 73ac5208e2..5724b9892a 100644
--- a/application/controllers/admin/manage/blocks.php
+++ b/application/controllers/admin/manage/blocks.php
@@ -111,8 +111,8 @@ function index()
 		$this->template->content->sorted_blocks = $sorted_blocks;
 		
 		// Javascript Header
-		$this->template->tablerowsort_enabled = TRUE;
-		$this->template->js = new View('admin/manage/blocks/blocks_js');
+		$this->themes->tablerowsort_enabled = TRUE;
+		$this->themes->js = new View('admin/manage/blocks/blocks_js');
 	}
 	
 	public function sort()
diff --git a/application/controllers/admin/manage/forms.php b/application/controllers/admin/manage/forms.php
index 3abeda4635..7650a276b0 100755
--- a/application/controllers/admin/manage/forms.php
+++ b/application/controllers/admin/manage/forms.php
@@ -173,8 +173,8 @@ public function index()
 		$this->template->content->errors = $errors;
 
         // Javascript Header
-        $this->template->js = new View('admin/manage/forms/forms_js');
-		$this->template->js->form_id = $form_id;
+        $this->themes->js = new View('admin/manage/forms/forms_js');
+		$this->themes->js->form_id = $form_id;
 		$this->template->form_error = $form_error;
 	}
 
diff --git a/application/controllers/admin/manage/scheduler.php b/application/controllers/admin/manage/scheduler.php
index 98db64b0cd..cc437f9802 100644
--- a/application/controllers/admin/manage/scheduler.php
+++ b/application/controllers/admin/manage/scheduler.php
@@ -197,7 +197,7 @@ function index()
 		$this->template->content->errors = $errors;
 
         // Javascript Header
-		$this->template->js = new View('admin/manage/scheduler/scheduler_js');
+		$this->themes->js = new View('admin/manage/scheduler/scheduler_js');
 	}
 
 
diff --git a/application/controllers/admin/messages.php b/application/controllers/admin/messages.php
index 9c770e97ef..4280331857 100755
--- a/application/controllers/admin/messages.php
+++ b/application/controllers/admin/messages.php
@@ -245,7 +245,7 @@ public function index($service_id = 1)
 		$this->template->content->level = $level;
 
 		// Javascript Header
-		$this->template->js = new View('admin/messages/messages_js');
+		$this->themes->js = new View('admin/messages/messages_js');
 	}
 
 	/**
diff --git a/application/controllers/admin/messages/reporters.php b/application/controllers/admin/messages/reporters.php
index 146d1f095c..81a3ef48fc 100644
--- a/application/controllers/admin/messages/reporters.php
+++ b/application/controllers/admin/messages/reporters.php
@@ -216,12 +216,12 @@ public function index($service_id = 1)
 		$this->template->content->service_array = Service_Model::get_array();
 		
 		// Javascript Header
-        $this->template->map_enabled = TRUE;
-        $this->template->js = new View('admin/reporters/reporters_js');
-		$this->template->js->default_map = Kohana::config('settings.default_map');
-		$this->template->js->default_zoom = Kohana::config('settings.default_zoom');
-		$this->template->js->latitude = Kohana::config('settings.default_lat');
-		$this->template->js->longitude = Kohana::config('settings.default_lon');
-		$this->template->js->form_error = $form_error;
+        $this->themes->map_enabled = TRUE;
+        $this->themes->js = new View('admin/reporters/reporters_js');
+		$this->themes->js->default_map = Kohana::config('settings.default_map');
+		$this->themes->js->default_zoom = Kohana::config('settings.default_zoom');
+		$this->themes->js->latitude = Kohana::config('settings.default_lat');
+		$this->themes->js->longitude = Kohana::config('settings.default_lon');
+		$this->themes->js->form_error = $form_error;
 	}
 }
diff --git a/application/controllers/admin/reports.php b/application/controllers/admin/reports.php
index 30f74883c3..dd847ee51f 100755
--- a/application/controllers/admin/reports.php
+++ b/application/controllers/admin/reports.php
@@ -305,7 +305,7 @@ public function index($page = 1)
 		$this->template->treeview_enabled = TRUE;
 
 		// Javascript Header
-		$this->template->js = new View('admin/reports/reports_js');
+		$this->themes->js = new View('admin/reports/reports_js');
 	}
 
 	/**
@@ -804,29 +804,29 @@ public function edit($id = FALSE, $saved = FALSE)
 		$this->template->content->next_url = $next_url;
 
 		// Javascript Header
-		$this->template->map_enabled = TRUE;
-		$this->template->colorpicker_enabled = TRUE;
-		$this->template->treeview_enabled = TRUE;
-		$this->template->json2_enabled = TRUE;
+		$this->themes->map_enabled = TRUE;
+		$this->themes->colorpicker_enabled = TRUE;
+		$this->themes->treeview_enabled = TRUE;
+		$this->themes->json2_enabled = TRUE;
 
-		$this->template->js = new View('reports/submit_edit_js');
-		$this->template->js->edit_mode = TRUE;
-		$this->template->js->default_map = Kohana::config('settings.default_map');
-		$this->template->js->default_zoom = Kohana::config('settings.default_zoom');
+		$this->themes->js = new View('reports/submit_edit_js');
+		$this->themes->js->edit_mode = TRUE;
+		$this->themes->js->default_map = Kohana::config('settings.default_map');
+		$this->themes->js->default_zoom = Kohana::config('settings.default_zoom');
 
 		if ( ! $form['latitude'] OR !$form['latitude'])
 		{
-			$this->template->js->latitude = Kohana::config('settings.default_lat');
-			$this->template->js->longitude = Kohana::config('settings.default_lon');
+			$this->themes->js->latitude = Kohana::config('settings.default_lat');
+			$this->themes->js->longitude = Kohana::config('settings.default_lon');
 		}
 		else
 		{
-			$this->template->js->latitude = $form['latitude'];
-			$this->template->js->longitude = $form['longitude'];
+			$this->themes->js->latitude = $form['latitude'];
+			$this->themes->js->longitude = $form['longitude'];
 		}
 
-		$this->template->js->incident_zoom = $form['incident_zoom'];
-		$this->template->js->geometries = $form['geometry'];
+		$this->themes->js->incident_zoom = $form['incident_zoom'];
+		$this->themes->js->geometries = $form['geometry'];
 
 		// Inline Javascript
 		$this->template->content->date_picker_js = $this->_date_picker_js();
@@ -834,8 +834,8 @@ public function edit($id = FALSE, $saved = FALSE)
 		$this->template->content->new_category_toggle_js = $this->_new_category_toggle_js();
 
 		// Pack Javascript
-		$myPacker = new javascriptpacker($this->template->js , 'Normal', FALSE, FALSE);
-		$this->template->js = $myPacker->pack();
+		$myPacker = new javascriptpacker($this->themes->js , 'Normal', FALSE, FALSE);
+		$this->themes->js = $myPacker->pack();
 	}
 
 
@@ -862,7 +862,7 @@ public function download()
 			'to_date'	   => '',
 			'form_auth_token'=> ''
 		);
-		
+
 		// Default to all selected
 		$form['data_active'] = array(0,1);
 		$form['data_verified'] = array(0,1);
@@ -963,31 +963,31 @@ public function download()
 
 				// Retrieve reports
 				$incidents = ORM::factory('incident')->where($filter)->orderby('incident_dateadd', 'desc')->find_all();
-				
+
 				// Retrieve categories
 				$categories = Category_Model::get_categories(FALSE, FALSE, FALSE);
-				
+
 				// Retrieve Forms
 				$forms = ORM::Factory('form')->find_all();
-				
+
 				// Retrieve Custom forms
 				$custom_forms = customforms::get_custom_form_fields();
 
 				// If CSV format is selected
 				if($post->format == 'csv')
-				{
+					{
 					$report_csv = download::download_csv($post, $incidents, $custom_forms);
+
+				// Output to browser
+				header("Content-type: text/x-csv");
+				header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+				header("Content-Disposition: attachment; filename=" . time() . ".csv");
+				header("Content-Length: " . strlen($report_csv));
+				echo $report_csv;
+				exit;
 					
-					// Output to browser
-					header("Content-type: text/x-csv");
-					header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-					header("Content-Disposition: attachment; filename=" . time() . ".csv");
-					header("Content-Length: " . strlen($report_csv));
-					echo $report_csv;
-					exit;
-					
-				}
-				
+			}
+
 				// If XML format is selected
 				if($post->format == 'xml')
 				{ 
@@ -1017,8 +1017,8 @@ public function download()
 		$this->template->content->form_error = $form_error;
 
 		// Javascript Header
-		$this->template->js = new View('admin/reports/download_js');
-		$this->template->js->calendar_img = url::base() . "media/img/icon-calendar.gif";
+		$this->themes->js = new View('admin/reports/download_js');
+		$this->themes->js->calendar_img = url::base() . "media/img/icon-calendar.gif";
 	}
 
 	public function upload()
@@ -1051,14 +1051,14 @@ public function upload()
 					->add_rules('uploadfile', 'upload::valid', 'upload::required', 'upload::type[xml,csv]', 'upload::size[3M]');
 					
 			if($post->validate(TRUE))
-			{
+					{
 				// Establish if file to be uploaded is .xml or .csv format
 				$fileinfo = pathinfo($post['uploadfile']['name']);
 				$extension = $fileinfo['extension'];
 				$allowable_extensions = array ('csv', 'xml');
-				
+
 				if (file_exists($_FILES['uploadfile']['tmp_name']))
-				{
+						{
 					// If file type uploaded is CSV or XML
 					if (in_array($extension, $allowable_extensions))
 					{
@@ -1076,7 +1076,7 @@ public function upload()
 						else
 						{
 							$errors = $importer->errors;
-						}	
+						}
 					}
 					
 					else
@@ -1097,11 +1097,11 @@ public function upload()
 				foreach($post->errors('reports') as $error)
 				{
 					$errors[] = $error;
-				}
-				
+			}
+
 			}
 			
-			if ( count($errors))
+			if (count($errors))
 			{
 				$this->template->content = new View('admin/reports/upload');
 				$this->template->content->title = Kohana::lang('ui_admin.upload_reports');
diff --git a/application/controllers/admin/settings.php b/application/controllers/admin/settings.php
index 4d4aa1b76a..fa472aea3a 100755
--- a/application/controllers/admin/settings.php
+++ b/application/controllers/admin/settings.php
@@ -41,7 +41,7 @@ public function site()
 	{
 		$this->template->content = new View('admin/settings/site');
 		$this->template->content->title = Kohana::lang('ui_admin.settings');
-		$this->template->js = new View('admin/settings/site_js');
+		$this->themes->js = new View('admin/settings/site_js');
 
 		// setup and initialize form field names
 		$form = array(
@@ -291,7 +291,7 @@ public function site()
 		}
 
 
-		$this->template->colorpicker_enabled = TRUE;
+		$this->themes->colorpicker_enabled = TRUE;
 		$this->template->content->form = $form;
 		$this->template->content->errors = $errors;
 		$this->template->content->form_error = $form_error;
@@ -341,7 +341,7 @@ public function site()
 	public function index($saved = false)
 	{
 		// Display all maps
-		$this->template->api_url = Kohana::config('settings.api_url_all');
+		$this->themes->api_url = Kohana::config('settings.api_url_all');
 
 		// Current Default Country
 		$current_country = Kohana::config('settings.default_country');
@@ -590,14 +590,14 @@ public function index($saved = false)
 			'0'=>utf8::strtoupper(Kohana::lang('ui_main.no')));
 
 		// Javascript Header
-		$this->template->map_enabled = TRUE;
-		$this->template->colorpicker_enabled = TRUE;
-		$this->template->js = new View('admin/settings/settings_js');
-		$this->template->js->default_map = $form['default_map'];
-		$this->template->js->default_zoom = $form['default_zoom'];
-		$this->template->js->default_lat = $form['default_lat'];
-		$this->template->js->default_lon = $form['default_lon'];
-		$this->template->js->all_maps_json = $this->_generate_settings_map_js();
+		$this->themes->map_enabled = TRUE;
+		$this->themes->colorpicker_enabled = TRUE;
+		$this->themes->js = new View('admin/settings/settings_js');
+		$this->themes->js->default_map = $form['default_map'];
+		$this->themes->js->default_zoom = $form['default_zoom'];
+		$this->themes->js->default_lat = $form['default_lat'];
+		$this->themes->js->default_lon = $form['default_lon'];
+		$this->themes->js->all_maps_json = $this->_generate_settings_map_js();
 	}
 
 
@@ -787,7 +787,7 @@ public function email()
 		$this->template->content->email_ssl_array = array('1'=>Kohana::lang('ui_admin.yes'),'0'=>Kohana::lang('ui_admin.no'));
 
 		// Javascript Header
-		$this->template->js = new View('admin/settings/email_js');
+		$this->themes->js = new View('admin/settings/email_js');
 	}
 
 		/**
@@ -878,7 +878,7 @@ public function cleanurl() {
 		$this->template->content->form_error = $form_error;
 		$this->template->content->form_saved = $form_saved;
 		$this->template->content->yesno_array = array('1'=>utf8::strtoupper(Kohana::lang('ui_main.yes')),'0'=>utf8::strtoupper(Kohana::lang('ui_main.no')));
-		$this->template->content->is_clean_url_enabled = $this->_check_for_clean_url();
+		$this->themes->content->is_clean_url_enabled = $this->_check_for_clean_url();
 
 	}
 
diff --git a/application/controllers/admin/settings/api.php b/application/controllers/admin/settings/api.php
index 98a448f13d..e089742139 100644
--- a/application/controllers/admin/settings/api.php
+++ b/application/controllers/admin/settings/api.php
@@ -149,7 +149,7 @@ public function index()
         );
         
         // Javascript header
-        $this->template->js = new View('admin/settings/api/api_js');
+        $this->themes->js = new View('admin/settings/api/api_js');
     }
     
     /**
@@ -267,7 +267,7 @@ public function log()
         $this->template->content->pagination = $pagination;
         
         // Javascript header
-        $this->template->js = new View('admin/settings/api/logs_js');
+        $this->themes->js = new View('admin/settings/api/logs_js');
     }
     
     /**
@@ -349,6 +349,6 @@ public function banned()
         $this->template->content->pagination = $pagination;
         
         // Javascript header
-        $this->template->js = new View('admin/settings/api/banned_js');
+        $this->themes->js = new View('admin/settings/api/banned_js');
     }
 }
diff --git a/application/controllers/admin/settings/externalapps.php b/application/controllers/admin/settings/externalapps.php
index 2e33ea1986..d8fd31560f 100644
--- a/application/controllers/admin/settings/externalapps.php
+++ b/application/controllers/admin/settings/externalapps.php
@@ -99,7 +99,7 @@ function index()
 		$this->template->content->form_saved = $form_saved;
 		
 		// Javascript Header
-		$this->template->js = new View('admin/settings/externalapps/externalapps_js');
+		$this->themes->js = new View('admin/settings/externalapps/externalapps_js');
 	}
 	
 }
diff --git a/application/controllers/admin/stats.php b/application/controllers/admin/stats.php
index f5606c74fb..8f2938d0e1 100644
--- a/application/controllers/admin/stats.php
+++ b/application/controllers/admin/stats.php
@@ -55,8 +55,8 @@ public function reports()
 		$this->template->content->title = Kohana::lang('ui_admin.statistics');
 
 		// Javascript Header
-		$this->template->protochart_enabled = TRUE;
-		$this->template->js = new View('admin/stats/stats_js');
+		$this->themes->protochart_enabled = TRUE;
+		$this->themes->js = new View('admin/stats/stats_js');
 
 		$this->template->content->failure = '';
 
@@ -192,8 +192,8 @@ public function impact()
         $this->template->content->title = Kohana::lang('ui_admin.statistics');
         
         // Javascript Header
-        $this->template->raphael_enabled = TRUE;
-        $this->template->js = new View('admin/stats/stats_js');
+        $this->themes->raphael_enabled = TRUE;
+        $this->themes->js = new View('admin/stats/stats_js');
         
         $this->template->content->failure = '';
         
@@ -298,8 +298,8 @@ public function hits()
         $this->template->content->title = Kohana::lang('ui_admin.statistics');
         
         // Javascript Header
-        $this->template->protochart_enabled = TRUE;
-        $this->template->js = new View('admin/stats/stats_js');
+        $this->themes->protochart_enabled = TRUE;
+        $this->themes->js = new View('admin/stats/stats_js');
         
         $this->template->content->failure = '';
         
@@ -372,7 +372,7 @@ function country()
         $this->template->content->title = Kohana::lang('ui_admin.statistics');
         
         // Javascript Header
-        $this->template->js = new View('admin/stats/stats_js');
+        $this->themes->js = new View('admin/stats/stats_js');
         
         $this->template->content->failure = '';
         
diff --git a/application/controllers/admin/upgrade.php b/application/controllers/admin/upgrade.php
index deffd3ce23..9b6673a9e1 100644
--- a/application/controllers/admin/upgrade.php
+++ b/application/controllers/admin/upgrade.php
@@ -76,8 +76,8 @@ public function index()
 			{
 				$this->upgrade->logger("STARTED UPGRADE\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
 				$this->template->content = new View('admin/upgrade/upgrade_status');
-				$this->template->js = new View('admin/upgrade/upgrade_status_js');
-				$this->template->js->backup = $post->chk_db_backup_box;
+				$this->themes->js = new View('admin/upgrade/upgrade_status_js');
+				$this->themes->js->backup = $post->chk_db_backup_box;
 				$this->template->content->title = Kohana::lang('ui_admin.upgrade_ushahidi_status');
 				
 				$this->session->set('ftp_server', $post->ftp_server);
@@ -88,12 +88,12 @@ public function index()
 				Settings_Model::save_setting('ftp_user_name', $post->ftp_user_name);
 				
 				// Log file location
-				$this->template->js->log_file = url::site(). "admin/upgrade/logfile?f=".$this->session->get('upgrade_session').".txt";
+				$this->themes->js->log_file = url::site(). "admin/upgrade/logfile?f=".$this->session->get('upgrade_session').".txt";
 			}
 			 // No! We have validation errors, we need to show the form again, with the errors
 			else
 			{
-				$this->template->js = new View('admin/upgrade/upgrade_js');
+				$this->themes->js = new View('admin/upgrade/upgrade_js');
 				
 				// repopulate the form fields
 				$form = arr::overwrite($form, $post->as_array());
@@ -105,7 +105,7 @@ public function index()
 		}
 		else
 		{
-			$this->template->js = new View('admin/upgrade/upgrade_js');
+			$this->themes->js = new View('admin/upgrade/upgrade_js');
 		}
 		
 		$this->template->content->ftp_server = Settings_Model::get_setting('ftp_server');
diff --git a/application/controllers/admin/users.php b/application/controllers/admin/users.php
index d3f2d36cd6..f0d2d0cb27 100755
--- a/application/controllers/admin/users.php
+++ b/application/controllers/admin/users.php
@@ -35,7 +35,7 @@ public function __construct()
 	public function index()
 	{
 		$this->template->content = new View('admin/users/main');
-		$this->template->js = new View('admin/users/users_js');
+		$this->themes->js = new View('admin/users/users_js');
 
 		// Check, has the form been submitted, if so, setup validation
 		if ($_POST)
@@ -337,7 +337,7 @@ public function roles()
 		$this->template->content->form_error = $form_error;
 		$this->template->content->form_saved = $form_saved;
 		$this->template->content->form_action = $form_action;
-		$this->template->js = new View('admin/users/roles_js');
+		$this->themes->js = new View('admin/users/roles_js');
 	}
 
 	/**
diff --git a/application/hooks/2_settings.php b/application/hooks/2_settings.php
index 336495e2b1..1a680f59e2 100644
--- a/application/hooks/2_settings.php
+++ b/application/hooks/2_settings.php
@@ -53,7 +53,7 @@
 {
 	if (empty($layer->api_url)) continue;
 	// Add to array, use url as key to avoid dupes
-	$api_url_all[$layer->api_url] = '<script type="text/javascript" src="'.$layer->api_url.'"></script>';
+	$api_url_all[$layer->api_url] = $layer->api_url;
 }
 Kohana::config_set('settings.api_url_all', $api_url_all);
 
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index 9c097d4b97..b2b39f7eb7 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -103,7 +103,7 @@ public static function set_backend(Requirements_Backend $backend) {
 	 * See {@link Requirements_Backend::javascript()} for more info
 	 * 
 	 */
-	static function js($file) {		
+	static function js($file) {
 		self::backend()->js($file);
 	}
 	
@@ -511,9 +511,20 @@ public function set_write_js_to_body($var) {
 	/**
 	 * Register the given javascript file as required.
 	 * Filenames should be relative to the base, eg, 'framework/javascript/loader.js'
+	 * @param $file String|Array Filenames should be relative to the base, eg, 'framework/javascript/tree/tree.js'
 	 */
 	
 	public function js($file) {
+		// If array, loop over array and add individual js files
+		if (is_array($file))
+		{
+			foreach($file as $name)
+			{
+				$this->js($name);
+			}
+			return;
+		}
+		
 		$this->js[$file] = true;
 	}
 	
@@ -565,11 +576,21 @@ function customHeadTags($html, $uniquenessID = null) {
 	/**
 	 * Register the given stylesheet file as required.
 	 * 
-	 * @param $file String Filenames should be relative to the base, eg, 'framework/javascript/tree/tree.css'
+	 * @param $file String|Array Filenames should be relative to the base, eg, 'framework/javascript/tree/tree.css'
 	 * @param $media String Comma-separated list of media-types (e.g. "screen,projector") 
 	 * @see http://www.w3.org/TR/REC-CSS2/media.html
 	 */
 	function css($file, $media = null) {
+		// If array, loop over array and add individual js files
+		if (is_array($file))
+		{
+			foreach($file as $name)
+			{
+				$this->css($name);
+			}
+			return;
+		}
+		
 		$this->css[$file] = array(
 			"media" => $media
 		);
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index e9c23b7be1..6b42ef05e7 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -24,8 +24,15 @@ class Themes_Core {
 	public $validator_enabled = false;
 	public $photoslider_enabled = false;
 	public $colorpicker_enabled = false;
+	public $datepicker_enabled = false;
 	public $editor_enabled = false;
-	public $site_style = false;
+	public $flot_enabled = false;
+	public $protochart_enabled = false;
+	public $raphael_enabled = false;
+	public $tablerowsort_enabled = false;
+	public $json2_enabled = false;
+	
+	// Custom JS to be added
 	public $js = null;
 
 	public $css_url = null;
@@ -208,6 +215,184 @@ private function _header_feeds()
 		}
 	}
 
+	public function admin_requirements()
+	{
+		Requirements::clear();
+		Requirements::set_write_js_to_body(FALSE);
+		Requirements::css('media/css/admin/all');
+		Requirements::css('media/css/jquery-ui-themeroller');
+		Requirements::ieCSS("lt IE 7", 'media/css/admin/ie6');
+
+		// Load OpenLayers
+		if ($this->map_enabled)
+		{
+			Requirements::js('media/js/OpenLayers');
+			Requirements::js('media/js/ushahidi');
+			Requirements::js($this->api_url);
+			Requirements::customJS("OpenLayers.ImgPath = '".url::file_loc('img').'media/img/openlayers/'."';",'openlayers-imgpath');
+			Requirements::css('media/css/openlayers');
+		}
+
+		// Load jQuery
+		Requirements::js('media/js/jquery');
+		Requirements::js('media/js/jquery.form');
+		Requirements::js('media/js/jquery.validate.min');
+		Requirements::js('media/js/jquery.ui.min');
+		Requirements::js('media/js/selectToUISlider.jQuery');
+		Requirements::js('media/js/jquery.hovertip-1.0');
+		Requirements::js('media/js/jquery.base64');
+		Requirements::js("media/js/jquery.pngFix.pack");
+		
+		Requirements::js('media/js/admin');
+	
+		if ($this->datepicker_enabled) {
+			Requirements::customJS("
+				Date.dayNames = [
+				    '". Kohana::lang('datetime.sunday.full') ."',
+				    '". Kohana::lang('datetime.monday.full') ."',
+				    '". Kohana::lang('datetime.tuesday.full') ."',
+				    '". Kohana::lang('datetime.wednesday.full') ."',
+				    '". Kohana::lang('datetime.thursday.full') ."',
+				    '". Kohana::lang('datetime.friday.full') ."',
+				    '". Kohana::lang('datetime.saturday.full') ."'
+				];
+				Date.abbrDayNames = [
+				    '". Kohana::lang('datetime.sunday.abbv') ."',
+				    '". Kohana::lang('datetime.monday.abbv') ."',
+				    '". Kohana::lang('datetime.tuesday.abbv') ."',
+				    '". Kohana::lang('datetime.wednesday.abbv') ."',
+				    '". Kohana::lang('datetime.thursday.abbv') ."',
+				    '". Kohana::lang('datetime.friday.abbv') ."',
+				    '". Kohana::lang('datetime.saturday.abbv') ."'
+				];
+				Date.monthNames = [
+				    '". Kohana::lang('datetime.january.full') ."',
+				    '". Kohana::lang('datetime.february.full') ."',
+				    '". Kohana::lang('datetime.march.full') ."',
+				    '". Kohana::lang('datetime.april.full') ."',
+				    '". Kohana::lang('datetime.may.full') ."',
+				    '". Kohana::lang('datetime.june.full') ."',
+				    '". Kohana::lang('datetime.july.full') ."',
+				    '". Kohana::lang('datetime.august.full') ."',
+				    '". Kohana::lang('datetime.september.full') ."',
+				    '". Kohana::lang('datetime.october.full') ."',
+				    '". Kohana::lang('datetime.november.full') ."',
+				    '". Kohana::lang('datetime.december.full') ."'
+				];
+				Date.abbrMonthNames = [
+				    '". Kohana::lang('datetime.january.abbv') ."',
+				    '". Kohana::lang('datetime.february.abbv') ."',
+				    '". Kohana::lang('datetime.march.abbv') ."',
+				    '". Kohana::lang('datetime.april.abbv') ."',
+				    '". Kohana::lang('datetime.may.abbv') ."',
+				    '". Kohana::lang('datetime.june.abbv') ."',
+				    '". Kohana::lang('datetime.july.abbv') ."',
+				    '". Kohana::lang('datetime.august.abbv') ."',
+				    '". Kohana::lang('datetime.september.abbv') ."',
+				    '". Kohana::lang('datetime.october.abbv') ."',
+				    '". Kohana::lang('datetime.november.abbv') ."',
+				    '". Kohana::lang('datetime.december.abbv') ."'
+				];
+				Date.firstDayOfWeek = 1;
+				Date.format = 'mm/dd/yyyy';
+			",'locale-dates');
+	
+			Requirements::js('media/js/jquery.datePicker');
+			Requirements::customHeadTags(
+				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/jquery.bgiframe.min', TRUE).'<![endif]-->','jquery.bgiframe.min');
+		}
+	
+		Requirements::css('media/css/jquery.hovertip-1.0', '');
+	
+		Requirements::customJS(
+			"$(function() {
+					if($('.tooltip[title]') != null)
+					$('.tooltip[title]').hovertip();
+				});",
+			'tooltip-js'
+		);
+	
+		// Load Flot
+		if ($this->flot_enabled)
+		{
+			Requirements::js('media/js/jquery.flot');
+			Requirements::js('media/js/excanvas.min');
+			Requirements::js('media/js/timeline.js');
+		}
+	
+		// Load TreeView
+		if ($this->treeview_enabled)
+		{
+			Requirements::js('media/js/jquery.treeview');
+			Requirements::css('media/css/jquery.treeview');
+		}
+	
+		// Load ProtoChart
+		if ($this->protochart_enabled)
+		{
+			Requirements::customJS("jQuery.noConflict()", 'jquery-noconflict');
+			Requirements::js('media/js/protochart/prototype');
+			Requirements::customHeadTags(
+				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/protochart/excanvas-compressed', TRUE).'<![endif]-->');
+			Requirements::js('media/js/protochart/ProtoChart');
+		}
+	
+		// Load Raphael
+		if ($this->raphael_enabled)
+		{
+			// The only reason we include prototype is to keep the div element naming convention consistent
+			//Requirements::js('media/js/protochart/prototype');
+			Requirements::js('media/js/raphael');
+			Requirements::customJS('var impact_json = '.$this->impact_json .';','impact_json');
+			Requirements::js('media/js/raphael-ushahidi-impact');
+		}
+	
+		// Load ColorPicker
+		if ($this->colorpicker_enabled)
+		{
+			Requirements::css('media/css/colorpicker');
+			Requirements::js('media/js/colorpicker');
+		}
+	
+		// Load jwysiwyg
+		if ($this->editor_enabled)
+		{
+			if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE) {
+				Requirements::js(url::file_loc('ignore').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js'); // not sure what the hell to do about this
+			} else {
+				Requirements::js('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js');
+			}
+		}
+	
+		// Table Row Sort
+		if ($this->tablerowsort_enabled)
+		{
+			Requirements::js('media/js/jquery.tablednd_0_5');
+		}
+	
+		// JSON2 for IE+
+		if ($this->json2_enabled)
+		{
+			Requirements::js('media/js/json2');
+		}
+	
+		// Turn on picbox
+		Requirements::js('media/js/picbox');
+		Requirements::css('media/css/picbox/picbox');
+	
+		//Turn on jwysiwyg
+		Requirements::css('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.css');
+	
+		// Header Nav
+		Requirements::js('media/js/global');
+		Requirements::css('media/css/global');
+		
+		
+		// Inline Javascript
+		Requirements::customJS($this->js,'pagejs');
+		
+	}
+
 	/**
 	 * Footer Block potentially holds tracking codes or other code that needs
 	 * to run in the footer
diff --git a/application/views/admin/layout.php b/application/views/admin/layout.php
index d9260a4745..88fddcafd6 100644
--- a/application/views/admin/layout.php
+++ b/application/views/admin/layout.php
@@ -19,217 +19,18 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=7" />
 	<title><?php echo html::specialchars($site_name) ?></title>
 	<?php
-	echo html::stylesheet(url::file_loc('css').'media/css/admin/all', '', TRUE);
-	echo html::stylesheet(url::file_loc('css').'media/css/jquery-ui-themeroller', '', TRUE);
-	echo "<!--[if lt IE 7]>".
-		html::stylesheet(url::file_loc('css').'media/css/ie6', '', TRUE)
-		."<![endif]-->";
-
-	// Load OpenLayers
-	if ($map_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/OpenLayers', TRUE);
-		echo html::script(url::file_loc('js').'media/js/ushahidi', TRUE);
-		echo html::script($api_url) . "\n";
-		echo "<script type=\"text/javascript\">
-			OpenLayers.ImgPath = '".url::file_loc('img').'media/img/openlayers/'."';
-			</script>";
-		echo html::stylesheet(url::file_loc('css').'media/css/openlayers','',TRUE);
-	}
-
-	// Load jQuery
-	echo html::script(url::file_loc('js').'media/js/jquery', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.form', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.validate.min', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.ui.min', TRUE);
-	echo html::script(url::file_loc('js').'media/js/selectToUISlider.jQuery', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.hovertip-1.0', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.base64', TRUE);
-	echo html::script(url::file_loc('js')."media/js/jquery.pngFix.pack", TRUE);
-	?>
-
-	<?php if ($datepicker_enabled): ?>
-	<script type="text/javascript">
-		Date.dayNames = [
-		    '<?php echo Kohana::lang('datetime.sunday.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.monday.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.tuesday.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.wednesday.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.thursday.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.friday.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.saturday.full'); ?>'
-		];
-		Date.abbrDayNames = [
-		    '<?php echo Kohana::lang('datetime.sunday.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.monday.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.tuesday.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.wednesday.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.thursday.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.friday.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.saturday.abbv'); ?>'
-		];
-		Date.monthNames = [
-		    '<?php echo Kohana::lang('datetime.january.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.february.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.march.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.april.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.may.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.june.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.july.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.august.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.september.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.october.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.november.full'); ?>',
-		    '<?php echo Kohana::lang('datetime.december.full'); ?>'
-		];
-		Date.abbrMonthNames = [
-		    '<?php echo Kohana::lang('datetime.january.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.february.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.march.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.april.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.may.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.june.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.july.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.august.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.september.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.october.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.november.abbv'); ?>',
-		    '<?php echo Kohana::lang('datetime.december.abbv'); ?>'
-		];
-		Date.firstDayOfWeek = 1;
-		Date.format = 'mm/dd/yyyy';
-	</script>
-
-	<?php
-		echo html::script(url::file_loc('js').'media/js/jquery.datePicker', TRUE);
-		echo '<!--[if IE]>'.
-			html::script(url::file_loc('js').'media/js/jquery.bgiframe.min', TRUE)
-			.'<![endif]-->';
-	?>
-	<?php endif; ?>
-
-	<?php
-	echo html::stylesheet(url::file_loc('css').'media/css/jquery.hovertip-1.0', '', TRUE);
-
-	echo "<script type=\"text/javascript\">
-		$(function() {
-			if($('.tooltip[title]') != null)
-			$('.tooltip[title]').hovertip();
-		});
-	</script>";
-
-	// Load Flot
-	if ($flot_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/jquery.flot', TRUE);
-		echo html::script(url::file_loc('js').'media/js/excanvas.min', TRUE);
-		echo html::script(url::file_loc('js').'media/js/timeline.js', TRUE);
-	}
-
-	// Load TreeView
-	if ($treeview_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/jquery.treeview');
-		echo html::stylesheet(url::file_loc('css').'media/css/jquery.treeview');
-	}
-
-	// Load ProtoChart
-	if ($protochart_enabled)
-	{
-		echo "<script type=\"text/javascript\">jQuery.noConflict()</script>";
-		echo html::script(url::file_loc('js').'media/js/protochart/prototype', TRUE);
-		echo '<!--[if IE]>';
-		echo html::script(url::file_loc('js').'media/js/protochart/excanvas-compressed', TRUE);
-		echo '<![endif]-->';
-		echo html::script(url::file_loc('js').'media/js/protochart/ProtoChart', TRUE);
-	}
-
-	// Load Raphael
-	if ($raphael_enabled)
-	{
-		// The only reason we include prototype is to keep the div element naming convention consistent
-		//echo html::script(url::file_loc('js').'media/js/protochart/prototype', TRUE);
-		echo html::script(url::file_loc('js').'media/js/raphael', TRUE);
-		echo '<script type="text/javascript" charset="utf-8">';
-		echo 'var impact_json = '.$impact_json .';';
-		echo '</script>';
-		echo html::script(url::file_loc('js').'media/js/raphael-ushahidi-impact', TRUE);
-	}
-
-	// Load ColorPicker
-	if ($colorpicker_enabled)
-	{
-		echo html::stylesheet(url::file_loc('css').'media/css/colorpicker', '', TRUE);
-		echo html::script(url::file_loc('js').'media/js/colorpicker', TRUE);
-	}
-
-	// Load jwysiwyg
-	if ($editor_enabled)
-	{
-		if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE) {
-			echo html::script(url::file_loc('ignore').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js', TRUE);
-		} else {
-			echo html::script(url::file_loc('js').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js', TRUE);
-		}
-	}
-
-	// Table Row Sort
-	if ($tablerowsort_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/jquery.tablednd_0_5', TRUE);
-	}
-
-	// JSON2 for IE+
-	if ($json2_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/json2', TRUE);
-	}
-
-	// Turn on picbox
-	echo html::script(url::file_loc('js').'media/js/picbox', TRUE);
-	echo html::stylesheet(url::file_loc('css').'media/css/picbox/picbox');
-
-	//Turn on jwysiwyg
-	echo html::stylesheet(url::file_loc('css').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.css');
-
-	// Header Nav
-	echo html::script(url::file_loc('js').'media/js/global', TRUE);
-	echo html::stylesheet(url::file_loc('css').'media/css/global','',TRUE);
-
-	// Render CSS and Javascript Files from Plugins
-	echo Requirements::render('head');
-
 	// Action::header_scripts_admin - Additional Inline Scripts
 	Event::run('ushahidi_action.header_scripts_admin');
 	?>
 	<script type="text/javascript" charset="utf-8">
-		<?php echo $js . "\n"; ?>
-		function info_search(){
-			$("#info-search").submit();
-		}
-		function show_addedit(toggle){
-			var addEditForm = $("#addedit");
-			if (toggle) {
-				addEditForm.toggle(400);
-			} else {
-				addEditForm.show(400);
-			}
-			// Clear fields, but not buttons or the CSRF token.
-			$(':input','#addedit')
-			 .not(':button, :submit, :reset, #action, :checkbox, [name="form_auth_token"]')
-			 .val('')
-			 .removeAttr('selected');
-			
-			// Reset checkbox separately to avoid wiping its value
-			$(':checkbox','#addedit').removeAttr('checked');
-				
-			$("a.add").focus();
-		}
 		<?php if ($form_error): ?>
 			$(document).ready(function() { $("#addedit").show(); });
 		<?php endif; ?>
 	</script>
 
+	<?php // Render CSS and Javascript Files
+	echo Requirements::render('head'); ?>
+
 	<?php echo $header_block; ?>
 </head>
 <body>
diff --git a/media/js/admin.js b/media/js/admin.js
new file mode 100644
index 0000000000..41983229ea
--- /dev/null
+++ b/media/js/admin.js
@@ -0,0 +1,21 @@
+function info_search(){
+	$("#info-search").submit();
+}
+function show_addedit(toggle){
+	var addEditForm = $("#addedit");
+	if (toggle) {
+		addEditForm.toggle(400);
+	} else {
+		addEditForm.show(400);
+	}
+	// Clear fields, but not buttons or the CSRF token.
+	$(':input','#addedit')
+	 .not(':button, :submit, :reset, #action, :checkbox, [name="form_auth_token"]')
+	 .val('')
+	 .removeAttr('selected');
+	
+	// Reset checkbox separately to avoid wiping its value
+	$(':checkbox','#addedit').removeAttr('checked');
+		
+	$("a.add").focus();
+}

From acc0095c951920f8f766de69db7767787f687460 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 23 Nov 2012 13:06:32 +1300
Subject: [PATCH 13/30] Convert members controllers to use requirements for
 js/css

---
 application/controllers/admin/reports.php     |   6 +-
 application/controllers/members.php           |  47 +++++--
 application/controllers/members/alerts.php    |   2 +-
 application/controllers/members/checkins.php  |   4 +-
 application/controllers/members/dashboard.php |   4 +-
 application/controllers/members/private.php   |   6 +-
 application/controllers/members/profile.php   |   2 +-
 application/controllers/members/reports.php   |  34 ++---
 application/views/members/layout.php          | 131 +-----------------
 9 files changed, 65 insertions(+), 171 deletions(-)

diff --git a/application/controllers/admin/reports.php b/application/controllers/admin/reports.php
index dd847ee51f..f382db5b3a 100755
--- a/application/controllers/admin/reports.php
+++ b/application/controllers/admin/reports.php
@@ -300,9 +300,9 @@ public function index($page = 1)
 		$this->template->content->order_field = $order_field;
 		$this->template->content->sort = $sort;
 		
-		$this->template->map_enabled = TRUE;
-		$this->template->json2_enabled = TRUE;
-		$this->template->treeview_enabled = TRUE;
+		$this->themes->map_enabled = TRUE;
+		$this->themes->json2_enabled = TRUE;
+		$this->themes->treeview_enabled = TRUE;
 
 		// Javascript Header
 		$this->themes->js = new View('admin/reports/reports_js');
diff --git a/application/controllers/members.php b/application/controllers/members.php
index 8c5de566d3..c201e4def5 100644
--- a/application/controllers/members.php
+++ b/application/controllers/members.php
@@ -58,6 +58,10 @@ public function __construct()
 			url::redirect('/');
 		}
 
+		// Themes Helper
+		$this->themes = new Themes();
+		$this->themes->admin = TRUE;
+
 		// Set Table Prefix
 		$this->table_prefix = Kohana::config('database.default.table_prefix');
 
@@ -65,24 +69,25 @@ public function __construct()
 		
 		// Retrieve Default Settings
 		$this->template->site_name = Kohana::config('settings.site_name');
-		$this->template->api_url = Kohana::config('settings.api_url');
+		$this->themes->api_url = Kohana::config('settings.api_url');
 
 		// Javascript Header
-		$this->template->map_enabled = FALSE;
-		$this->template->flot_enabled = FALSE;
-		$this->template->treeview_enabled = FALSE;
-		$this->template->protochart_enabled = FALSE;
-		$this->template->colorpicker_enabled = FALSE;
-		$this->template->editor_enabled = FALSE;
-		$this->template->tablerowsort_enabled = FALSE;
-		$this->template->autocomplete_enabled = FALSE;
-		$this->template->json2_enabled = FALSE;
-		$this->template->js = '';
+		$this->themes->map_enabled = FALSE;
+		$this->themes->flot_enabled = FALSE;
+		$this->themes->treeview_enabled = FALSE;
+		$this->themes->protochart_enabled = FALSE;
+		$this->themes->colorpicker_enabled = FALSE;
+		$this->themes->editor_enabled = FALSE;
+		$this->themes->tablerowsort_enabled = FALSE;
+		$this->themes->autocomplete_enabled = FALSE;
+		$this->themes->json2_enabled = FALSE;
+		$this->themes->js = '';
+		
 		$this->template->form_error = FALSE;
 
 		// Initialize some variables for raphael impact charts
-		$this->template->raphael_enabled = FALSE;
-		$this->template->impact_json = '';
+		$this->themes->raphael_enabled = FALSE;
+		$this->themes->impact_json = '';
 
 		// Generate main tab navigation list.
 		$this->template->main_tabs = members::main_tabs();
@@ -100,12 +105,26 @@ public function __construct()
 			$this->template->header_nav->loggedin_user = Auth::instance()->get_user();
 		}
 		$this->template->header_nav->site_name = Kohana::config('settings.site_name');
-    }
+		
+		Event::add('ushahidi_filter.view_pre_render-members_layout', array($this, '_pre_render'));
+	}
 
 	public function index()
 	{
 		url::redirect('members/dashboard');
 	}
+	
+	/**
+	 * Trigger themes->admin_requirements() at the last minute
+	 * 
+	 * This is in case features are enabled/disabled
+	 */
+	public function _pre_render()
+	{
+		$this->themes->requirements();
+		$this->template->header_block = $this->themes->header_block();
+		$this->template->footer_block = $this->themes->footer_block();
+	}
 
 } // End Admin
 
diff --git a/application/controllers/members/alerts.php b/application/controllers/members/alerts.php
index b987ad7537..cf61be0ce8 100644
--- a/application/controllers/members/alerts.php
+++ b/application/controllers/members/alerts.php
@@ -127,6 +127,6 @@ public function index()
 		$this->template->content->total_items = $pagination->total_items;
 		
 		// Javascript Header
-		$this->template->js = new View('members/alerts_js');
+		$this->themes->js = new View('members/alerts_js');
 	}	
 }
diff --git a/application/controllers/members/checkins.php b/application/controllers/members/checkins.php
index b2d44e501e..69b3531005 100644
--- a/application/controllers/members/checkins.php
+++ b/application/controllers/members/checkins.php
@@ -100,7 +100,7 @@ public function index($page = 1)
 		$this->template->content->total_items = $pagination->total_items;
 		
 		// Javascript Header
-		$this->template->map_enabled = TRUE;
-		$this->template->js = new View('members/checkins_js');
+		$this->themes->map_enabled = TRUE;
+		$this->themes->js = new View('members/checkins_js');
 	}	
 }
diff --git a/application/controllers/members/dashboard.php b/application/controllers/members/dashboard.php
index 853726f895..3b497421c9 100644
--- a/application/controllers/members/dashboard.php
+++ b/application/controllers/members/dashboard.php
@@ -101,8 +101,8 @@ function index()
 		);
 
 		// Javascript Header
-		$this->template->protochart_enabled = TRUE;
-		$this->template->js = new View('admin/stats/stats_js');
+		$this->themes->protochart_enabled = TRUE;
+		$this->themes->js = new View('admin/stats/stats_js');
 
 		$this->template->content->failure = '';
 
diff --git a/application/controllers/members/private.php b/application/controllers/members/private.php
index 6464c8c65b..431c930209 100644
--- a/application/controllers/members/private.php
+++ b/application/controllers/members/private.php
@@ -145,7 +145,7 @@ public function index($page = 1)
 		$this->template->content->total_items = $pagination->total_items;
 		
 		// Javascript Header
-		$this->template->js = new View('members/private_js');
+		$this->themes->js = new View('members/private_js');
 	}
 	
 	/**
@@ -258,8 +258,8 @@ public function send()
 		$this->template->content->form_saved = $form_saved;
 		
 		// Javascript Header
-		$this->template->autocomplete_enabled = TRUE;
-		$this->template->js = new View('members/private_send_js');
+		$this->themes->autocomplete_enabled = TRUE;
+		$this->themes->js = new View('members/private_send_js');
 	}
 	
 	/**
diff --git a/application/controllers/members/profile.php b/application/controllers/members/profile.php
index d46b403fb9..b9f7a2f7b0 100644
--- a/application/controllers/members/profile.php
+++ b/application/controllers/members/profile.php
@@ -179,7 +179,7 @@ public function index()
 		$this->template->content->yesno_array = array('1'=>utf8::strtoupper(Kohana::lang('ui_main.yes')),'0'=>utf8::strtoupper(Kohana::lang('ui_main.no')));
 
 		// Javascript Header
-		$this->template->colorpicker_enabled = TRUE;
+		$this->themes->colorpicker_enabled = TRUE;
 	}
 
 	/**
diff --git a/application/controllers/members/reports.php b/application/controllers/members/reports.php
index 3ca54745e4..c7bef29d9b 100755
--- a/application/controllers/members/reports.php
+++ b/application/controllers/members/reports.php
@@ -230,7 +230,7 @@ public function index($page = 1)
 		$this->template->content->status = $status;
 
 		// Javascript Header
-		$this->template->js = new View('admin/reports/reports_js');
+		$this->themes->js = new View('admin/reports/reports_js');
 	}
 
 
@@ -569,37 +569,37 @@ public function edit($id = FALSE, $saved = FALSE)
 		$this->template->content->next_url = $next_url;
 
 		// Javascript Header
-		$this->template->map_enabled = TRUE;
-		$this->template->colorpicker_enabled = TRUE;
-		$this->template->treeview_enabled = TRUE;
-		$this->template->json2_enabled = TRUE;
+		$this->themes->map_enabled = TRUE;
+		$this->themes->colorpicker_enabled = TRUE;
+		$this->themes->treeview_enabled = TRUE;
+		$this->themes->json2_enabled = TRUE;
 		
-		$this->template->js = new View('reports/submit_edit_js');
-		$this->template->js->edit_mode = FALSE;
-		$this->template->js->default_map = Kohana::config('settings.default_map');
-		$this->template->js->default_zoom = Kohana::config('settings.default_zoom');
+		$this->themes->js = new View('reports/submit_edit_js');
+		$this->themes->js->edit_mode = FALSE;
+		$this->themes->js->default_map = Kohana::config('settings.default_map');
+		$this->themes->js->default_zoom = Kohana::config('settings.default_zoom');
 
 		if ( ! $form['latitude'] OR ! $form['latitude'])
 		{
-			$this->template->js->latitude = Kohana::config('settings.default_lat');
-			$this->template->js->longitude = Kohana::config('settings.default_lon');
+			$this->themes->js->latitude = Kohana::config('settings.default_lat');
+			$this->themes->js->longitude = Kohana::config('settings.default_lon');
 		}
 		else
 		{
-			$this->template->js->latitude = $form['latitude'];
-			$this->template->js->longitude = $form['longitude'];
+			$this->themes->js->latitude = $form['latitude'];
+			$this->themes->js->longitude = $form['longitude'];
 		}
 		
-		$this->template->js->incident_zoom = $form['incident_zoom'];
-		$this->template->js->geometries = $form['geometry'];
+		$this->themes->js->incident_zoom = $form['incident_zoom'];
+		$this->themes->js->geometries = $form['geometry'];
 
 		// Inline Javascript
 		$this->template->content->date_picker_js = $this->_date_picker_js();
 		$this->template->content->color_picker_js = $this->_color_picker_js();
 		
 		// Pack Javascript
-		$myPacker = new javascriptpacker($this->template->js , 'Normal', FALSE, FALSE);
-		$this->template->js = $myPacker->pack();
+		$myPacker = new javascriptpacker($this->themes->js , 'Normal', FALSE, FALSE);
+		$this->themes->js = $myPacker->pack();
 	}
 	
 
diff --git a/application/views/members/layout.php b/application/views/members/layout.php
index 9981075ccf..5ec9eee72e 100644
--- a/application/views/members/layout.php
+++ b/application/views/members/layout.php
@@ -18,143 +18,18 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=7" />
-	<title><?php echo $site_name ?></title>
+	<title><?php echo html::specialchars($site_name) ?></title>
 	<?php
-	echo html::stylesheet(url::file_loc('css').'media/css/admin/all', '', TRUE);
-	echo html::stylesheet(url::file_loc('css').'media/css/jquery-ui-themeroller', '', TRUE);
-	echo "<!--[if lt IE 7]>".
-		html::stylesheet(url::file_loc('css').'media/css/ie6', '', TRUE)
-		."<![endif]-->";
-	
-	// Load OpenLayers
-	if ($map_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/OpenLayers', TRUE);
-		echo html::script($api_url) . "\n";
-		echo "<script type=\"text/javascript\">
-			OpenLayers.ImgPath = '".url::file_loc('img').'media/img/openlayers/'."';
-			</script>";
-		echo html::script(url::file_loc('js').'media/js/ushahidi', TRUE);
-		echo html::stylesheet(url::file_loc('css').'media/css/openlayers','',TRUE);
-	}
-	
-	// Load jQuery
-	echo html::script(url::file_loc('js').'media/js/jquery', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.form', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.validate.min', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.ui.min', TRUE);
-	echo html::script(url::file_loc('js').'media/js/selectToUISlider.jQuery', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.hovertip-1.0', TRUE);
-	echo html::script(url::file_loc('js').'media/js/jquery.base64', TRUE);
-	echo html::stylesheet(url::file_loc('css').'media/css/jquery.hovertip-1.0', '', TRUE);
-	
-	echo "<script type=\"text/javascript\">
-		$(function() {
-			if($('.tooltip[title]') != null)
-			$('.tooltip[title]').hovertip();
-		});
-	</script>";
-	
-	// Load Flot
-	if ($flot_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/jquery.flot', TRUE);
-		echo html::script(url::file_loc('js').'media/js/excanvas.min', TRUE);
-		echo html::script(url::file_loc('js').'media/js/timeline.js', TRUE);
-	}
-
-	// Load TreeView
-	if ($treeview_enabled) {
-		echo html::script(url::file_loc('js').'media/js/jquery.treeview');
-		echo html::stylesheet(url::file_loc('css').'media/css/jquery.treeview');
-	}
-
-	// Load ProtoChart
-	if ($protochart_enabled)
-	{
-		echo "<script type=\"text/javascript\">jQuery.noConflict()</script>";
-		echo html::script(url::file_loc('js').'media/js/protochart/prototype', TRUE);
-		echo '<!--[if IE]>';
-		echo html::script(url::file_loc('js').'media/js/protochart/excanvas-compressed', TRUE);
-		echo '<![endif]-->';
-		echo html::script(url::file_loc('js').'media/js/protochart/ProtoChart', TRUE);
-	}
-
-	// Load Raphael
-	if($raphael_enabled)
-	{
-		// The only reason we include prototype is to keep the div element naming convention consistent
-		//echo html::script(url::file_loc('js').'media/js/protochart/prototype', TRUE);
-		echo html::script(url::file_loc('js').'media/js/raphael', TRUE);
-		echo '<script type="text/javascript" charset="utf-8">';
-		echo 'var impact_json = { '.$impact_json .' };';
-		echo '</script>';
-		echo html::script(url::file_loc('js').'media/js/raphael-ushahidi-impact', TRUE);
-	}
-	
-	// Load ColorPicker
-	if ($colorpicker_enabled)
-	{
-		echo html::stylesheet(url::file_loc('css').'media/css/colorpicker', '', TRUE);
-		echo html::script(url::file_loc('js').'media/js/colorpicker', TRUE);
-	}
-	
-	// Load TinyMCE
-	if ($editor_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/tinymce/tiny_mce', TRUE);
-	}
-	
-	// JSON2 for IE+
-	if ($json2_enabled)
-	{
-		echo html::script(url::file_loc('js').'media/js/json2', TRUE);
-	}
-	
-	// Load AutoComplete Plugin
-	if ($autocomplete_enabled)
-	{
-		echo html::stylesheet(url::file_loc('css').'media/css/jquery.autocomplete', '', TRUE);
-		echo html::script(url::file_loc('js').'media/js/jquery.autocomplete.pack', TRUE);
-	}
-
-	// Turn on picbox
-	echo html::script(url::file_loc('js').'media/js/picbox', TRUE);
-	echo html::stylesheet(url::file_loc('css').'media/css/picbox/picbox');
-
-	// Header Nav
-	echo html::script(url::file_loc('js').'media/js/global', TRUE);
-	echo html::stylesheet(url::file_loc('css').'media/css/global','',TRUE);
-	
-	// Render CSS and Javascript Files from Plugins
-	echo Requirements::render('head');
-	
 	// Action::header_scripts_member - Additional Inline Scripts
 	Event::run('ushahidi_action.header_scripts_member');
 	?>
 	<script type="text/javascript" charset="utf-8">
-		<?php echo $js . "\n"; ?>
-		function info_search(){
-			$("#info-search").submit();
-		}
-		function show_addedit(toggle){
-			if (toggle) {
-				$("#addedit").toggle(400);
-				$(':input','#addedit')
-				 .not(':button, :submit, :reset, #action')
-				 .val('')
-				 .removeAttr('checked')
-				 .removeAttr('selected');
-				
-			}else{
-				$("#addedit").show(400);
-			}
-			$("a.add").focus();
-		}
 		<?php if ($form_error): ?>
 			$(document).ready(function() { $("#addedit").show(); });
 		<?php endif; ?>
 	</script>
+
+	<?php echo $header_block; ?>
 </head>
 <body>
 

From 87b3bc1a0c6f973053bc5f49a4ce564185335337 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 29 Jun 2012 15:16:40 +1200
Subject: [PATCH 14/30] Merge header css/feeds/js and admin_requirements into
 one function #338

* Start calling requirements from pre-render event for main controller too
* Backend and frontend requirements are enabled through a variable on
  Themes.
* Slider, timeline and hovertip are now enabled like other js libraries
  rather than always included or include based on $main_page
* Removes unused flot js and excanvas js
* Openlayers and jquery-ui-themeroller are no longer themedcss but included
  early so can be overridden via theme css files anyway.
* Move admin header/footer block render to pre render event
---
 application/controllers/admin.php          |  15 +-
 application/controllers/admin/settings.php |   2 +-
 application/controllers/alerts.php         |  13 -
 application/controllers/contact.php        |   4 -
 application/controllers/feeds.php          |   5 -
 application/controllers/main.php           |  22 +-
 application/controllers/page.php           |   3 -
 application/controllers/profile.php        |   6 -
 application/controllers/reports.php        |  15 -
 application/controllers/search.php         |   4 -
 application/libraries/Themes.php           | 327 ++++++++-------------
 media/js/jquery.flot.js                    |   6 -
 12 files changed, 151 insertions(+), 271 deletions(-)
 delete mode 100644 media/js/jquery.flot.js

diff --git a/application/controllers/admin.php b/application/controllers/admin.php
index 8889567d42..98e5d1aa03 100644
--- a/application/controllers/admin.php
+++ b/application/controllers/admin.php
@@ -90,6 +90,7 @@ public function __construct()
 
 		// Themes Helper
 		$this->themes = new Themes();
+		$this->themes->admin = TRUE;
 
 		// Admin is not logged in, or this is a member (not admin)
 		if ( ! $this->auth->logged_in('login'))
@@ -130,6 +131,8 @@ public function __construct()
 		$this->themes->editor_enabled = FALSE;
 		$this->themes->tablerowsort_enabled = FALSE;
 		$this->themes->json2_enabled = FALSE;
+		$this->themes->hovertip_enabled = TRUE;
+		$this->themes->slider_enabled = TRUE;
 		$this->themes->js = '';
 		$this->template->form_error = FALSE;
 
@@ -152,14 +155,10 @@ public function __construct()
 		$this->template->header_nav->loggedin_role = $this->user->dashboard();
 		$this->template->header_nav->site_name = Kohana::config('settings.site_name');
 
-		// Header and Footer Blocks
-		$this->template->header_block = $this->themes->admin_header_block();
-		$this->template->footer_block = $this->themes->footer_block();
-
 		// Language switcher
 		$this->template->languages = $this->themes->languages();
 		
-		Event::add('ushahidi_filter.view_pre_render-admin_layout', array($this, '_trigger_requirements'));
+		Event::add('ushahidi_filter.view_pre_render-admin_layout', array($this, '_pre_render'));
 	}
 
 	public function index()
@@ -228,9 +227,11 @@ private function _new_or_not($release_version=NULL, $version_ushahidi=NULL)
 	 * 
 	 * This is in case features are enabled/disabled
 	 */
-	public function _trigger_requirements()
+	public function _pre_render()
 	{
-		$this->themes->admin_requirements();
+		$this->themes->requirements();
+		$this->template->header_block = $this->themes->admin_header_block();
+		$this->template->footer_block = $this->themes->footer_block();
 	}
 
 
diff --git a/application/controllers/admin/settings.php b/application/controllers/admin/settings.php
index fa472aea3a..b1fd48fb37 100755
--- a/application/controllers/admin/settings.php
+++ b/application/controllers/admin/settings.php
@@ -290,8 +290,8 @@ public function site()
 			$this->template->content->banner_t = NULL;
 		}
 
-
 		$this->themes->colorpicker_enabled = TRUE;
+		$this->themes->slider_enabled = TRUE;
 		$this->template->content->form = $form;
 		$this->template->content->errors = $errors;
 		$this->template->content->form_error = $form_error;
diff --git a/application/controllers/alerts.php b/application/controllers/alerts.php
index 37e3621e56..13f544aa8e 100644
--- a/application/controllers/alerts.php
+++ b/application/controllers/alerts.php
@@ -162,9 +162,6 @@ public function index()
 		$this->themes->js->latitude = $form['alert_lat'];
 		$this->themes->js->longitude = $form['alert_lon'];
 
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
     }
 
 
@@ -192,10 +189,6 @@ public function confirm()
 			// Hide Mobile
 			$this->template->content->show_mobile = FALSE;
 		}
-
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 
@@ -274,9 +267,6 @@ public function verify()
 			$this->template->content->errno = ER_CODE_NOT_FOUND;
 		}
 
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	} // END function verify
 
 
@@ -298,9 +288,6 @@ public function unsubscribe($code = NULL)
 			$this->template->content->unsubscribed = TRUE;
 		}
 
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
     }
 
 	/**
diff --git a/application/controllers/contact.php b/application/controllers/contact.php
index d14e17c4f5..30fb4f4d17 100644
--- a/application/controllers/contact.php
+++ b/application/controllers/contact.php
@@ -108,10 +108,6 @@ public function index()
 		$this->template->content->form_error = $form_error;
 		$this->template->content->form_sent = $form_sent;
 		$this->template->content->captcha = $captcha;
-
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 }
diff --git a/application/controllers/feeds.php b/application/controllers/feeds.php
index 0594eda526..de44c0b1fe 100644
--- a/application/controllers/feeds.php
+++ b/application/controllers/feeds.php
@@ -77,10 +77,5 @@ public function index()
 		{
 			$this->template->content->pagination_stats = $pagination->total_items.' '.Kohana::lang('ui_admin.feeds');
 		}
-
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
-
 	}
 }
diff --git a/application/controllers/main.php b/application/controllers/main.php
index fad69ff0da..edd00e825a 100644
--- a/application/controllers/main.php
+++ b/application/controllers/main.php
@@ -70,6 +70,7 @@ public function __construct()
 
 		// Themes Helper
 		$this->themes = new Themes();
+		$this->themes->frontend = TRUE;
 		$this->themes->api_url = Kohana::config('settings.api_url');
 		$this->template->header->submit_btn = $this->themes->submit_btn();
 		$this->template->header->languages = $this->themes->languages();
@@ -135,6 +136,8 @@ public function __construct()
 			$this->template->header->header_nav->loggedin_user = Auth::instance()->get_user();
 		}
 		$this->template->header->header_nav->site_name = Kohana::config('settings.site_name');
+		
+		Event::add('ushahidi_filter.view_pre_render-layout', array($this, '_pre_render'));
 	}
 
 	/**
@@ -411,7 +414,12 @@ public function index()
 
 		// Javascript Header
 		$this->themes->map_enabled = TRUE;
-		$this->themes->main_page = TRUE;
+		$this->themes->slider_enabled = TRUE;
+		
+		if (Kohana::config('settings.enable_timeline'))
+		{
+			$this->themes->timeline_enabled = TRUE;
+		}
 
 		// Map Settings
 		$marker_radius = Kohana::config('map.marker_radius');
@@ -442,8 +450,16 @@ public function index()
 		$this->themes->js->active_endDate = $display_endDate;
 
 		$this->themes->js->blocks_per_row = Kohana::config('settings.blocks_per_row');
-
-		// Build Header and Footer Blocks
+	}
+	
+	/**
+	 * Trigger themes->requirements() at the last minute
+	 * 
+	 * This is in case features are enabled/disabled
+	 */
+	public function _pre_render()
+	{
+		$this->themes->requirements();
 		$this->template->header->header_block = $this->themes->header_block();
 		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
diff --git a/application/controllers/page.php b/application/controllers/page.php
index 5835cfae5c..86cbb9679c 100644
--- a/application/controllers/page.php
+++ b/application/controllers/page.php
@@ -51,9 +51,6 @@ public function index($page_id = 1)
 		}
 
 		$this->template->header->page_title .= $page_title.Kohana::config('settings.title_delimiter');
-
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 }
diff --git a/application/controllers/profile.php b/application/controllers/profile.php
index 91c04428f4..697e31f4f6 100644
--- a/application/controllers/profile.php
+++ b/application/controllers/profile.php
@@ -34,9 +34,6 @@ public function index()
 		$this->template->content->users = User_Model::get_public_users();
 
 		$this->template->header->page_title .= Kohana::lang('ui_main.browse_profiles').Kohana::config('settings.title_delimiter');
-
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 	/**
@@ -104,9 +101,6 @@ public function user()
 		}
 
 		$this->template->header->page_title .= $user->name.Kohana::config('settings.title_delimiter');
-
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 } // End Profile
diff --git a/application/controllers/reports.php b/application/controllers/reports.php
index 28897a6a45..157d096150 100755
--- a/application/controllers/reports.php
+++ b/application/controllers/reports.php
@@ -144,9 +144,6 @@ public function index()
 		$this->template->content->report_stats->avg_reports_per_day = $avg_reports_per_day;
 		$this->template->content->report_stats->percent_verified = $percent_verified;
 		$this->template->content->services = Service_Model::get_array();
-
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 	/**
@@ -412,10 +409,6 @@ public function submit($id = FALSE, $saved = FALSE)
 		}
 		$this->themes->js->geometries = $form['geometry'];
 
-
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 	 /**
@@ -727,10 +720,6 @@ public function view($id = FALSE)
 
 		// If the Admin is Logged in - Allow for an edit link
 		$this->template->content->logged_in = $this->logged_in;
-
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 	/**
@@ -740,10 +729,6 @@ public function thanks()
 	{
 		$this->template->header->this_page = 'reports_submit';
 		$this->template->content = new View('reports/submit_thanks');
-
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 	}
 
 	/**
diff --git a/application/controllers/search.php b/application/controllers/search.php
index 2288fdab9a..940276e00f 100644
--- a/application/controllers/search.php
+++ b/application/controllers/search.php
@@ -216,9 +216,5 @@ public function index($page = 1)
 
 		$this->template->content->search_info = $search_info;
 		$this->template->content->search_results = $html;
-
-		// Rebuild Header Block
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
     }
 }
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 6b42ef05e7..9a2c4b2971 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -16,9 +16,11 @@
 
 class Themes_Core {
 
+	public $frontend = false;
+	public $admin = false;
+	
 	public $map_enabled = false;
 	public $api_url = null;
-	public $main_page = false;
 	public $this_page = false;
 	public $treeview_enabled = false;
 	public $validator_enabled = false;
@@ -26,11 +28,13 @@ class Themes_Core {
 	public $colorpicker_enabled = false;
 	public $datepicker_enabled = false;
 	public $editor_enabled = false;
-	public $flot_enabled = false;
 	public $protochart_enabled = false;
 	public $raphael_enabled = false;
 	public $tablerowsort_enabled = false;
 	public $json2_enabled = false;
+	public $hovertip_enabled = false;
+	public $slider_enabled = false;
+	public $timeline_enabled = false;
 	
 	// Custom JS to be added
 	public $js = null;
@@ -53,13 +57,7 @@ public function __construct()
 	 */
 	public function header_block()
 	{
-		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
-		
-		// These just need to run now
-		$this->_header_css();
-		$this->_header_feeds();
-		$this->_header_js();
-
+		// For backward compatibility render Requirements here rather than in the view
 		$content = Requirements::render('head');
 		// Filter::header_block - Modify Header Block
 		Event::run('ushahidi_filter.header_block', $content);
@@ -73,8 +71,6 @@ public function header_block()
 	*/
 	public function admin_header_block()
 	{
-		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
-
 		$content = '';
 		// Filter::admin_header_block - Modify Admin Header Block
 		Event::run('ushahidi_filter.admin_header_block', $content);
@@ -83,94 +79,85 @@ public function admin_header_block()
 	}
 
 	/**
-	 * Css Items
+	 * CSS/JS requirements
 	 */
-	private function _header_css()
+	public function requirements()
 	{
 		Requirements::clear();
-		Requirements::themedCSS("jquery-ui-themeroller");
-
-		Requirements::ieThemedCSS("lte IE 7", "iehacks");
-		Requirements::ieThemedCSS("IE 7", "ie7hacks");
-		Requirements::ieThemedCSS("IE 6", "ie6hacks");
+		Requirements::set_write_js_to_body(FALSE);
+		
+		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
+		
+		Requirements::js("media/js/jquery");
+		//Requirements::js("media/js/jquery.ui.min");
+		Requirements::js(Kohana::config('core.site_protocol')."://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js");
+		Requirements::js("media/js/jquery.pngFix.pack");
+		Requirements::js("media/js/jquery.timeago");
+		
+		Requirements::css("media/css/jquery-ui-themeroller");
+		
+		Requirements::js('media/js/global');
+		Requirements::css('media/css/global');
 
 		if ($this->map_enabled)
 		{
-			Requirements::themedCSS("openlayers");
-		}
-
-		if ($this->treeview_enabled)
-		{
-			Requirements::css("media/css/jquery.treeview");
+			Requirements::js("media/js/OpenLayers");
+			Requirements::js("media/js/ushahidi");
+			Requirements::js($this->api_url);
+			Requirements::customJS("OpenLayers.ImgPath = '".url::file_loc('js')."media/img/openlayers/"."';",'openlayers-imgpath');
+			
+			Requirements::css("media/css/openlayers");
 		}
-
-		if ($this->photoslider_enabled)
+		
+		if ($this->hovertip_enabled)
 		{
-			Requirements::css("media/css/picbox/picbox");
+			Requirements::js('media/js/jquery.hovertip-1.0');
+			Requirements::css('media/css/jquery.hovertip-1.0', '');
+			Requirements::customJS(
+				"$(function() {
+						if($('.tooltip[title]') != null)
+						$('.tooltip[title]').hovertip();
+					});",
+				'tooltip-js'
+			);
 		}
-
-		if ($this->colorpicker_enabled)
+		
+		if ($this->slider_enabled)
 		{
-			Requirements::css("media/css/colorpicker");
+			Requirements::js('media/js/selectToUISlider.jQuery');
 		}
 
-		if (Kohana::config('settings.enable_timeline'))
+		if ($this->timeline_enabled)
 		{
+			Requirements::js("media/js/jquery.jqplot.min");
 			Requirements::css("media/css/jquery.jqplot.min");
+			Requirements::js("media/js/jqplot.dateAxisRenderer.min");
 		}
 
-		Requirements::css("media/css/global");
-		
-		foreach(Kohana::config('settings.site_style_css') as $css)
-		{
-			Requirements::css($css);
-		}
-	}
-
-	/**
-	 * Javascript Files and Inline JS
-	 */
-	private function _header_js()
-	{
-		Requirements::set_write_js_to_body(FALSE);
-		
-		if ($this->map_enabled)
+		if ($this->treeview_enabled)
 		{
-			Requirements::js("media/js/OpenLayers");
-			Requirements::customJS("OpenLayers.ImgPath = '".url::file_loc('js')."media/img/openlayers/"."';",'openlayers-imgpath');
-			Requirements::js("media/js/ushahidi");
+			Requirements::css("media/css/jquery.treeview");
+			Requirements::js("media/js/jquery.treeview");
 		}
-
-		Requirements::js("media/js/jquery");
-		//Requirements::js("media/js/jquery.ui.min");
-		Requirements::js(Kohana::config('core.site_protocol')."://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js");
-		Requirements::js("media/js/jquery.pngFix.pack");
-		Requirements::js("media/js/jquery.timeago");
-
-		if ($this->map_enabled)
+	
+		// Load ProtoChart
+		if ($this->protochart_enabled)
 		{
-			Requirements::js($this->api_url);
-
-			if ($this->main_page || $this->this_page == "alerts")
-			{
-				Requirements::js($this->js_url."media/js/selectToUISlider.jQuery");
-			}
-
-			if ($this->main_page)
-			{
-				if (Kohana::config('settings.enable_timeline'))
-				{
-				Requirements::js("media/js/jquery.jqplot.min");
-				Requirements::js("media/js/jqplot.dateAxisRenderer.min");
-				}
-
-				Requirements::customHeadTags("<!--[if IE]>".html::script($this->js_url."media/js/excanvas.min", TRUE)."<![endif]-->");
-			}
+			Requirements::customJS("jQuery.noConflict()", 'jquery-noconflict');
+			Requirements::js('media/js/protochart/prototype');
+			Requirements::customHeadTags(
+				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/protochart/excanvas-compressed', TRUE).'<![endif]-->');
+			Requirements::js('media/js/protochart/ProtoChart');
 		}
-
-		if ($this->treeview_enabled)
+	
+		// Load Raphael
+		if ($this->raphael_enabled)
 		{
-			Requirements::js("media/js/jquery.treeview");
+			// The only reason we include prototype is to keep the div element naming convention consistent
+			//Requirements::js('media/js/protochart/prototype');
+			Requirements::js('media/js/raphael');
+			Requirements::customJS('var impact_json = '.$this->impact_json .';','impact_json');
+			Requirements::js('media/js/raphael-ushahidi-impact');
 		}
 
 		if ($this->validator_enabled)
@@ -180,72 +167,41 @@ private function _header_js()
 
 		if ($this->photoslider_enabled)
 		{
+			Requirements::css("media/css/picbox/picbox");
 			Requirements::js("media/js/picbox");
 		}
 
 		if ($this->colorpicker_enabled)
 		{
+			Requirements::css("media/css/colorpicker");
 			Requirements::js("media/js/colorpicker");
 		}
 
-		Requirements::js("media/js/global");
-
+		// Load jwysiwyg
 		if ($this->editor_enabled)
 		{
-			Requirements::js("media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js");
-		}
-		
-		foreach(Kohana::config('settings.site_style_js') as $js)
-		{
-			Requirements::js($js);
+			Requirements::css('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.css');
+			if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE) {
+				Requirements::js(url::file_loc('ignore').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js'); // not sure what the hell to do about this
+			} else {
+				Requirements::js('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js');
+			}
 		}
-
-		// Inline Javascript
-		Requirements::customJS($this->js,'pagejs');
-	}
-
-	/**
-	 * RSS/Atom
-	 */
-	private function _header_feeds()
-	{
-		if (Kohana::config("settings.allow_feed"))
+	
+		// Table Row Sort
+		if ($this->tablerowsort_enabled)
 		{
-			Requirements::customHeadTags("<link rel=\"alternate\" type=\"application/rss+xml\" href=\"".url::site('feed')."\" title=\"RSS2\" />",'rss-feed');
+			Requirements::js('media/js/jquery.tablednd_0_5');
 		}
-	}
-
-	public function admin_requirements()
-	{
-		Requirements::clear();
-		Requirements::set_write_js_to_body(FALSE);
-		Requirements::css('media/css/admin/all');
-		Requirements::css('media/css/jquery-ui-themeroller');
-		Requirements::ieCSS("lt IE 7", 'media/css/admin/ie6');
-
-		// Load OpenLayers
-		if ($this->map_enabled)
+	
+		// JSON2 for IE+
+		if ($this->json2_enabled)
 		{
-			Requirements::js('media/js/OpenLayers');
-			Requirements::js('media/js/ushahidi');
-			Requirements::js($this->api_url);
-			Requirements::customJS("OpenLayers.ImgPath = '".url::file_loc('img').'media/img/openlayers/'."';",'openlayers-imgpath');
-			Requirements::css('media/css/openlayers');
+			Requirements::js('media/js/json2');
 		}
-
-		// Load jQuery
-		Requirements::js('media/js/jquery');
-		Requirements::js('media/js/jquery.form');
-		Requirements::js('media/js/jquery.validate.min');
-		Requirements::js('media/js/jquery.ui.min');
-		Requirements::js('media/js/selectToUISlider.jQuery');
-		Requirements::js('media/js/jquery.hovertip-1.0');
-		Requirements::js('media/js/jquery.base64');
-		Requirements::js("media/js/jquery.pngFix.pack");
 		
-		Requirements::js('media/js/admin');
-	
-		if ($this->datepicker_enabled) {
+		if ($this->datepicker_enabled)
+		{
 			Requirements::customJS("
 				Date.dayNames = [
 				    '". Kohana::lang('datetime.sunday.full') ."',
@@ -301,96 +257,59 @@ public function admin_requirements()
 			Requirements::customHeadTags(
 				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/jquery.bgiframe.min', TRUE).'<![endif]-->','jquery.bgiframe.min');
 		}
-	
-		Requirements::css('media/css/jquery.hovertip-1.0', '');
-	
-		Requirements::customJS(
-			"$(function() {
-					if($('.tooltip[title]') != null)
-					$('.tooltip[title]').hovertip();
-				});",
-			'tooltip-js'
-		);
-	
-		// Load Flot
-		if ($this->flot_enabled)
-		{
-			Requirements::js('media/js/jquery.flot');
-			Requirements::js('media/js/excanvas.min');
-			Requirements::js('media/js/timeline.js');
-		}
-	
-		// Load TreeView
-		if ($this->treeview_enabled)
-		{
-			Requirements::js('media/js/jquery.treeview');
-			Requirements::css('media/css/jquery.treeview');
-		}
-	
-		// Load ProtoChart
-		if ($this->protochart_enabled)
+		
+		if ($this->admin)
 		{
-			Requirements::customJS("jQuery.noConflict()", 'jquery-noconflict');
-			Requirements::js('media/js/protochart/prototype');
-			Requirements::customHeadTags(
-				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/protochart/excanvas-compressed', TRUE).'<![endif]-->');
-			Requirements::js('media/js/protochart/ProtoChart');
+			$this->admin_requirements();
 		}
-	
-		// Load Raphael
-		if ($this->raphael_enabled)
+		
+		if ($this->frontend)
 		{
-			// The only reason we include prototype is to keep the div element naming convention consistent
-			//Requirements::js('media/js/protochart/prototype');
-			Requirements::js('media/js/raphael');
-			Requirements::customJS('var impact_json = '.$this->impact_json .';','impact_json');
-			Requirements::js('media/js/raphael-ushahidi-impact');
+			$this->frontend_requirements();
 		}
-	
-		// Load ColorPicker
-		if ($this->colorpicker_enabled)
+		
+		// Inline Javascript
+		if (!empty($this->js))
 		{
-			Requirements::css('media/css/colorpicker');
-			Requirements::js('media/js/colorpicker');
+			Requirements::customJS($this->js,'pagejs');
 		}
+		
+		Event::run('ushahidi_action.themes_add_requirements');
+	}
+
+	public function admin_requirements()
+	{
+		Requirements::js('media/js/jquery.form');
+		Requirements::js('media/js/jquery.validate.min');
+		Requirements::js('media/js/jquery.base64');
+		Requirements::js('media/js/admin');
+		Requirements::css('media/css/admin/all');
+		Requirements::ieCSS("lt IE 7", 'media/css/admin/ie6');
+	}
 	
-		// Load jwysiwyg
-		if ($this->editor_enabled)
+	public function frontend_requirements()
+	{
+		// Add RSS feed if enabled
+		if (Kohana::config("settings.allow_feed"))
 		{
-			if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE) {
-				Requirements::js(url::file_loc('ignore').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js'); // not sure what the hell to do about this
-			} else {
-				Requirements::js('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js');
-			}
+			Requirements::customHeadTags("<link rel=\"alternate\" type=\"application/rss+xml\" href=\"".url::site('feed')."\" title=\"RSS2\" />",'rss-feed');
 		}
-	
-		// Table Row Sort
-		if ($this->tablerowsort_enabled)
+		
+		// Theme CSS
+		foreach(Kohana::config('settings.site_style_css') as $css)
 		{
-			Requirements::js('media/js/jquery.tablednd_0_5');
+			Requirements::css($css);
 		}
-	
-		// JSON2 for IE+
-		if ($this->json2_enabled)
+		
+		// Theme JS
+		foreach(Kohana::config('settings.site_style_js') as $js)
 		{
-			Requirements::js('media/js/json2');
+			Requirements::js($js);
 		}
-	
-		// Turn on picbox
-		Requirements::js('media/js/picbox');
-		Requirements::css('media/css/picbox/picbox');
-	
-		//Turn on jwysiwyg
-		Requirements::css('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.css');
-	
-		// Header Nav
-		Requirements::js('media/js/global');
-		Requirements::css('media/css/global');
-		
-		
-		// Inline Javascript
-		Requirements::customJS($this->js,'pagejs');
 		
+		Requirements::ieThemedCSS("lte IE 7", "iehacks");
+		Requirements::ieThemedCSS("IE 7", "ie7hacks");
+		Requirements::ieThemedCSS("IE 6", "ie6hacks");
 	}
 
 	/**
diff --git a/media/js/jquery.flot.js b/media/js/jquery.flot.js
deleted file mode 100644
index 4467fc5d8c..0000000000
--- a/media/js/jquery.flot.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Javascript plotting library for jQuery, v. 0.7.
- *
- * Released under the MIT license by IOLA, December 2007.
- *
- */
-(function(b){b.color={};b.color.make=function(d,e,g,f){var c={};c.r=d||0;c.g=e||0;c.b=g||0;c.a=f!=null?f:1;c.add=function(h,j){for(var k=0;k<h.length;++k){c[h.charAt(k)]+=j}return c.normalize()};c.scale=function(h,j){for(var k=0;k<h.length;++k){c[h.charAt(k)]*=j}return c.normalize()};c.toString=function(){if(c.a>=1){return"rgb("+[c.r,c.g,c.b].join(",")+")"}else{return"rgba("+[c.r,c.g,c.b,c.a].join(",")+")"}};c.normalize=function(){function h(k,j,l){return j<k?k:(j>l?l:j)}c.r=h(0,parseInt(c.r),255);c.g=h(0,parseInt(c.g),255);c.b=h(0,parseInt(c.b),255);c.a=h(0,c.a,1);return c};c.clone=function(){return b.color.make(c.r,c.b,c.g,c.a)};return c.normalize()};b.color.extract=function(d,e){var c;do{c=d.css(e).toLowerCase();if(c!=""&&c!="transparent"){break}d=d.parent()}while(!b.nodeName(d.get(0),"body"));if(c=="rgba(0, 0, 0, 0)"){c="transparent"}return b.color.parse(c)};b.color.parse=function(c){var d,f=b.color.make;if(d=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c)){return f(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10))}if(d=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c)){return f(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10),parseFloat(d[4]))}if(d=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c)){return f(parseFloat(d[1])*2.55,parseFloat(d[2])*2.55,parseFloat(d[3])*2.55)}if(d=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c)){return f(parseFloat(d[1])*2.55,parseFloat(d[2])*2.55,parseFloat(d[3])*2.55,parseFloat(d[4]))}if(d=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c)){return f(parseInt(d[1],16),parseInt(d[2],16),parseInt(d[3],16))}if(d=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c)){return f(parseInt(d[1]+d[1],16),parseInt(d[2]+d[2],16),parseInt(d[3]+d[3],16))}var e=b.trim(c).toLowerCase();if(e=="transparent"){return f(255,255,255,0)}else{d=a[e]||[0,0,0];return f(d[0],d[1],d[2])}};var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);(function(c){function b(av,ai,J,af){var Q=[],O={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:0.85},xaxis:{show:null,position:"bottom",mode:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null,monthNames:null,timeformat:null,twelveHourClock:false},yaxis:{autoscaleMargin:0.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false},shadowSize:3},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},hooks:{}},az=null,ad=null,y=null,H=null,A=null,p=[],aw=[],q={left:0,right:0,top:0,bottom:0},G=0,I=0,h=0,w=0,ak={processOptions:[],processRawData:[],processDatapoints:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},aq=this;aq.setData=aj;aq.setupGrid=t;aq.draw=W;aq.getPlaceholder=function(){return av};aq.getCanvas=function(){return az};aq.getPlotOffset=function(){return q};aq.width=function(){return h};aq.height=function(){return w};aq.offset=function(){var aB=y.offset();aB.left+=q.left;aB.top+=q.top;return aB};aq.getData=function(){return Q};aq.getAxes=function(){var aC={},aB;c.each(p.concat(aw),function(aD,aE){if(aE){aC[aE.direction+(aE.n!=1?aE.n:"")+"axis"]=aE}});return aC};aq.getXAxes=function(){return p};aq.getYAxes=function(){return aw};aq.c2p=C;aq.p2c=ar;aq.getOptions=function(){return O};aq.highlight=x;aq.unhighlight=T;aq.triggerRedrawOverlay=f;aq.pointOffset=function(aB){return{left:parseInt(p[aA(aB,"x")-1].p2c(+aB.x)+q.left),top:parseInt(aw[aA(aB,"y")-1].p2c(+aB.y)+q.top)}};aq.shutdown=ag;aq.resize=function(){B();g(az);g(ad)};aq.hooks=ak;F(aq);Z(J);X();aj(ai);t();W();ah();function an(aD,aB){aB=[aq].concat(aB);for(var aC=0;aC<aD.length;++aC){aD[aC].apply(this,aB)}}function F(){for(var aB=0;aB<af.length;++aB){var aC=af[aB];aC.init(aq);if(aC.options){c.extend(true,O,aC.options)}}}function Z(aC){var aB;c.extend(true,O,aC);if(O.xaxis.color==null){O.xaxis.color=O.grid.color}if(O.yaxis.color==null){O.yaxis.color=O.grid.color}if(O.xaxis.tickColor==null){O.xaxis.tickColor=O.grid.tickColor}if(O.yaxis.tickColor==null){O.yaxis.tickColor=O.grid.tickColor}if(O.grid.borderColor==null){O.grid.borderColor=O.grid.color}if(O.grid.tickColor==null){O.grid.tickColor=c.color.parse(O.grid.color).scale("a",0.22).toString()}for(aB=0;aB<Math.max(1,O.xaxes.length);++aB){O.xaxes[aB]=c.extend(true,{},O.xaxis,O.xaxes[aB])}for(aB=0;aB<Math.max(1,O.yaxes.length);++aB){O.yaxes[aB]=c.extend(true,{},O.yaxis,O.yaxes[aB])}if(O.xaxis.noTicks&&O.xaxis.ticks==null){O.xaxis.ticks=O.xaxis.noTicks}if(O.yaxis.noTicks&&O.yaxis.ticks==null){O.yaxis.ticks=O.yaxis.noTicks}if(O.x2axis){O.xaxes[1]=c.extend(true,{},O.xaxis,O.x2axis);O.xaxes[1].position="top"}if(O.y2axis){O.yaxes[1]=c.extend(true,{},O.yaxis,O.y2axis);O.yaxes[1].position="right"}if(O.grid.coloredAreas){O.grid.markings=O.grid.coloredAreas}if(O.grid.coloredAreasColor){O.grid.markingsColor=O.grid.coloredAreasColor}if(O.lines){c.extend(true,O.series.lines,O.lines)}if(O.points){c.extend(true,O.series.points,O.points)}if(O.bars){c.extend(true,O.series.bars,O.bars)}if(O.shadowSize!=null){O.series.shadowSize=O.shadowSize}for(aB=0;aB<O.xaxes.length;++aB){V(p,aB+1).options=O.xaxes[aB]}for(aB=0;aB<O.yaxes.length;++aB){V(aw,aB+1).options=O.yaxes[aB]}for(var aD in ak){if(O.hooks[aD]&&O.hooks[aD].length){ak[aD]=ak[aD].concat(O.hooks[aD])}}an(ak.processOptions,[O])}function aj(aB){Q=Y(aB);ax();z()}function Y(aE){var aC=[];for(var aB=0;aB<aE.length;++aB){var aD=c.extend(true,{},O.series);if(aE[aB].data!=null){aD.data=aE[aB].data;delete aE[aB].data;c.extend(true,aD,aE[aB]);aE[aB].data=aD.data}else{aD.data=aE[aB]}aC.push(aD)}return aC}function aA(aC,aD){var aB=aC[aD+"axis"];if(typeof aB=="object"){aB=aB.n}if(typeof aB!="number"){aB=1}return aB}function m(){return c.grep(p.concat(aw),function(aB){return aB})}function C(aE){var aC={},aB,aD;for(aB=0;aB<p.length;++aB){aD=p[aB];if(aD&&aD.used){aC["x"+aD.n]=aD.c2p(aE.left)}}for(aB=0;aB<aw.length;++aB){aD=aw[aB];if(aD&&aD.used){aC["y"+aD.n]=aD.c2p(aE.top)}}if(aC.x1!==undefined){aC.x=aC.x1}if(aC.y1!==undefined){aC.y=aC.y1}return aC}function ar(aF){var aD={},aC,aE,aB;for(aC=0;aC<p.length;++aC){aE=p[aC];if(aE&&aE.used){aB="x"+aE.n;if(aF[aB]==null&&aE.n==1){aB="x"}if(aF[aB]!=null){aD.left=aE.p2c(aF[aB]);break}}}for(aC=0;aC<aw.length;++aC){aE=aw[aC];if(aE&&aE.used){aB="y"+aE.n;if(aF[aB]==null&&aE.n==1){aB="y"}if(aF[aB]!=null){aD.top=aE.p2c(aF[aB]);break}}}return aD}function V(aC,aB){if(!aC[aB-1]){aC[aB-1]={n:aB,direction:aC==p?"x":"y",options:c.extend(true,{},aC==p?O.xaxis:O.yaxis)}}return aC[aB-1]}function ax(){var aG;var aM=Q.length,aB=[],aE=[];for(aG=0;aG<Q.length;++aG){var aJ=Q[aG].color;if(aJ!=null){--aM;if(typeof aJ=="number"){aE.push(aJ)}else{aB.push(c.color.parse(Q[aG].color))}}}for(aG=0;aG<aE.length;++aG){aM=Math.max(aM,aE[aG]+1)}var aC=[],aF=0;aG=0;while(aC.length<aM){var aI;if(O.colors.length==aG){aI=c.color.make(100,100,100)}else{aI=c.color.parse(O.colors[aG])}var aD=aF%2==1?-1:1;aI.scale("rgb",1+aD*Math.ceil(aF/2)*0.2);aC.push(aI);++aG;if(aG>=O.colors.length){aG=0;++aF}}var aH=0,aN;for(aG=0;aG<Q.length;++aG){aN=Q[aG];if(aN.color==null){aN.color=aC[aH].toString();++aH}else{if(typeof aN.color=="number"){aN.color=aC[aN.color].toString()}}if(aN.lines.show==null){var aL,aK=true;for(aL in aN){if(aN[aL]&&aN[aL].show){aK=false;break}}if(aK){aN.lines.show=true}}aN.xaxis=V(p,aA(aN,"x"));aN.yaxis=V(aw,aA(aN,"y"))}}function z(){var aO=Number.POSITIVE_INFINITY,aI=Number.NEGATIVE_INFINITY,aB=Number.MAX_VALUE,aU,aS,aR,aN,aD,aJ,aT,aP,aH,aG,aC,a0,aX,aL;function aF(a3,a2,a1){if(a2<a3.datamin&&a2!=-aB){a3.datamin=a2}if(a1>a3.datamax&&a1!=aB){a3.datamax=a1}}c.each(m(),function(a1,a2){a2.datamin=aO;a2.datamax=aI;a2.used=false});for(aU=0;aU<Q.length;++aU){aJ=Q[aU];aJ.datapoints={points:[]};an(ak.processRawData,[aJ,aJ.data,aJ.datapoints])}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];var aZ=aJ.data,aW=aJ.datapoints.format;if(!aW){aW=[];aW.push({x:true,number:true,required:true});aW.push({y:true,number:true,required:true});if(aJ.bars.show||(aJ.lines.show&&aJ.lines.fill)){aW.push({y:true,number:true,required:false,defaultValue:0});if(aJ.bars.horizontal){delete aW[aW.length-1].y;aW[aW.length-1].x=true}}aJ.datapoints.format=aW}if(aJ.datapoints.pointsize!=null){continue}aJ.datapoints.pointsize=aW.length;aP=aJ.datapoints.pointsize;aT=aJ.datapoints.points;insertSteps=aJ.lines.show&&aJ.lines.steps;aJ.xaxis.used=aJ.yaxis.used=true;for(aS=aR=0;aS<aZ.length;++aS,aR+=aP){aL=aZ[aS];var aE=aL==null;if(!aE){for(aN=0;aN<aP;++aN){a0=aL[aN];aX=aW[aN];if(aX){if(aX.number&&a0!=null){a0=+a0;if(isNaN(a0)){a0=null}else{if(a0==Infinity){a0=aB}else{if(a0==-Infinity){a0=-aB}}}}if(a0==null){if(aX.required){aE=true}if(aX.defaultValue!=null){a0=aX.defaultValue}}}aT[aR+aN]=a0}}if(aE){for(aN=0;aN<aP;++aN){a0=aT[aR+aN];if(a0!=null){aX=aW[aN];if(aX.x){aF(aJ.xaxis,a0,a0)}if(aX.y){aF(aJ.yaxis,a0,a0)}}aT[aR+aN]=null}}else{if(insertSteps&&aR>0&&aT[aR-aP]!=null&&aT[aR-aP]!=aT[aR]&&aT[aR-aP+1]!=aT[aR+1]){for(aN=0;aN<aP;++aN){aT[aR+aP+aN]=aT[aR+aN]}aT[aR+1]=aT[aR-aP+1];aR+=aP}}}}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];an(ak.processDatapoints,[aJ,aJ.datapoints])}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];aT=aJ.datapoints.points,aP=aJ.datapoints.pointsize;var aK=aO,aQ=aO,aM=aI,aV=aI;for(aS=0;aS<aT.length;aS+=aP){if(aT[aS]==null){continue}for(aN=0;aN<aP;++aN){a0=aT[aS+aN];aX=aW[aN];if(!aX||a0==aB||a0==-aB){continue}if(aX.x){if(a0<aK){aK=a0}if(a0>aM){aM=a0}}if(aX.y){if(a0<aQ){aQ=a0}if(a0>aV){aV=a0}}}}if(aJ.bars.show){var aY=aJ.bars.align=="left"?0:-aJ.bars.barWidth/2;if(aJ.bars.horizontal){aQ+=aY;aV+=aY+aJ.bars.barWidth}else{aK+=aY;aM+=aY+aJ.bars.barWidth}}aF(aJ.xaxis,aK,aM);aF(aJ.yaxis,aQ,aV)}c.each(m(),function(a1,a2){if(a2.datamin==aO){a2.datamin=null}if(a2.datamax==aI){a2.datamax=null}})}function j(aB,aC){var aD=document.createElement("canvas");aD.className=aC;aD.width=G;aD.height=I;if(!aB){c(aD).css({position:"absolute",left:0,top:0})}c(aD).appendTo(av);if(!aD.getContext){aD=window.G_vmlCanvasManager.initElement(aD)}aD.getContext("2d").save();return aD}function B(){G=av.width();I=av.height();if(G<=0||I<=0){throw"Invalid dimensions for plot, width = "+G+", height = "+I}}function g(aC){if(aC.width!=G){aC.width=G}if(aC.height!=I){aC.height=I}var aB=aC.getContext("2d");aB.restore();aB.save()}function X(){var aC,aB=av.children("canvas.base"),aD=av.children("canvas.overlay");if(aB.length==0||aD==0){av.html("");av.css({padding:0});if(av.css("position")=="static"){av.css("position","relative")}B();az=j(true,"base");ad=j(false,"overlay");aC=false}else{az=aB.get(0);ad=aD.get(0);aC=true}H=az.getContext("2d");A=ad.getContext("2d");y=c([ad,az]);if(aC){av.data("plot").shutdown();aq.resize();A.clearRect(0,0,G,I);y.unbind();av.children().not([az,ad]).remove()}av.data("plot",aq)}function ah(){if(O.grid.hoverable){y.mousemove(aa);y.mouseleave(l)}if(O.grid.clickable){y.click(R)}an(ak.bindEvents,[y])}function ag(){if(M){clearTimeout(M)}y.unbind("mousemove",aa);y.unbind("mouseleave",l);y.unbind("click",R);an(ak.shutdown,[y])}function r(aG){function aC(aH){return aH}var aF,aB,aD=aG.options.transform||aC,aE=aG.options.inverseTransform;if(aG.direction=="x"){aF=aG.scale=h/Math.abs(aD(aG.max)-aD(aG.min));aB=Math.min(aD(aG.max),aD(aG.min))}else{aF=aG.scale=w/Math.abs(aD(aG.max)-aD(aG.min));aF=-aF;aB=Math.max(aD(aG.max),aD(aG.min))}if(aD==aC){aG.p2c=function(aH){return(aH-aB)*aF}}else{aG.p2c=function(aH){return(aD(aH)-aB)*aF}}if(!aE){aG.c2p=function(aH){return aB+aH/aF}}else{aG.c2p=function(aH){return aE(aB+aH/aF)}}}function L(aD){var aB=aD.options,aF,aJ=aD.ticks||[],aI=[],aE,aK=aB.labelWidth,aG=aB.labelHeight,aC;function aH(aM,aL){return c('<div style="position:absolute;top:-10000px;'+aL+'font-size:smaller"><div class="'+aD.direction+"Axis "+aD.direction+aD.n+'Axis">'+aM.join("")+"</div></div>").appendTo(av)}if(aD.direction=="x"){if(aK==null){aK=Math.floor(G/(aJ.length>0?aJ.length:1))}if(aG==null){aI=[];for(aF=0;aF<aJ.length;++aF){aE=aJ[aF].label;if(aE){aI.push('<div class="tickLabel" style="float:left;width:'+aK+'px">'+aE+"</div>")}}if(aI.length>0){aI.push('<div style="clear:left"></div>');aC=aH(aI,"width:10000px;");aG=aC.height();aC.remove()}}}else{if(aK==null||aG==null){for(aF=0;aF<aJ.length;++aF){aE=aJ[aF].label;if(aE){aI.push('<div class="tickLabel">'+aE+"</div>")}}if(aI.length>0){aC=aH(aI,"");if(aK==null){aK=aC.children().width()}if(aG==null){aG=aC.find("div.tickLabel").height()}aC.remove()}}}if(aK==null){aK=0}if(aG==null){aG=0}aD.labelWidth=aK;aD.labelHeight=aG}function au(aD){var aC=aD.labelWidth,aL=aD.labelHeight,aH=aD.options.position,aF=aD.options.tickLength,aG=O.grid.axisMargin,aJ=O.grid.labelMargin,aK=aD.direction=="x"?p:aw,aE;var aB=c.grep(aK,function(aN){return aN&&aN.options.position==aH&&aN.reserveSpace});if(c.inArray(aD,aB)==aB.length-1){aG=0}if(aF==null){aF="full"}var aI=c.grep(aK,function(aN){return aN&&aN.reserveSpace});var aM=c.inArray(aD,aI)==0;if(!aM&&aF=="full"){aF=5}if(!isNaN(+aF)){aJ+=+aF}if(aD.direction=="x"){aL+=aJ;if(aH=="bottom"){q.bottom+=aL+aG;aD.box={top:I-q.bottom,height:aL}}else{aD.box={top:q.top+aG,height:aL};q.top+=aL+aG}}else{aC+=aJ;if(aH=="left"){aD.box={left:q.left+aG,width:aC};q.left+=aC+aG}else{q.right+=aC+aG;aD.box={left:G-q.right,width:aC}}}aD.position=aH;aD.tickLength=aF;aD.box.padding=aJ;aD.innermost=aM}function U(aB){if(aB.direction=="x"){aB.box.left=q.left;aB.box.width=h}else{aB.box.top=q.top;aB.box.height=w}}function t(){var aC,aE=m();c.each(aE,function(aF,aG){aG.show=aG.options.show;if(aG.show==null){aG.show=aG.used}aG.reserveSpace=aG.show||aG.options.reserveSpace;n(aG)});allocatedAxes=c.grep(aE,function(aF){return aF.reserveSpace});q.left=q.right=q.top=q.bottom=0;if(O.grid.show){c.each(allocatedAxes,function(aF,aG){S(aG);P(aG);ap(aG,aG.ticks);L(aG)});for(aC=allocatedAxes.length-1;aC>=0;--aC){au(allocatedAxes[aC])}var aD=O.grid.minBorderMargin;if(aD==null){aD=0;for(aC=0;aC<Q.length;++aC){aD=Math.max(aD,Q[aC].points.radius+Q[aC].points.lineWidth/2)}}for(var aB in q){q[aB]+=O.grid.borderWidth;q[aB]=Math.max(aD,q[aB])}}h=G-q.left-q.right;w=I-q.bottom-q.top;c.each(aE,function(aF,aG){r(aG)});if(O.grid.show){c.each(allocatedAxes,function(aF,aG){U(aG)});k()}o()}function n(aE){var aF=aE.options,aD=+(aF.min!=null?aF.min:aE.datamin),aB=+(aF.max!=null?aF.max:aE.datamax),aH=aB-aD;if(aH==0){var aC=aB==0?1:0.01;if(aF.min==null){aD-=aC}if(aF.max==null||aF.min!=null){aB+=aC}}else{var aG=aF.autoscaleMargin;if(aG!=null){if(aF.min==null){aD-=aH*aG;if(aD<0&&aE.datamin!=null&&aE.datamin>=0){aD=0}}if(aF.max==null){aB+=aH*aG;if(aB>0&&aE.datamax!=null&&aE.datamax<=0){aB=0}}}}aE.min=aD;aE.max=aB}function S(aG){var aM=aG.options;var aH;if(typeof aM.ticks=="number"&&aM.ticks>0){aH=aM.ticks}else{aH=0.3*Math.sqrt(aG.direction=="x"?G:I)}var aT=(aG.max-aG.min)/aH,aO,aB,aN,aR,aS,aQ,aI;if(aM.mode=="time"){var aJ={second:1000,minute:60*1000,hour:60*60*1000,day:24*60*60*1000,month:30*24*60*60*1000,year:365.2425*24*60*60*1000};var aK=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[0.25,"month"],[0.5,"month"],[1,"month"],[2,"month"],[3,"month"],[6,"month"],[1,"year"]];var aC=0;if(aM.minTickSize!=null){if(typeof aM.tickSize=="number"){aC=aM.tickSize}else{aC=aM.minTickSize[0]*aJ[aM.minTickSize[1]]}}for(var aS=0;aS<aK.length-1;++aS){if(aT<(aK[aS][0]*aJ[aK[aS][1]]+aK[aS+1][0]*aJ[aK[aS+1][1]])/2&&aK[aS][0]*aJ[aK[aS][1]]>=aC){break}}aO=aK[aS][0];aN=aK[aS][1];if(aN=="year"){aQ=Math.pow(10,Math.floor(Math.log(aT/aJ.year)/Math.LN10));aI=(aT/aJ.year)/aQ;if(aI<1.5){aO=1}else{if(aI<3){aO=2}else{if(aI<7.5){aO=5}else{aO=10}}}aO*=aQ}aG.tickSize=aM.tickSize||[aO,aN];aB=function(aX){var a2=[],a0=aX.tickSize[0],a3=aX.tickSize[1],a1=new Date(aX.min);var aW=a0*aJ[a3];if(a3=="second"){a1.setUTCSeconds(a(a1.getUTCSeconds(),a0))}if(a3=="minute"){a1.setUTCMinutes(a(a1.getUTCMinutes(),a0))}if(a3=="hour"){a1.setUTCHours(a(a1.getUTCHours(),a0))}if(a3=="month"){a1.setUTCMonth(a(a1.getUTCMonth(),a0))}if(a3=="year"){a1.setUTCFullYear(a(a1.getUTCFullYear(),a0))}a1.setUTCMilliseconds(0);if(aW>=aJ.minute){a1.setUTCSeconds(0)}if(aW>=aJ.hour){a1.setUTCMinutes(0)}if(aW>=aJ.day){a1.setUTCHours(0)}if(aW>=aJ.day*4){a1.setUTCDate(1)}if(aW>=aJ.year){a1.setUTCMonth(0)}var a5=0,a4=Number.NaN,aY;do{aY=a4;a4=a1.getTime();a2.push(a4);if(a3=="month"){if(a0<1){a1.setUTCDate(1);var aV=a1.getTime();a1.setUTCMonth(a1.getUTCMonth()+1);var aZ=a1.getTime();a1.setTime(a4+a5*aJ.hour+(aZ-aV)*a0);a5=a1.getUTCHours();a1.setUTCHours(0)}else{a1.setUTCMonth(a1.getUTCMonth()+a0)}}else{if(a3=="year"){a1.setUTCFullYear(a1.getUTCFullYear()+a0)}else{a1.setTime(a4+aW)}}}while(a4<aX.max&&a4!=aY);return a2};aR=function(aV,aY){var a0=new Date(aV);if(aM.timeformat!=null){return c.plot.formatDate(a0,aM.timeformat,aM.monthNames)}var aW=aY.tickSize[0]*aJ[aY.tickSize[1]];var aX=aY.max-aY.min;var aZ=(aM.twelveHourClock)?" %p":"";if(aW<aJ.minute){fmt="%h:%M:%S"+aZ}else{if(aW<aJ.day){if(aX<2*aJ.day){fmt="%h:%M"+aZ}else{fmt="%b %d %h:%M"+aZ}}else{if(aW<aJ.month){fmt="%b %d"}else{if(aW<aJ.year){if(aX<aJ.year){fmt="%b"}else{fmt="%b %y"}}else{fmt="%y"}}}}return c.plot.formatDate(a0,fmt,aM.monthNames)}}else{var aU=aM.tickDecimals;var aP=-Math.floor(Math.log(aT)/Math.LN10);if(aU!=null&&aP>aU){aP=aU}aQ=Math.pow(10,-aP);aI=aT/aQ;if(aI<1.5){aO=1}else{if(aI<3){aO=2;if(aI>2.25&&(aU==null||aP+1<=aU)){aO=2.5;++aP}}else{if(aI<7.5){aO=5}else{aO=10}}}aO*=aQ;if(aM.minTickSize!=null&&aO<aM.minTickSize){aO=aM.minTickSize}aG.tickDecimals=Math.max(0,aU!=null?aU:aP);aG.tickSize=aM.tickSize||aO;aB=function(aX){var aZ=[];var a0=a(aX.min,aX.tickSize),aW=0,aV=Number.NaN,aY;do{aY=aV;aV=a0+aW*aX.tickSize;aZ.push(aV);++aW}while(aV<aX.max&&aV!=aY);return aZ};aR=function(aV,aW){return aV.toFixed(aW.tickDecimals)}}if(aM.alignTicksWithAxis!=null){var aF=(aG.direction=="x"?p:aw)[aM.alignTicksWithAxis-1];if(aF&&aF.used&&aF!=aG){var aL=aB(aG);if(aL.length>0){if(aM.min==null){aG.min=Math.min(aG.min,aL[0])}if(aM.max==null&&aL.length>1){aG.max=Math.max(aG.max,aL[aL.length-1])}}aB=function(aX){var aY=[],aV,aW;for(aW=0;aW<aF.ticks.length;++aW){aV=(aF.ticks[aW].v-aF.min)/(aF.max-aF.min);aV=aX.min+aV*(aX.max-aX.min);aY.push(aV)}return aY};if(aG.mode!="time"&&aM.tickDecimals==null){var aE=Math.max(0,-Math.floor(Math.log(aT)/Math.LN10)+1),aD=aB(aG);if(!(aD.length>1&&/\..*0$/.test((aD[1]-aD[0]).toFixed(aE)))){aG.tickDecimals=aE}}}}aG.tickGenerator=aB;if(c.isFunction(aM.tickFormatter)){aG.tickFormatter=function(aV,aW){return""+aM.tickFormatter(aV,aW)}}else{aG.tickFormatter=aR}}function P(aF){var aH=aF.options.ticks,aG=[];if(aH==null||(typeof aH=="number"&&aH>0)){aG=aF.tickGenerator(aF)}else{if(aH){if(c.isFunction(aH)){aG=aH({min:aF.min,max:aF.max})}else{aG=aH}}}var aE,aB;aF.ticks=[];for(aE=0;aE<aG.length;++aE){var aC=null;var aD=aG[aE];if(typeof aD=="object"){aB=+aD[0];if(aD.length>1){aC=aD[1]}}else{aB=+aD}if(aC==null){aC=aF.tickFormatter(aB,aF)}if(!isNaN(aB)){aF.ticks.push({v:aB,label:aC})}}}function ap(aB,aC){if(aB.options.autoscaleMargin&&aC.length>0){if(aB.options.min==null){aB.min=Math.min(aB.min,aC[0].v)}if(aB.options.max==null&&aC.length>1){aB.max=Math.max(aB.max,aC[aC.length-1].v)}}}function W(){H.clearRect(0,0,G,I);var aC=O.grid;if(aC.show&&aC.backgroundColor){N()}if(aC.show&&!aC.aboveData){ac()}for(var aB=0;aB<Q.length;++aB){an(ak.drawSeries,[H,Q[aB]]);d(Q[aB])}an(ak.draw,[H]);if(aC.show&&aC.aboveData){ac()}}function D(aB,aI){var aE,aH,aG,aD,aF=m();for(i=0;i<aF.length;++i){aE=aF[i];if(aE.direction==aI){aD=aI+aE.n+"axis";if(!aB[aD]&&aE.n==1){aD=aI+"axis"}if(aB[aD]){aH=aB[aD].from;aG=aB[aD].to;break}}}if(!aB[aD]){aE=aI=="x"?p[0]:aw[0];aH=aB[aI+"1"];aG=aB[aI+"2"]}if(aH!=null&&aG!=null&&aH>aG){var aC=aH;aH=aG;aG=aC}return{from:aH,to:aG,axis:aE}}function N(){H.save();H.translate(q.left,q.top);H.fillStyle=am(O.grid.backgroundColor,w,0,"rgba(255, 255, 255, 0)");H.fillRect(0,0,h,w);H.restore()}function ac(){var aF;H.save();H.translate(q.left,q.top);var aH=O.grid.markings;if(aH){if(c.isFunction(aH)){var aK=aq.getAxes();aK.xmin=aK.xaxis.min;aK.xmax=aK.xaxis.max;aK.ymin=aK.yaxis.min;aK.ymax=aK.yaxis.max;aH=aH(aK)}for(aF=0;aF<aH.length;++aF){var aD=aH[aF],aC=D(aD,"x"),aI=D(aD,"y");if(aC.from==null){aC.from=aC.axis.min}if(aC.to==null){aC.to=aC.axis.max}if(aI.from==null){aI.from=aI.axis.min}if(aI.to==null){aI.to=aI.axis.max}if(aC.to<aC.axis.min||aC.from>aC.axis.max||aI.to<aI.axis.min||aI.from>aI.axis.max){continue}aC.from=Math.max(aC.from,aC.axis.min);aC.to=Math.min(aC.to,aC.axis.max);aI.from=Math.max(aI.from,aI.axis.min);aI.to=Math.min(aI.to,aI.axis.max);if(aC.from==aC.to&&aI.from==aI.to){continue}aC.from=aC.axis.p2c(aC.from);aC.to=aC.axis.p2c(aC.to);aI.from=aI.axis.p2c(aI.from);aI.to=aI.axis.p2c(aI.to);if(aC.from==aC.to||aI.from==aI.to){H.beginPath();H.strokeStyle=aD.color||O.grid.markingsColor;H.lineWidth=aD.lineWidth||O.grid.markingsLineWidth;H.moveTo(aC.from,aI.from);H.lineTo(aC.to,aI.to);H.stroke()}else{H.fillStyle=aD.color||O.grid.markingsColor;H.fillRect(aC.from,aI.to,aC.to-aC.from,aI.from-aI.to)}}}var aK=m(),aM=O.grid.borderWidth;for(var aE=0;aE<aK.length;++aE){var aB=aK[aE],aG=aB.box,aQ=aB.tickLength,aN,aL,aP,aJ;if(!aB.show||aB.ticks.length==0){continue}H.strokeStyle=aB.options.tickColor||c.color.parse(aB.options.color).scale("a",0.22).toString();H.lineWidth=1;if(aB.direction=="x"){aN=0;if(aQ=="full"){aL=(aB.position=="top"?0:w)}else{aL=aG.top-q.top+(aB.position=="top"?aG.height:0)}}else{aL=0;if(aQ=="full"){aN=(aB.position=="left"?0:h)}else{aN=aG.left-q.left+(aB.position=="left"?aG.width:0)}}if(!aB.innermost){H.beginPath();aP=aJ=0;if(aB.direction=="x"){aP=h}else{aJ=w}if(H.lineWidth==1){aN=Math.floor(aN)+0.5;aL=Math.floor(aL)+0.5}H.moveTo(aN,aL);H.lineTo(aN+aP,aL+aJ);H.stroke()}H.beginPath();for(aF=0;aF<aB.ticks.length;++aF){var aO=aB.ticks[aF].v;aP=aJ=0;if(aO<aB.min||aO>aB.max||(aQ=="full"&&aM>0&&(aO==aB.min||aO==aB.max))){continue}if(aB.direction=="x"){aN=aB.p2c(aO);aJ=aQ=="full"?-w:aQ;if(aB.position=="top"){aJ=-aJ}}else{aL=aB.p2c(aO);aP=aQ=="full"?-h:aQ;if(aB.position=="left"){aP=-aP}}if(H.lineWidth==1){if(aB.direction=="x"){aN=Math.floor(aN)+0.5}else{aL=Math.floor(aL)+0.5}}H.moveTo(aN,aL);H.lineTo(aN+aP,aL+aJ)}H.stroke()}if(aM){H.lineWidth=aM;H.strokeStyle=O.grid.borderColor;H.strokeRect(-aM/2,-aM/2,h+aM,w+aM)}H.restore()}function k(){av.find(".tickLabels").remove();var aG=['<div class="tickLabels" style="font-size:smaller">'];var aJ=m();for(var aD=0;aD<aJ.length;++aD){var aC=aJ[aD],aF=aC.box;if(!aC.show){continue}aG.push('<div class="'+aC.direction+"Axis "+aC.direction+aC.n+'Axis" style="color:'+aC.options.color+'">');for(var aE=0;aE<aC.ticks.length;++aE){var aH=aC.ticks[aE];if(!aH.label||aH.v<aC.min||aH.v>aC.max){continue}var aK={},aI;if(aC.direction=="x"){aI="center";aK.left=Math.round(q.left+aC.p2c(aH.v)-aC.labelWidth/2);if(aC.position=="bottom"){aK.top=aF.top+aF.padding}else{aK.bottom=I-(aF.top+aF.height-aF.padding)}}else{aK.top=Math.round(q.top+aC.p2c(aH.v)-aC.labelHeight/2);if(aC.position=="left"){aK.right=G-(aF.left+aF.width-aF.padding);aI="right"}else{aK.left=aF.left+aF.padding;aI="left"}}aK.width=aC.labelWidth;var aB=["position:absolute","text-align:"+aI];for(var aL in aK){aB.push(aL+":"+aK[aL]+"px")}aG.push('<div class="tickLabel" style="'+aB.join(";")+'">'+aH.label+"</div>")}aG.push("</div>")}aG.push("</div>");av.append(aG.join(""))}function d(aB){if(aB.lines.show){at(aB)}if(aB.bars.show){e(aB)}if(aB.points.show){ao(aB)}}function at(aE){function aD(aP,aQ,aI,aU,aT){var aV=aP.points,aJ=aP.pointsize,aN=null,aM=null;H.beginPath();for(var aO=aJ;aO<aV.length;aO+=aJ){var aL=aV[aO-aJ],aS=aV[aO-aJ+1],aK=aV[aO],aR=aV[aO+1];if(aL==null||aK==null){continue}if(aS<=aR&&aS<aT.min){if(aR<aT.min){continue}aL=(aT.min-aS)/(aR-aS)*(aK-aL)+aL;aS=aT.min}else{if(aR<=aS&&aR<aT.min){if(aS<aT.min){continue}aK=(aT.min-aS)/(aR-aS)*(aK-aL)+aL;aR=aT.min}}if(aS>=aR&&aS>aT.max){if(aR>aT.max){continue}aL=(aT.max-aS)/(aR-aS)*(aK-aL)+aL;aS=aT.max}else{if(aR>=aS&&aR>aT.max){if(aS>aT.max){continue}aK=(aT.max-aS)/(aR-aS)*(aK-aL)+aL;aR=aT.max}}if(aL<=aK&&aL<aU.min){if(aK<aU.min){continue}aS=(aU.min-aL)/(aK-aL)*(aR-aS)+aS;aL=aU.min}else{if(aK<=aL&&aK<aU.min){if(aL<aU.min){continue}aR=(aU.min-aL)/(aK-aL)*(aR-aS)+aS;aK=aU.min}}if(aL>=aK&&aL>aU.max){if(aK>aU.max){continue}aS=(aU.max-aL)/(aK-aL)*(aR-aS)+aS;aL=aU.max}else{if(aK>=aL&&aK>aU.max){if(aL>aU.max){continue}aR=(aU.max-aL)/(aK-aL)*(aR-aS)+aS;aK=aU.max}}if(aL!=aN||aS!=aM){H.moveTo(aU.p2c(aL)+aQ,aT.p2c(aS)+aI)}aN=aK;aM=aR;H.lineTo(aU.p2c(aK)+aQ,aT.p2c(aR)+aI)}H.stroke()}function aF(aI,aQ,aP){var aW=aI.points,aV=aI.pointsize,aN=Math.min(Math.max(0,aP.min),aP.max),aX=0,aU,aT=false,aM=1,aL=0,aR=0;while(true){if(aV>0&&aX>aW.length+aV){break}aX+=aV;var aZ=aW[aX-aV],aK=aW[aX-aV+aM],aY=aW[aX],aJ=aW[aX+aM];if(aT){if(aV>0&&aZ!=null&&aY==null){aR=aX;aV=-aV;aM=2;continue}if(aV<0&&aX==aL+aV){H.fill();aT=false;aV=-aV;aM=1;aX=aL=aR+aV;continue}}if(aZ==null||aY==null){continue}if(aZ<=aY&&aZ<aQ.min){if(aY<aQ.min){continue}aK=(aQ.min-aZ)/(aY-aZ)*(aJ-aK)+aK;aZ=aQ.min}else{if(aY<=aZ&&aY<aQ.min){if(aZ<aQ.min){continue}aJ=(aQ.min-aZ)/(aY-aZ)*(aJ-aK)+aK;aY=aQ.min}}if(aZ>=aY&&aZ>aQ.max){if(aY>aQ.max){continue}aK=(aQ.max-aZ)/(aY-aZ)*(aJ-aK)+aK;aZ=aQ.max}else{if(aY>=aZ&&aY>aQ.max){if(aZ>aQ.max){continue}aJ=(aQ.max-aZ)/(aY-aZ)*(aJ-aK)+aK;aY=aQ.max}}if(!aT){H.beginPath();H.moveTo(aQ.p2c(aZ),aP.p2c(aN));aT=true}if(aK>=aP.max&&aJ>=aP.max){H.lineTo(aQ.p2c(aZ),aP.p2c(aP.max));H.lineTo(aQ.p2c(aY),aP.p2c(aP.max));continue}else{if(aK<=aP.min&&aJ<=aP.min){H.lineTo(aQ.p2c(aZ),aP.p2c(aP.min));H.lineTo(aQ.p2c(aY),aP.p2c(aP.min));continue}}var aO=aZ,aS=aY;if(aK<=aJ&&aK<aP.min&&aJ>=aP.min){aZ=(aP.min-aK)/(aJ-aK)*(aY-aZ)+aZ;aK=aP.min}else{if(aJ<=aK&&aJ<aP.min&&aK>=aP.min){aY=(aP.min-aK)/(aJ-aK)*(aY-aZ)+aZ;aJ=aP.min}}if(aK>=aJ&&aK>aP.max&&aJ<=aP.max){aZ=(aP.max-aK)/(aJ-aK)*(aY-aZ)+aZ;aK=aP.max}else{if(aJ>=aK&&aJ>aP.max&&aK<=aP.max){aY=(aP.max-aK)/(aJ-aK)*(aY-aZ)+aZ;aJ=aP.max}}if(aZ!=aO){H.lineTo(aQ.p2c(aO),aP.p2c(aK))}H.lineTo(aQ.p2c(aZ),aP.p2c(aK));H.lineTo(aQ.p2c(aY),aP.p2c(aJ));if(aY!=aS){H.lineTo(aQ.p2c(aY),aP.p2c(aJ));H.lineTo(aQ.p2c(aS),aP.p2c(aJ))}}}H.save();H.translate(q.left,q.top);H.lineJoin="round";var aG=aE.lines.lineWidth,aB=aE.shadowSize;if(aG>0&&aB>0){H.lineWidth=aB;H.strokeStyle="rgba(0,0,0,0.1)";var aH=Math.PI/18;aD(aE.datapoints,Math.sin(aH)*(aG/2+aB/2),Math.cos(aH)*(aG/2+aB/2),aE.xaxis,aE.yaxis);H.lineWidth=aB/2;aD(aE.datapoints,Math.sin(aH)*(aG/2+aB/4),Math.cos(aH)*(aG/2+aB/4),aE.xaxis,aE.yaxis)}H.lineWidth=aG;H.strokeStyle=aE.color;var aC=ae(aE.lines,aE.color,0,w);if(aC){H.fillStyle=aC;aF(aE.datapoints,aE.xaxis,aE.yaxis)}if(aG>0){aD(aE.datapoints,0,0,aE.xaxis,aE.yaxis)}H.restore()}function ao(aE){function aH(aN,aM,aU,aK,aS,aT,aQ,aJ){var aR=aN.points,aI=aN.pointsize;for(var aL=0;aL<aR.length;aL+=aI){var aP=aR[aL],aO=aR[aL+1];if(aP==null||aP<aT.min||aP>aT.max||aO<aQ.min||aO>aQ.max){continue}H.beginPath();aP=aT.p2c(aP);aO=aQ.p2c(aO)+aK;if(aJ=="circle"){H.arc(aP,aO,aM,0,aS?Math.PI:Math.PI*2,false)}else{aJ(H,aP,aO,aM,aS)}H.closePath();if(aU){H.fillStyle=aU;H.fill()}H.stroke()}}H.save();H.translate(q.left,q.top);var aG=aE.points.lineWidth,aC=aE.shadowSize,aB=aE.points.radius,aF=aE.points.symbol;if(aG>0&&aC>0){var aD=aC/2;H.lineWidth=aD;H.strokeStyle="rgba(0,0,0,0.1)";aH(aE.datapoints,aB,null,aD+aD/2,true,aE.xaxis,aE.yaxis,aF);H.strokeStyle="rgba(0,0,0,0.2)";aH(aE.datapoints,aB,null,aD/2,true,aE.xaxis,aE.yaxis,aF)}H.lineWidth=aG;H.strokeStyle=aE.color;aH(aE.datapoints,aB,ae(aE.points,aE.color),0,false,aE.xaxis,aE.yaxis,aF);H.restore()}function E(aN,aM,aV,aI,aQ,aF,aD,aL,aK,aU,aR,aC){var aE,aT,aJ,aP,aG,aB,aO,aH,aS;if(aR){aH=aB=aO=true;aG=false;aE=aV;aT=aN;aP=aM+aI;aJ=aM+aQ;if(aT<aE){aS=aT;aT=aE;aE=aS;aG=true;aB=false}}else{aG=aB=aO=true;aH=false;aE=aN+aI;aT=aN+aQ;aJ=aV;aP=aM;if(aP<aJ){aS=aP;aP=aJ;aJ=aS;aH=true;aO=false}}if(aT<aL.min||aE>aL.max||aP<aK.min||aJ>aK.max){return}if(aE<aL.min){aE=aL.min;aG=false}if(aT>aL.max){aT=aL.max;aB=false}if(aJ<aK.min){aJ=aK.min;aH=false}if(aP>aK.max){aP=aK.max;aO=false}aE=aL.p2c(aE);aJ=aK.p2c(aJ);aT=aL.p2c(aT);aP=aK.p2c(aP);if(aD){aU.beginPath();aU.moveTo(aE,aJ);aU.lineTo(aE,aP);aU.lineTo(aT,aP);aU.lineTo(aT,aJ);aU.fillStyle=aD(aJ,aP);aU.fill()}if(aC>0&&(aG||aB||aO||aH)){aU.beginPath();aU.moveTo(aE,aJ+aF);if(aG){aU.lineTo(aE,aP+aF)}else{aU.moveTo(aE,aP+aF)}if(aO){aU.lineTo(aT,aP+aF)}else{aU.moveTo(aT,aP+aF)}if(aB){aU.lineTo(aT,aJ+aF)}else{aU.moveTo(aT,aJ+aF)}if(aH){aU.lineTo(aE,aJ+aF)}else{aU.moveTo(aE,aJ+aF)}aU.stroke()}}function e(aD){function aC(aJ,aI,aL,aG,aK,aN,aM){var aO=aJ.points,aF=aJ.pointsize;for(var aH=0;aH<aO.length;aH+=aF){if(aO[aH]==null){continue}E(aO[aH],aO[aH+1],aO[aH+2],aI,aL,aG,aK,aN,aM,H,aD.bars.horizontal,aD.bars.lineWidth)}}H.save();H.translate(q.left,q.top);H.lineWidth=aD.bars.lineWidth;H.strokeStyle=aD.color;var aB=aD.bars.align=="left"?0:-aD.bars.barWidth/2;var aE=aD.bars.fill?function(aF,aG){return ae(aD.bars,aD.color,aF,aG)}:null;aC(aD.datapoints,aB,aB+aD.bars.barWidth,0,aE,aD.xaxis,aD.yaxis);H.restore()}function ae(aD,aB,aC,aF){var aE=aD.fill;if(!aE){return null}if(aD.fillColor){return am(aD.fillColor,aC,aF,aB)}var aG=c.color.parse(aB);aG.a=typeof aE=="number"?aE:0.4;aG.normalize();return aG.toString()}function o(){av.find(".legend").remove();if(!O.legend.show){return}var aH=[],aF=false,aN=O.legend.labelFormatter,aM,aJ;for(var aE=0;aE<Q.length;++aE){aM=Q[aE];aJ=aM.label;if(!aJ){continue}if(aE%O.legend.noColumns==0){if(aF){aH.push("</tr>")}aH.push("<tr>");aF=true}if(aN){aJ=aN(aJ,aM)}aH.push('<td class="legendColorBox"><div style="border:1px solid '+O.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+aM.color+';overflow:hidden"></div></div></td><td class="legendLabel">'+aJ+"</td>")}if(aF){aH.push("</tr>")}if(aH.length==0){return}var aL='<table style="font-size:smaller;color:'+O.grid.color+'">'+aH.join("")+"</table>";if(O.legend.container!=null){c(O.legend.container).html(aL)}else{var aI="",aC=O.legend.position,aD=O.legend.margin;if(aD[0]==null){aD=[aD,aD]}if(aC.charAt(0)=="n"){aI+="top:"+(aD[1]+q.top)+"px;"}else{if(aC.charAt(0)=="s"){aI+="bottom:"+(aD[1]+q.bottom)+"px;"}}if(aC.charAt(1)=="e"){aI+="right:"+(aD[0]+q.right)+"px;"}else{if(aC.charAt(1)=="w"){aI+="left:"+(aD[0]+q.left)+"px;"}}var aK=c('<div class="legend">'+aL.replace('style="','style="position:absolute;'+aI+";")+"</div>").appendTo(av);if(O.legend.backgroundOpacity!=0){var aG=O.legend.backgroundColor;if(aG==null){aG=O.grid.backgroundColor;if(aG&&typeof aG=="string"){aG=c.color.parse(aG)}else{aG=c.color.extract(aK,"background-color")}aG.a=1;aG=aG.toString()}var aB=aK.children();c('<div style="position:absolute;width:'+aB.width()+"px;height:"+aB.height()+"px;"+aI+"background-color:"+aG+';"> </div>').prependTo(aK).css("opacity",O.legend.backgroundOpacity)}}}var ab=[],M=null;function K(aI,aG,aD){var aO=O.grid.mouseActiveRadius,a0=aO*aO+1,aY=null,aR=false,aW,aU;for(aW=Q.length-1;aW>=0;--aW){if(!aD(Q[aW])){continue}var aP=Q[aW],aH=aP.xaxis,aF=aP.yaxis,aV=aP.datapoints.points,aT=aP.datapoints.pointsize,aQ=aH.c2p(aI),aN=aF.c2p(aG),aC=aO/aH.scale,aB=aO/aF.scale;if(aH.options.inverseTransform){aC=Number.MAX_VALUE}if(aF.options.inverseTransform){aB=Number.MAX_VALUE}if(aP.lines.show||aP.points.show){for(aU=0;aU<aV.length;aU+=aT){var aK=aV[aU],aJ=aV[aU+1];if(aK==null){continue}if(aK-aQ>aC||aK-aQ<-aC||aJ-aN>aB||aJ-aN<-aB){continue}var aM=Math.abs(aH.p2c(aK)-aI),aL=Math.abs(aF.p2c(aJ)-aG),aS=aM*aM+aL*aL;if(aS<a0){a0=aS;aY=[aW,aU/aT]}}}if(aP.bars.show&&!aY){var aE=aP.bars.align=="left"?0:-aP.bars.barWidth/2,aX=aE+aP.bars.barWidth;for(aU=0;aU<aV.length;aU+=aT){var aK=aV[aU],aJ=aV[aU+1],aZ=aV[aU+2];if(aK==null){continue}if(Q[aW].bars.horizontal?(aQ<=Math.max(aZ,aK)&&aQ>=Math.min(aZ,aK)&&aN>=aJ+aE&&aN<=aJ+aX):(aQ>=aK+aE&&aQ<=aK+aX&&aN>=Math.min(aZ,aJ)&&aN<=Math.max(aZ,aJ))){aY=[aW,aU/aT]}}}}if(aY){aW=aY[0];aU=aY[1];aT=Q[aW].datapoints.pointsize;return{datapoint:Q[aW].datapoints.points.slice(aU*aT,(aU+1)*aT),dataIndex:aU,series:Q[aW],seriesIndex:aW}}return null}function aa(aB){if(O.grid.hoverable){u("plothover",aB,function(aC){return aC.hoverable!=false})}}function l(aB){if(O.grid.hoverable){u("plothover",aB,function(aC){return false})}}function R(aB){u("plotclick",aB,function(aC){return aC.clickable!=false})}function u(aC,aB,aD){var aE=y.offset(),aH=aB.pageX-aE.left-q.left,aF=aB.pageY-aE.top-q.top,aJ=C({left:aH,top:aF});aJ.pageX=aB.pageX;aJ.pageY=aB.pageY;var aK=K(aH,aF,aD);if(aK){aK.pageX=parseInt(aK.series.xaxis.p2c(aK.datapoint[0])+aE.left+q.left);aK.pageY=parseInt(aK.series.yaxis.p2c(aK.datapoint[1])+aE.top+q.top)}if(O.grid.autoHighlight){for(var aG=0;aG<ab.length;++aG){var aI=ab[aG];if(aI.auto==aC&&!(aK&&aI.series==aK.series&&aI.point[0]==aK.datapoint[0]&&aI.point[1]==aK.datapoint[1])){T(aI.series,aI.point)}}if(aK){x(aK.series,aK.datapoint,aC)}}av.trigger(aC,[aJ,aK])}function f(){if(!M){M=setTimeout(s,30)}}function s(){M=null;A.save();A.clearRect(0,0,G,I);A.translate(q.left,q.top);var aC,aB;for(aC=0;aC<ab.length;++aC){aB=ab[aC];if(aB.series.bars.show){v(aB.series,aB.point)}else{ay(aB.series,aB.point)}}A.restore();an(ak.drawOverlay,[A])}function x(aD,aB,aF){if(typeof aD=="number"){aD=Q[aD]}if(typeof aB=="number"){var aE=aD.datapoints.pointsize;aB=aD.datapoints.points.slice(aE*aB,aE*(aB+1))}var aC=al(aD,aB);if(aC==-1){ab.push({series:aD,point:aB,auto:aF});f()}else{if(!aF){ab[aC].auto=false}}}function T(aD,aB){if(aD==null&&aB==null){ab=[];f()}if(typeof aD=="number"){aD=Q[aD]}if(typeof aB=="number"){aB=aD.data[aB]}var aC=al(aD,aB);if(aC!=-1){ab.splice(aC,1);f()}}function al(aD,aE){for(var aB=0;aB<ab.length;++aB){var aC=ab[aB];if(aC.series==aD&&aC.point[0]==aE[0]&&aC.point[1]==aE[1]){return aB}}return -1}function ay(aE,aD){var aC=aD[0],aI=aD[1],aH=aE.xaxis,aG=aE.yaxis;if(aC<aH.min||aC>aH.max||aI<aG.min||aI>aG.max){return}var aF=aE.points.radius+aE.points.lineWidth/2;A.lineWidth=aF;A.strokeStyle=c.color.parse(aE.color).scale("a",0.5).toString();var aB=1.5*aF,aC=aH.p2c(aC),aI=aG.p2c(aI);A.beginPath();if(aE.points.symbol=="circle"){A.arc(aC,aI,aB,0,2*Math.PI,false)}else{aE.points.symbol(A,aC,aI,aB,false)}A.closePath();A.stroke()}function v(aE,aB){A.lineWidth=aE.bars.lineWidth;A.strokeStyle=c.color.parse(aE.color).scale("a",0.5).toString();var aD=c.color.parse(aE.color).scale("a",0.5).toString();var aC=aE.bars.align=="left"?0:-aE.bars.barWidth/2;E(aB[0],aB[1],aB[2]||0,aC,aC+aE.bars.barWidth,0,function(){return aD},aE.xaxis,aE.yaxis,A,aE.bars.horizontal,aE.bars.lineWidth)}function am(aJ,aB,aH,aC){if(typeof aJ=="string"){return aJ}else{var aI=H.createLinearGradient(0,aH,0,aB);for(var aE=0,aD=aJ.colors.length;aE<aD;++aE){var aF=aJ.colors[aE];if(typeof aF!="string"){var aG=c.color.parse(aC);if(aF.brightness!=null){aG=aG.scale("rgb",aF.brightness)}if(aF.opacity!=null){aG.a*=aF.opacity}aF=aG.toString()}aI.addColorStop(aE/(aD-1),aF)}return aI}}}c.plot=function(g,e,d){var f=new b(c(g),e,d,c.plot.plugins);return f};c.plot.version="0.7";c.plot.plugins=[];c.plot.formatDate=function(l,f,h){var o=function(d){d=""+d;return d.length==1?"0"+d:d};var e=[];var p=false,j=false;var n=l.getUTCHours();var k=n<12;if(h==null){h=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}if(f.search(/%p|%P/)!=-1){if(n>12){n=n-12}else{if(n==0){n=12}}}for(var g=0;g<f.length;++g){var m=f.charAt(g);if(p){switch(m){case"h":m=""+n;break;case"H":m=o(n);break;case"M":m=o(l.getUTCMinutes());break;case"S":m=o(l.getUTCSeconds());break;case"d":m=""+l.getUTCDate();break;case"m":m=""+(l.getUTCMonth()+1);break;case"y":m=""+l.getUTCFullYear();break;case"b":m=""+h[l.getUTCMonth()];break;case"p":m=(k)?("am"):("pm");break;case"P":m=(k)?("AM"):("PM");break;case"0":m="";j=true;break}if(m&&j){m=o(m);j=false}e.push(m);if(!j){p=false}}else{if(m=="%"){p=true}else{e.push(m)}}}return e.join("")};function a(e,d){return d*Math.floor(e/d)}})(jQuery);
\ No newline at end of file

From 7e89c9a0a756a51b61c4050b429ff16d9b393885 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 30 Nov 2012 15:14:14 +1300
Subject: [PATCH 15/30] Don't render header/footer blocks till the last minute

---
 application/controllers/main.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/controllers/main.php b/application/controllers/main.php
index edd00e825a..38ec589356 100644
--- a/application/controllers/main.php
+++ b/application/controllers/main.php
@@ -70,13 +70,12 @@ public function __construct()
 
 		// Themes Helper
 		$this->themes = new Themes();
+		$this->themes->requirements();
 		$this->themes->frontend = TRUE;
 		$this->themes->api_url = Kohana::config('settings.api_url');
 		$this->template->header->submit_btn = $this->themes->submit_btn();
 		$this->template->header->languages = $this->themes->languages();
 		$this->template->header->search = $this->themes->search();
-		$this->template->header->header_block = $this->themes->header_block();
-		$this->template->footer->footer_block = $this->themes->footer_block();
 
 		// Set Table Prefix
 		$this->table_prefix = Kohana::config('database.default.table_prefix');

From ffb755aa650613ce03f32cdd75012276aef50058 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 29 Jun 2012 15:23:09 +1200
Subject: [PATCH 16/30] Add custom jquery ui and switch to using this #265

* Replace jquery.ui.min.js with version including accordion
  Previously only included features used in the admin.
* No longer using the google CDN for this as per #365
* Previously the admin used its own jquery UI, now both admin
  and frontend use the same version
---
 application/libraries/Themes.php |   4 +-
 media/js/jquery.pngFix.pack.js   |   0
 media/js/jquery.ui.min.js        | 161 +++++++------------------------
 3 files changed, 39 insertions(+), 126 deletions(-)
 mode change 100755 => 100644 media/js/jquery.pngFix.pack.js

diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 9a2c4b2971..2ca014fd10 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -89,8 +89,8 @@ public function requirements()
 		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
 		
 		Requirements::js("media/js/jquery");
-		//Requirements::js("media/js/jquery.ui.min");
-		Requirements::js(Kohana::config('core.site_protocol')."://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js");
+		Requirements::js("media/js/jquery.ui.min");
+		//Requirements::js(Kohana::config('core.site_protocol')."://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js");
 		Requirements::js("media/js/jquery.pngFix.pack");
 		Requirements::js("media/js/jquery.timeago");
 		
diff --git a/media/js/jquery.pngFix.pack.js b/media/js/jquery.pngFix.pack.js
old mode 100755
new mode 100644
diff --git a/media/js/jquery.ui.min.js b/media/js/jquery.ui.min.js
index fe3442fb78..50c2ab71fb 100644
--- a/media/js/jquery.ui.min.js
+++ b/media/js/jquery.ui.min.js
@@ -1,124 +1,37 @@
-jQuery.ui||function(d){var i=d.fn.remove,k=d.browser.mozilla&&parseFloat(d.browser.version)<1.9;d.ui={version:"1.7.2",plugin:{add:function(f,h,j){f=d.ui[f].prototype;for(var l in j){f.plugins[l]=f.plugins[l]||[];f.plugins[l].push([h,j[l]])}},call:function(f,h,j){if((h=f.plugins[h])&&f.element[0].parentNode)for(var l=0;l<h.length;l++)f.options[h[l][0]]&&h[l][1].apply(f.element,j)}},contains:function(f,h){return document.compareDocumentPosition?f.compareDocumentPosition(h)&16:f!==h&&f.contains(h)},
-hasScroll:function(f,h){if(d(f).css("overflow")=="hidden")return false;h=h&&h=="left"?"scrollLeft":"scrollTop";var j=false;if(f[h]>0)return true;f[h]=1;j=f[h]>0;f[h]=0;return j},isOverAxis:function(f,h,j){return f>h&&f<h+j},isOver:function(f,h,j,l,n,q){return d.ui.isOverAxis(f,j,n)&&d.ui.isOverAxis(h,l,q)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,
-NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(k){var m=d.attr,a=d.fn.removeAttr,b="http://www.w3.org/2005/07/aaa",c=/^aria-/,e=/^wairole:/;d.attr=function(f,h,j){var l=j!==undefined;return h=="role"?l?m.call(this,f,h,"wairole:"+j):(m.apply(this,arguments)||"").replace(e,""):c.test(h)?l?f.setAttributeNS(b,h.replace(c,"aaa:"),j):m.call(this,f,h.replace(c,"aaa:")):m.apply(this,arguments)};d.fn.removeAttr=function(f){return c.test(f)?
-this.each(function(){this.removeAttributeNS(b,f.replace(c,""))}):a.call(this,f)}}d.fn.extend({remove:function(){d("*",this).add(this).each(function(){d(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var f;
-f=d.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(d.curCSS(this,"position",1))&&/(auto|scroll)/.test(d.curCSS(this,"overflow",1)+d.curCSS(this,"overflow-y",1)+d.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(d.curCSS(this,"overflow",1)+d.curCSS(this,"overflow-y",1)+d.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||
-!f.length?d(document):f}});d.extend(d.expr[":"],{data:function(f,h,j){return!!d.data(f,j[3])},focusable:function(f){var h=f.nodeName.toLowerCase(),j=d.attr(f,"tabindex");return(/input|select|textarea|button|object/.test(h)?!f.disabled:"a"==h||"area"==h?f.href||!isNaN(j):!isNaN(j))&&!d(f)["area"==h?"parents":"closest"](":hidden").length},tabbable:function(f){var h=d.attr(f,"tabindex");return(isNaN(h)||h>=0)&&d(f).is(":focusable")}});function g(f,h,j,l){function n(o){o=d[f][h][o]||[];return typeof o==
-"string"?o.split(/,?\s+/):o}var q=n("getter");if(l.length==1&&typeof l[0]=="string")q=q.concat(n("getterSetter"));return d.inArray(j,q)!=-1}d.widget=function(f,h){var j=f.split(".")[0];f=f.split(".")[1];d.fn[f]=function(l){var n=typeof l=="string",q=Array.prototype.slice.call(arguments,1);if(n&&l.substring(0,1)=="_")return this;if(n&&g(j,f,l,q)){var o=d.data(this[0],f);return o?o[l].apply(o,q):undefined}return this.each(function(){var p=d.data(this,f);!p&&!n&&d.data(this,f,new d[j][f](this,l))._init();
-p&&n&&d.isFunction(p[l])&&p[l].apply(p,q)})};d[j]=d[j]||{};d[j][f]=function(l,n){var q=this;this.namespace=j;this.widgetName=f;this.widgetEventPrefix=d[j][f].eventPrefix||f;this.widgetBaseClass=j+"-"+f;this.options=d.extend({},d.widget.defaults,d[j][f].defaults,d.metadata&&d.metadata.get(l)[f],n);this.element=d(l).bind("setData."+f,function(o,p,s){if(o.target==l)return q._setData(p,s)}).bind("getData."+f,function(o,p){if(o.target==l)return q._getData(p)}).bind("remove",function(){return q.destroy()})};
-d[j][f].prototype=d.extend({},d.widget.prototype,h);d[j][f].getterSetter="option"};d.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(f,h){var j=f,l=this;if(typeof f=="string"){if(h===undefined)return this._getData(f);j={};j[f]=h}d.each(j,function(n,q){l._setData(n,q)})},_getData:function(f){return this.options[f]},_setData:function(f,
-h){this.options[f]=h;if(f=="disabled")this.element[h?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",h)},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(f,h,j){var l=this.options[f];f=f==this.widgetEventPrefix?f:this.widgetEventPrefix+f;h=d.Event(h);h.type=f;if(h.originalEvent){f=d.event.props.length;for(var n;f;){n=d.event.props[--f];h[n]=h.originalEvent[n]}}this.element.trigger(h,
-j);return!(d.isFunction(l)&&l.call(this.element[0],h,j)===false||h.isDefaultPrevented())}};d.widget.defaults={disabled:false};d.ui.mouse={_mouseInit:function(){var f=this;this.element.bind("mousedown."+this.widgetName,function(h){return f._mouseDown(h)}).bind("click."+this.widgetName,function(h){if(f._preventClickEvent){f._preventClickEvent=false;h.stopImmediatePropagation();return false}});if(d.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable",
-"on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);d.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable)},_mouseDown:function(f){f.originalEvent=f.originalEvent||{};if(!f.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(f);this._mouseDownEvent=f;var h=this,j=f.which==1,l=typeof this.options.cancel=="string"?d(f.target).parents().add(f.target).filter(this.options.cancel).length:false;if(!j||l||!this._mouseCapture(f))return true;
-this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){h.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(f)&&this._mouseDelayMet(f)){this._mouseStarted=this._mouseStart(f)!==false;if(!this._mouseStarted){f.preventDefault();return true}}this._mouseMoveDelegate=function(n){return h._mouseMove(n)};this._mouseUpDelegate=function(n){return h._mouseUp(n)};d(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+
-this.widgetName,this._mouseUpDelegate);d.browser.safari||f.preventDefault();return f.originalEvent.mouseHandled=true}},_mouseMove:function(f){if(d.browser.msie&&!f.button)return this._mouseUp(f);if(this._mouseStarted){this._mouseDrag(f);return f.preventDefault()}if(this._mouseDistanceMet(f)&&this._mouseDelayMet(f))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,f)!==false)?this._mouseDrag(f):this._mouseUp(f);return!this._mouseStarted},_mouseUp:function(f){d(document).unbind("mousemove."+
-this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=f.target==this._mouseDownEvent.target;this._mouseStop(f)}return false},_mouseDistanceMet:function(f){return Math.max(Math.abs(this._mouseDownEvent.pageX-f.pageX),Math.abs(this._mouseDownEvent.pageY-f.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},
-_mouseStop:function(){},_mouseCapture:function(){return true}};d.ui.mouse.defaults={cancel:null,distance:1,delay:0}}(jQuery);
-(function(d){d.widget("ui.slider",d.extend({},d.ui.mouse,{_init:function(){var i=this,k=this.options;this._keySliding=false;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");this.range=d([]);if(k.range){if(k.range===true){this.range=d("<div></div>");if(!k.values)k.values=[this._valueMin(),this._valueMin()];if(k.values.length&&k.values.length!=2)k.values=[k.values[0],k.values[0]]}else this.range=
-d("<div></div>");this.range.appendTo(this.element).addClass("ui-slider-range");if(k.range=="min"||k.range=="max")this.range.addClass("ui-slider-range-"+k.range);this.range.addClass("ui-widget-header")}d(".ui-slider-handle",this.element).length==0&&d('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle");if(k.values&&k.values.length)for(;d(".ui-slider-handle",this.element).length<k.values.length;)d('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle");this.handles=
-d(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(m){m.preventDefault()}).hover(function(){k.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(k.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});
-this.handles.each(function(m){d(this).data("index.ui-slider-handle",m)});this.handles.keydown(function(m){var a=true,b=d(this).data("index.ui-slider-handle");if(!i.options.disabled){switch(m.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:a=false;if(!i._keySliding){i._keySliding=true;d(this).addClass("ui-state-active");i._start(m,b)}break}var c,e,g=i._step();c=i.options.values&&i.options.values.length?
-(e=i.values(b)):(e=i.value());switch(m.keyCode){case d.ui.keyCode.HOME:e=i._valueMin();break;case d.ui.keyCode.END:e=i._valueMax();break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(c==i._valueMax())return;e=c+g;break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(c==i._valueMin())return;e=c-g;break}i._slide(m,b,e);return a}}).keyup(function(m){var a=d(this).data("index.ui-slider-handle");if(i._keySliding){i._stop(m,a);i._change(m,a);i._keySliding=false;d(this).removeClass("ui-state-active")}});
-this._refreshValue()},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy()},_mouseCapture:function(i){var k=this.options;if(k.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();var m={x:i.pageX,y:i.pageY},
-a=this._normValueFromMouse(m),b=this._valueMax()-this._valueMin()+1,c,e=this,g;this.handles.each(function(h){var j=Math.abs(a-e.values(h));if(b>j){b=j;c=d(this);g=h}});if(k.range==true&&this.values(1)==k.min)c=d(this.handles[++g]);this._start(i,g);e._handleIndex=g;c.addClass("ui-state-active").focus();k=c.offset();var f=!d(i.target).parents().andSelf().is(".ui-slider-handle");this._clickOffset=f?{left:0,top:0}:{left:i.pageX-k.left-c.width()/2,top:i.pageY-k.top-c.height()/2-(parseInt(c.css("borderTopWidth"),
-10)||0)-(parseInt(c.css("borderBottomWidth"),10)||0)+(parseInt(c.css("marginTop"),10)||0)};a=this._normValueFromMouse(m);this._slide(i,g,a);return true},_mouseStart:function(){return true},_mouseDrag:function(i){var k={x:i.pageX,y:i.pageY};k=this._normValueFromMouse(k);this._slide(i,this._handleIndex,k);return false},_mouseStop:function(i){this.handles.removeClass("ui-state-active");this._stop(i,this._handleIndex);this._change(i,this._handleIndex);this._clickOffset=this._handleIndex=null;return false},
-_detectOrientation:function(){this.orientation=this.options.orientation=="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(i){var k;if("horizontal"==this.orientation){k=this.elementSize.width;i=i.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{k=this.elementSize.height;i=i.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}k=i/k;if(k>1)k=1;if(k<0)k=0;if("vertical"==this.orientation)k=1-k;i=this._valueMax()-this._valueMin();i=k*i;k=i%this.options.step;
-i=this._valueMin()+i-k;if(k>this.options.step/2)i+=this.options.step;return parseFloat(i.toFixed(5))},_start:function(i,k){var m={handle:this.handles[k],value:this.value()};if(this.options.values&&this.options.values.length){m.value=this.values(k);m.values=this.values()}this._trigger("start",i,m)},_slide:function(i,k,m){if(this.options.values&&this.options.values.length){var a=this.values(k?0:1);if(this.options.values.length==2&&this.options.range===true&&(k==0&&m>a||k==1&&m<a))m=a;if(m!=this.values(k)){a=
-this.values();a[k]=m;a=this._trigger("slide",i,{handle:this.handles[k],value:m,values:a});this.values(k?0:1);a!==false&&this.values(k,m,i.type=="mousedown"&&this.options.animate,true)}}else if(m!=this.value()){a=this._trigger("slide",i,{handle:this.handles[k],value:m});a!==false&&this._setData("value",m,i.type=="mousedown"&&this.options.animate)}},_stop:function(i,k){var m={handle:this.handles[k],value:this.value()};if(this.options.values&&this.options.values.length){m.value=this.values(k);m.values=
-this.values()}this._trigger("stop",i,m)},_change:function(i,k){var m={handle:this.handles[k],value:this.value()};if(this.options.values&&this.options.values.length){m.value=this.values(k);m.values=this.values()}this._trigger("change",i,m)},value:function(i){if(arguments.length){this._setData("value",i);this._change(null,0)}return this._value()},values:function(i,k,m,a){if(arguments.length>1){this.options.values[i]=k;this._refreshValue(m);a||this._change(null,i)}return arguments.length?this.options.values&&
-this.options.values.length?this._values(i):this.value():this._values()},_setData:function(i,k,m){d.widget.prototype._setData.apply(this,arguments);switch(i){case "disabled":if(k){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled")}else this.handles.removeAttr("disabled");case "orientation":this._detectOrientation();this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);
-this._refreshValue(m);break;case "value":this._refreshValue(m);break}},_step:function(){var i=this.options.step;return i},_value:function(){var i=this.options.value;if(i<this._valueMin())i=this._valueMin();if(i>this._valueMax())i=this._valueMax();return i},_values:function(i){if(arguments.length){var k=this.options.values[i];if(k<this._valueMin())k=this._valueMin();if(k>this._valueMax())k=this._valueMax();return k}else return this.options.values},_valueMin:function(){var i=this.options.min;return i},
-_valueMax:function(){var i=this.options.max;return i},_refreshValue:function(i){var k=this.options.range,m=this.options,a=this;if(this.options.values&&this.options.values.length)this.handles.each(function(g){var f=(a.values(g)-a._valueMin())/(a._valueMax()-a._valueMin())*100,h={};h[a.orientation=="horizontal"?"left":"bottom"]=f+"%";d(this).stop(1,1)[i?"animate":"css"](h,m.animate);if(a.options.range===true)if(a.orientation=="horizontal"){g==0&&a.range.stop(1,1)[i?"animate":"css"]({left:f+"%"},m.animate);
-g==1&&a.range[i?"animate":"css"]({width:f-lastValPercent+"%"},{queue:false,duration:m.animate})}else{g==0&&a.range.stop(1,1)[i?"animate":"css"]({bottom:f+"%"},m.animate);g==1&&a.range[i?"animate":"css"]({height:f-lastValPercent+"%"},{queue:false,duration:m.animate})}lastValPercent=f});else{var b=this.value(),c=this._valueMin(),e=this._valueMax();b=e!=c?(b-c)/(e-c)*100:0;c={};c[a.orientation=="horizontal"?"left":"bottom"]=b+"%";this.handle.stop(1,1)[i?"animate":"css"](c,m.animate);k=="min"&&this.orientation==
-"horizontal"&&this.range.stop(1,1)[i?"animate":"css"]({width:b+"%"},m.animate);k=="max"&&this.orientation=="horizontal"&&this.range[i?"animate":"css"]({width:100-b+"%"},{queue:false,duration:m.animate});k=="min"&&this.orientation=="vertical"&&this.range.stop(1,1)[i?"animate":"css"]({height:b+"%"},m.animate);k=="max"&&this.orientation=="vertical"&&this.range[i?"animate":"css"]({height:100-b+"%"},{queue:false,duration:m.animate})}}}));d.extend(d.ui.slider,{getter:"value values",version:"1.7.2",eventPrefix:"slide",
-defaults:{animate:false,delay:0,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null}})})(jQuery);
-(function(d){d.extend(d.ui,{datepicker:{version:"1.7.2"}});var i="datepicker";function k(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";
-this._currentClass="ui-datepicker-current-day";this._dayOverClass="ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun",
-"Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],dateFormat:"mm/dd/yy",firstDay:0,isRTL:false};this._defaults={showOn:"focus",showAnim:"show",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,showMonthAfterYear:false,yearRange:"-10:+10",showOtherMonths:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"normal",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>')}d.extend(k.prototype,{markerClassName:"hasDatepicker",
-log:function(){this.debug&&console.log.apply("",arguments)},setDefaults:function(a){m(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var g=a.getAttribute("date:"+e);if(g){c=c||{};try{c[e]=eval(g)}catch(f){c[e]=g}}}e=a.nodeName.toLowerCase();g=e=="div"||e=="span";if(!a.id)a.id="dp"+ ++this.uuid;var h=this._newInst(d(a),g);h.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,h);else g&&this._inlineDatepicker(a,h)},_newInst:function(a,
-b){var c=a[0].id.replace(/([:\[\]\.])/g,"\\\\$1");return{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){var e=this._get(b,"appendText"),g=this._get(b,"isRTL");if(e){b.append=d('<span class="'+this._appendClass+
-'">'+e+"</span>");c[g?"before":"after"](b.append)}e=this._get(b,"showOn");if(e=="focus"||e=="both")c.focus(this._showDatepicker);if(e=="button"||e=="both"){e=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:e,title:e}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?e:d("<img/>").attr({src:f,alt:e,title:e})));c[g?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&
-d.datepicker._lastInput==a?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a);return false})}c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).bind("setData.datepicker",function(h,j,l){b.settings[j]=l}).bind("getData.datepicker",function(h,j){return this._get(b,j)});d.data(a,i,b)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,g,f){b.settings[g]=
-f}).bind("getData.datepicker",function(e,g){return this._get(b,g)});d.data(a,i,b);this._setDate(b,this._getDefaultDate(b));this._updateDatepicker(b);this._updateAlternate(b)}},_dialogDatepicker:function(a,b,c,e,g){a=this._dialogInst;if(!a){a="dp"+ ++this.uuid;this._dialogInput=d('<input type="text" id="'+a+'" size="1" style="position: absolute; top: -100px;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);
-a.settings={};d.data(this._dialogInput[0],i,a)}m(a.settings,e||{});this._dialogInput.val(b);this._pos=g?g.length?g:[g.pageX,g.pageY]:null;if(!this._pos){b=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;e=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;g=document.documentElement.scrollLeft||document.body.scrollLeft;var f=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[b/2-100+g,e/2-150+f]}this._dialogInput.css("left",
-this._pos[0]+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],i,a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,i);if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,i);if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",
-this._doKeyDown).unbind("keypress",this._doKeyPress)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,i);if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled")}this._disabledInputs=
-d.map(this._disabledInputs,function(g){return g==a?null:g})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,i);if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled")}this._disabledInputs=d.map(this._disabledInputs,function(g){return g==
-a?null:g});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,i)}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},
-e.settings):this._get(e,b):null;var g=b||{};if(typeof b=="string"){g={};g[b]=c}if(e){this._curInst==e&&this._hideDatepicker(null);var f=this._getDateDatepicker(a);m(e.settings,g);this._setDateDatepicker(a,f);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b,c){if(a=this._getInst(a)){this._setDate(a,b,c);this._updateDatepicker(a);this._updateAlternate(a)}},
-_getDateDatepicker:function(a){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker(null,"");break;case 13:c=d("td."+d.datepicker._dayOverClass+", td."+d.datepicker._currentClass,b.dpDiv);c[0]?d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,
-c[0]):d.datepicker._hideDatepicker(null,d.datepicker._get(b,"duration"));return false;case 27:d.datepicker._hideDatepicker(null,d.datepicker._get(b,"duration"));break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);
-c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||
-a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=
-d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);return a.ctrlKey||c<" "||!b||b.indexOf(c)>-1}},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a),c=d.datepicker._get(b,"beforeShow");
-m(b.settings,c?c.apply(a,[a,b]):{});d.datepicker._hideDatepicker(null,"");d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}a=
-{left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.rangeStart=null;b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);a=d.datepicker._checkOffset(b,a,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:a.left+"px",top:a.top+"px"});if(!b.inline){a=d.datepicker._get(b,"showAnim")||"show";c=d.datepicker._get(b,"duration");var g=function(){d.datepicker._datepickerShowing=
-true;d.browser.msie&&parseInt(d.browser.version,10)<7&&d("iframe.ui-datepicker-cover").css({width:b.dpDiv.width()+4,height:b.dpDiv.height()+4})};d.effects&&d.effects[a]?b.dpDiv.show(a,d.datepicker._get(b,"showOptions"),c,g):b.dpDiv[a](c,g);c==""&&g();b.input[0].type!="hidden"&&b.input[0].focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){var b={width:a.dpDiv.width()+4,height:a.dpDiv.height()+4},c=this;a.dpDiv.empty().append(this._generateHTML(a)).find("iframe.ui-datepicker-cover").css({width:b.width,
-height:b.height}).end().find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",function(){d(this).removeClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).bind("mouseover",function(){if(!c._isDisabledDatepicker(a.inline?a.dpDiv.parent()[0]:a.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).addClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();b=this._getNumberOfMonths(a);var e=b[1],g=17;e>1?a.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",g*e+"em"):a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
-a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a.input&&a.input[0].type!="hidden"&&a==d.datepicker._curInst&&d(a.input[0]).focus()},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),g=a.dpDiv.outerHeight(),f=a.input?a.input.outerWidth():0,h=a.input?a.input.outerHeight():0,j=(window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth)+d(document).scrollLeft(),l=(window.innerHeight||
-document.documentElement.clientHeight||document.body.clientHeight)+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-f:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+h?d(document).scrollTop():0;b.left-=b.left+e>j&&j>e?Math.abs(b.left+e-j):0;b.top-=b.top+g>l&&l>g?Math.abs(b.top+g+h*2-l):0;return b},_findPos:function(a){for(;a&&(a.type=="hidden"||a.nodeType!=1);)a=a.nextSibling;a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a,
-b){var c=this._curInst;if(!(!c||a&&c!=d.data(a,i))){c.stayOpen&&this._selectDate("#"+c.id,this._formatDate(c,c.currentDay,c.currentMonth,c.currentYear));c.stayOpen=false;if(this._datepickerShowing){b=b!=null?b:this._get(c,"duration");a=this._get(c,"showAnim");var e=function(){d.datepicker._tidyDialog(c)};b!=""&&d.effects&&d.effects[a]?c.dpDiv.hide(a,d.datepicker._get(c,"showOptions"),b,e):c.dpDiv[b==""?"hide":a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](b,e);b==""&&this._tidyDialog(c);if(b=
-this._get(c,"onClose"))b.apply(c.input?c.input[0]:null,[c.input?c.input.val():"",c]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}this._curInst=null}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a.parents("#"+
-d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker(null,"")}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&
-b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,
-10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){a=d(a);a=this._getInst(a[0]);a.input&&a._selectingMonthYear&&!d.browser.msie&&a.input[0].focus();a._selectingMonthYear=!a._selectingMonthYear},_selectDay:function(a,b,c,e){var g=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(g[0]))){g=this._getInst(g[0]);g.selectedDay=g.currentDay=d("a",e).html();g.selectedMonth=g.currentMonth=b;g.selectedYear=g.currentYear=c;if(g.stayOpen)g.endDay=g.endMonth=
-g.endYear=null;this._selectDate(a,this._formatDate(g,g.currentDay,g.currentMonth,g.currentYear));if(g.stayOpen){g.rangeStart=this._daylightSavingAdjust(new Date(g.currentYear,g.currentMonth,g.currentDay));this._updateDatepicker(g)}}},_clearDate:function(a){a=d(a);var b=this._getInst(a[0]);b.stayOpen=false;b.endDay=b.endMonth=b.endYear=b.rangeStart=null;this._selectDate(a,"")},_selectDate:function(a,b){a=d(a);a=this._getInst(a[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);
-var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else if(!a.stayOpen){this._hideDatepicker(null,this._get(a,"duration"));this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input[0].focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a);dateStr=this.formatDate(c,e,this._getFormatConfig(a));
-d(b).each(function(){d(this).val(dateStr)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getFullYear(),a.getMonth(),a.getDate());var b=new Date(a.getFullYear(),0,4),c=b.getDay()||7;b.setDate(b.getDate()+1-c);if(c<4&&a<b){a.setDate(a.getDate()-3);return d.datepicker.iso8601Week(a)}else if(a>new Date(a.getFullYear(),11,28)){c=(new Date(a.getFullYear()+1,0,4)).getDay()||7;if(c>4&&(a.getDay()||7)<c-3)return 1}return Math.floor((a-b)/86400000/7)+1},parseDate:function(a,
-b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff,g=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,j=(c?c.monthNames:null)||this._defaults.monthNames,l=c=-1,n=-1,q=-1,o=false;function p(v){(v=A+1<a.length&&a.charAt(A+1)==v)&&A++;return v}function s(v){p(v);for(var z=
-v=v=="@"?14:v=="y"?4:v=="o"?3:2,y=0;z>0&&x<b.length&&b.charAt(x)>="0"&&b.charAt(x)<="9";){y=y*10+parseInt(b.charAt(x++),10);z--}if(z==v)throw"Missing number at position "+x;return y}function r(v,z,y){v=p(v)?y:z;for(y=z=0;y<v.length;y++)z=Math.max(z,v[y].length);y="";for(var F=x;z>0&&x<b.length;){y+=b.charAt(x++);for(var D=0;D<v.length;D++)if(y==v[D])return D+1;z--}throw"Unknown name at position "+F;}function t(){if(b.charAt(x)!=a.charAt(A))throw"Unexpected literal at position "+x;x++}for(var x=0,
-A=0;A<a.length;A++)if(o)if(a.charAt(A)=="'"&&!p("'"))o=false;else t();else switch(a.charAt(A)){case "d":n=s("d");break;case "D":r("D",g,f);break;case "o":q=s("o");break;case "m":l=s("m");break;case "M":l=r("M",h,j);break;case "y":c=s("y");break;case "@":var B=new Date(s("@"));c=B.getFullYear();l=B.getMonth()+1;n=B.getDate();break;case "'":if(p("'"))t();else o=true;break;default:t()}if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);
-if(q>-1){l=1;n=q;do{e=this._getDaysInMonth(c,l-1);if(n<=e)break;l++;n-=e}while(1)}B=this._daylightSavingAdjust(new Date(c,l-1,n));if(B.getFullYear()!=c||B.getMonth()+1!=l||B.getDate()!=n)throw"Invalid date";return B},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TIMESTAMP:"@",W3C:"yy-mm-dd",formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,
-g=(c?c.dayNames:null)||this._defaults.dayNames,f=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;function h(r){(r=o+1<a.length&&a.charAt(o+1)==r)&&o++;return r}function j(r,t,x){t=""+t;if(h(r))for(;t.length<x;)t="0"+t;return t}function l(r,t,x,A){return h(r)?A[t]:x[t]}var n="",q=false;if(b)for(var o=0;o<a.length;o++)if(q)if(a.charAt(o)=="'"&&!h("'"))q=false;else n+=a.charAt(o);else switch(a.charAt(o)){case "d":n+=j("d",b.getDate(),2);break;
-case "D":n+=l("D",b.getDay(),e,g);break;case "o":for(var p=b.getDate(),s=b.getMonth()-1;s>=0;s--)p+=this._getDaysInMonth(b.getFullYear(),s);n+=j("o",p,3);break;case "m":n+=j("m",b.getMonth()+1,2);break;case "M":n+=l("M",b.getMonth(),f,c);break;case "y":n+=h("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":n+=b.getTime();break;case "'":if(h("'"))n+="'";else q=true;break;default:n+=a.charAt(o)}return n},_possibleChars:function(a){for(var b="",c=false,e=0;e<a.length;e++)if(c)if(a.charAt(e)==
-"'"&&!lookAhead("'"))c=false;else b+=a.charAt(e);else switch(a.charAt(e)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(lookAhead("'"))b+="'";else c=true;break;default:b+=a.charAt(e)}return b},_get:function(a,b){return a.settings[b]!==undefined?a.settings[b]:this._defaults[b]},_setDateFromField:function(a){var b=this._get(a,"dateFormat"),c=a.input?a.input.val():null;a.endDay=a.endMonth=a.endYear=null;var e=defaultDate=this._getDefaultDate(a),g=
-this._getFormatConfig(a);try{e=this.parseDate(b,c,g)||defaultDate}catch(f){this.log(f);e=defaultDate}a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();a.currentDay=c?e.getDate():0;a.currentMonth=c?e.getMonth():0;a.currentYear=c?e.getFullYear():0;this._adjustInstDate(a)},_getDefaultDate:function(a){var b=this._determineDate(this._get(a,"defaultDate"),new Date),c=this._getMinMaxDate(a,"min",true);a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;
-return b=a&&b>a?a:b},_determineDate:function(a,b){function c(g){var f=new Date;f.setDate(f.getDate()+g);return f}function e(g,f){var h=new Date,j=h.getFullYear(),l=h.getMonth();h=h.getDate();for(var n=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,q=n.exec(g);q;){switch(q[2]||"d"){case "d":case "D":h+=parseInt(q[1],10);break;case "w":case "W":h+=parseInt(q[1],10)*7;break;case "m":case "M":l+=parseInt(q[1],10);h=Math.min(h,f(j,l));break;case "y":case "Y":j+=parseInt(q[1],10);h=Math.min(h,f(j,l));break}q=n.exec(g)}return new Date(j,
-l,h)}if(a=(a=a==null?b:typeof a=="string"?e(a,this._getDaysInMonth):typeof a=="number"?isNaN(a)?b:c(a):a)&&a.toString()=="Invalid Date"?b:a){a.setHours(0);a.setMinutes(0);a.setSeconds(0);a.setMilliseconds(0)}return this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b){var c=!b,e=a.selectedMonth,g=a.selectedYear;b=this._determineDate(b,new Date);a.selectedDay=a.currentDay=b.getDate();a.drawMonth=
-a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if(e!=a.selectedMonth||g!=a.selectedYear)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(c?"":this._formatDate(a))},_getDate:function(a){return a=!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),
-b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),g=this._get(a,"hideIfNoPrevNext"),f=this._get(a,"navigationAsDateFormat"),h=this._getNumberOfMonths(a),j=this._get(a,"showCurrentAtPos"),l=this._get(a,"stepMonths");this._get(a,"stepBigMonths");var n=h[0]!=1||h[1]!=1,q=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),o=this._getMinMaxDate(a,"min",true),p=this._getMinMaxDate(a,"max");j=a.drawMonth-j;var s=a.drawYear;
-if(j<0){j+=12;s--}if(p){var r=this._daylightSavingAdjust(new Date(p.getFullYear(),p.getMonth()-h[1]+1,p.getDate()));for(r=o&&r<o?o:r;this._daylightSavingAdjust(new Date(s,j,1))>r;){j--;if(j<0){j=11;s--}}}a.drawMonth=j;a.drawYear=s;r=this._get(a,"prevText");r=!f?r:this.formatDate(r,this._daylightSavingAdjust(new Date(s,j-l,1)),this._getFormatConfig(a));r=this._canAdjustMonth(a,-1,s,j)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery.datepicker._adjustDate(\'#'+a.id+"', -"+l+", 'M');\" title=\""+
-r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+r+"</span></a>":g?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+r+"</span></a>";var t=this._get(a,"nextText");t=!f?t:this.formatDate(t,this._daylightSavingAdjust(new Date(s,j+l,1)),this._getFormatConfig(a));g=this._canAdjustMonth(a,+1,s,j)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery.datepicker._adjustDate(\'#'+a.id+
-"', +"+l+", 'M');\" title=\""+t+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+t+"</span></a>":g?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+t+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+t+"</span></a>";l=this._get(a,"currentText");t=this._get(a,"gotoCurrent")&&a.currentDay?q:b;l=!f?l:this.formatDate(l,t,this._getFormatConfig(a));f=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery.datepicker._hideDatepicker();">'+
-this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?f:"")+(this._isInRange(a,t)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery.datepicker._gotoToday(\'#'+a.id+"');\">"+l+"</button>":"")+(c?"":f)+"</div>":"";f=parseInt(this._get(a,"firstDay"),10);f=isNaN(f)?0:f;l=this._get(a,"dayNames");this._get(a,"dayNamesShort");t=this._get(a,"dayNamesMin");var x=this._get(a,"monthNames"),
-A=this._get(a,"monthNamesShort"),B=this._get(a,"beforeShowDay"),v=this._get(a,"showOtherMonths");this._get(a,"calculateWeek");for(var z=a.endDay?this._daylightSavingAdjust(new Date(a.endYear,a.endMonth,a.endDay)):q,y=this._getDefaultDate(a),F="",D=0;D<h[0];D++){for(var L="",G=0;G<h[1];G++){var J=this._daylightSavingAdjust(new Date(s,j,a.selectedDay)),w=" ui-corner-all",C="";if(n){C+='<div class="ui-datepicker-group ui-datepicker-group-';switch(G){case 0:C+="first";w=" ui-corner-"+(c?"right":"left");
-break;case h[1]-1:C+="last";w=" ui-corner-"+(c?"left":"right");break;default:C+="middle";w="";break}C+='">'}C+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+w+'">'+(/all|left/.test(w)&&D==0?c?g:r:"")+(/all|right/.test(w)&&D==0?c?r:g:"")+this._generateMonthYearHeader(a,j,s,o,p,J,D>0||G>0,x,A)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var E="";for(w=0;w<7;w++){var u=(w+f)%7;E+="<th"+((w+f+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+l[u]+'">'+
-t[u]+"</span></th>"}C+=E+"</tr></thead><tbody>";E=this._getDaysInMonth(s,j);if(s==a.selectedYear&&j==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,E);w=(this._getFirstDayOfMonth(s,j)-f+7)%7;E=n?6:Math.ceil((w+E)/7);u=this._daylightSavingAdjust(new Date(s,j,1-w));for(var M=0;M<E;M++){C+="<tr>";var N="";for(w=0;w<7;w++){var I=B?B.apply(a.input?a.input[0]:null,[u]):[true,""],H=u.getMonth()!=j,K=H||!I[0]||o&&u<o||p&&u>p;N+='<td class="'+((w+f+6)%7>=5?" ui-datepicker-week-end":"")+(H?" ui-datepicker-other-month":
-"")+(u.getTime()==J.getTime()&&j==a.selectedMonth&&a._keyEvent||y.getTime()==u.getTime()&&y.getTime()==J.getTime()?" "+this._dayOverClass:"")+(K?" "+this._unselectableClass+" ui-state-disabled":"")+(H&&!v?"":" "+I[1]+(u.getTime()>=q.getTime()&&u.getTime()<=z.getTime()?" "+this._currentClass:"")+(u.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!H||v)&&I[2]?' title="'+I[2]+'"':"")+(K?"":" onclick=\"DP_jQuery.datepicker._selectDay('#"+a.id+"',"+j+","+s+', this);return false;"')+">"+(H?v?u.getDate():
-"&#xa0;":K?'<span class="ui-state-default">'+u.getDate()+"</span>":'<a class="ui-state-default'+(u.getTime()==b.getTime()?" ui-state-highlight":"")+(u.getTime()>=q.getTime()&&u.getTime()<=z.getTime()?" ui-state-active":"")+'" href="#">'+u.getDate()+"</a>")+"</td>";u.setDate(u.getDate()+1);u=this._daylightSavingAdjust(u)}C+=N+"</tr>"}j++;if(j>11){j=0;s++}C+="</tbody></table>"+(n?"</div>"+(h[0]>0&&G==h[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");L+=C}F+=L}F+=e+(d.browser.msie&&parseInt(d.browser.version,
-10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");a._keyEvent=false;return F},_generateMonthYearHeader:function(a,b,c,e,g,f,h,j,l){e=a.rangeStart&&e&&f<e?f:e;f=this._get(a,"changeMonth");var n=this._get(a,"changeYear"),q=this._get(a,"showMonthAfterYear"),o='<div class="ui-datepicker-title">',p="";if(h||!f)p+='<span class="ui-datepicker-month">'+j[b]+"</span> ";else{j=e&&e.getFullYear()==c;var s=g&&g.getFullYear()==c;p+='<select class="ui-datepicker-month" onchange="DP_jQuery.datepicker._selectMonthYear(\'#'+
-a.id+"', this, 'M');\" onclick=\"DP_jQuery.datepicker._clickMonthYear('#"+a.id+"');\">";for(var r=0;r<12;r++)if((!j||r>=e.getMonth())&&(!s||r<=g.getMonth()))p+='<option value="'+r+'"'+(r==b?' selected="selected"':"")+">"+l[r]+"</option>";p+="</select>"}q||(o+=p+((h||f||n)&&!(f&&n)?"&#xa0;":""));if(h||!n)o+='<span class="ui-datepicker-year">'+c+"</span>";else{b=this._get(a,"yearRange").split(":");j=l=0;if(b.length!=2){l=c-10;j=c+10}else if(b[0].charAt(0)=="+"||b[0].charAt(0)=="-"){l=c+parseInt(b[0],
-10);j=c+parseInt(b[1],10)}else{l=parseInt(b[0],10);j=parseInt(b[1],10)}l=e?Math.max(l,e.getFullYear()):l;j=g?Math.min(j,g.getFullYear()):j;for(o+='<select class="ui-datepicker-year" onchange="DP_jQuery.datepicker._selectMonthYear(\'#'+a.id+"', this, 'Y');\" onclick=\"DP_jQuery.datepicker._clickMonthYear('#"+a.id+"');\">";l<=j;l++)o+='<option value="'+l+'"'+(l==c?' selected="selected"':"")+">"+l+"</option>";o+="</select>"}if(q)o+=(h||f||n?"&#xa0;":"")+p;o+="</div>";return o},_adjustInstDate:function(a,
-b,c){var e=a.drawYear+(c=="Y"?b:0),g=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,g))+(c=="D"?b:0);e=this._daylightSavingAdjust(new Date(e,g,b));g=this._getMinMaxDate(a,"min",true);b=this._getMinMaxDate(a,"max");e=g&&e<g?g:e;e=b&&e>b?b:e;a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?
-a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b,c){b=this._determineDate(this._get(a,b+"Date"),null);return!c||!a.rangeStart?b:!b||a.rangeStart>b?a.rangeStart:b},_getDaysInMonth:function(a,b){return 32-(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var g=this._getNumberOfMonths(a);
-c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:g[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=!a.rangeStart?null:this._daylightSavingAdjust(new Date(a.selectedYear,a.selectedMonth,a.selectedDay));c=(c=c&&a.rangeStart<c?a.rangeStart:c)||this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b>=c)&&(!a||b<=a)},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?
-b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));
-return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});function m(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==undefined)a[c]=b[c];return a}d.fn.datepicker=function(a){if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,
-[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new k;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.7.2";window.DP_jQuery=d})(jQuery);
-(function(d){d.widget("ui.progressbar",{_init:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this._valueMin(),"aria-valuemax":this._valueMax(),"aria-valuenow":this._value()});this.valueDiv=d('<div class="ui-progressbar-value ui-widget-header ui-corner-left"></div>').appendTo(this.element);this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow").removeData("progressbar").unbind(".progressbar");
-this.valueDiv.remove();d.widget.prototype.destroy.apply(this,arguments)},value:function(i){if(i===undefined)return this._value();this._setData("value",i);return this},_setData:function(i,k){switch(i){case "value":this.options.value=k;this._refreshValue();this._trigger("change",null,{});break}d.widget.prototype._setData.apply(this,arguments)},_value:function(){var i=this.options.value;if(i<this._valueMin())i=this._valueMin();if(i>this._valueMax())i=this._valueMax();return i},_valueMin:function(){var i=
-0;return i},_valueMax:function(){var i=100;return i},_refreshValue:function(){var i=this.value();this.valueDiv[i==this._valueMax()?"addClass":"removeClass"]("ui-corner-right");this.valueDiv.width(i+"%");this.element.attr("aria-valuenow",i)}});d.extend(d.ui.progressbar,{version:"1.7.2",defaults:{value:0}})})(jQuery);
-jQuery.effects||function(d){d.effects={version:"1.7.2",save:function(b,c){for(var e=0;e<c.length;e++)c[e]!==null&&b.data("ec.storage."+c[e],b[0].style[c[e]])},restore:function(b,c){for(var e=0;e<c.length;e++)c[e]!==null&&b.css(c[e],b.data("ec.storage."+c[e]))},setMode:function(b,c){if(c=="toggle")c=b.is(":hidden")?"show":"hide";return c},getBaseline:function(b,c){var e;switch(b[0]){case "top":e=0;break;case "middle":e=0.5;break;case "bottom":e=1;break;default:e=b[0]/c.height}switch(b[1]){case "left":b=
-0;break;case "center":b=0.5;break;case "right":b=1;break;default:b=b[1]/c.width}return{x:b,y:e}},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent();var c={width:b.outerWidth(true),height:b.outerHeight(true),"float":b.css("float")};b.wrap('<div class="ui-effects-wrapper" style="font-size:100%;background:transparent;border:none;margin:0;padding:0"></div>');var e=b.parent();if(b.css("position")=="static"){e.css({position:"relative"});b.css({position:"relative"})}else{var g=
-b.css("top");if(isNaN(parseInt(g,10)))g="auto";var f=b.css("left");if(isNaN(parseInt(f,10)))f="auto";e.css({position:b.css("position"),top:g,left:f,zIndex:b.css("z-index")}).show();b.css({position:"relative",top:0,left:0})}e.css(c);return e},removeWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent().replaceWith(b);return b},setTransition:function(b,c,e,g){g=g||{};d.each(c,function(f,h){unit=b.cssUnit(h);if(unit[0]>0)g[h]=unit[0]*e+unit[1]});return g},animateClass:function(b,
-c,e,g){var f=typeof e=="function"?e:g?g:null,h=typeof e=="string"?e:null;return this.each(function(){var j={},l=d(this),n=l.attr("style")||"";if(typeof n=="object")n=n.cssText;if(b.toggle)l.hasClass(b.toggle)?(b.remove=b.toggle):(b.add=b.toggle);var q=d.extend({},document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle);b.add&&l.addClass(b.add);b.remove&&l.removeClass(b.remove);var o=d.extend({},document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle);
-b.add&&l.removeClass(b.add);b.remove&&l.addClass(b.remove);for(var p in o)if(typeof o[p]!="function"&&o[p]&&p.indexOf("Moz")==-1&&p.indexOf("length")==-1&&o[p]!=q[p]&&(p.match(/color/i)||!p.match(/color/i)&&!isNaN(parseInt(o[p],10)))&&(q.position!="static"||q.position=="static"&&!p.match(/left|top|bottom|right/)))j[p]=o[p];l.animate(j,c,h,function(){if(typeof d(this).attr("style")=="object"){d(this).attr("style").cssText="";d(this).attr("style").cssText=n}else d(this).attr("style",n);b.add&&d(this).addClass(b.add);
-b.remove&&d(this).removeClass(b.remove);f&&f.apply(this,arguments)})})}};function i(b,c){var e=b[1]&&b[1].constructor==Object?b[1]:{};if(c)e.mode=c;c=b[1]&&b[1].constructor!=Object?b[1]:e.duration?e.duration:b[2];c=d.fx.off?0:typeof c==="number"?c:d.fx.speeds[c]||d.fx.speeds._default;var g=e.callback||d.isFunction(b[1])&&b[1]||d.isFunction(b[2])&&b[2]||d.isFunction(b[3])&&b[3];return[b[0],e,c,g]}d.fn.extend({_show:d.fn.show,_hide:d.fn.hide,__toggle:d.fn.toggle,_addClass:d.fn.addClass,_removeClass:d.fn.removeClass,
-_toggleClass:d.fn.toggleClass,effect:function(b,c,e,g){return d.effects[b]?d.effects[b].call(this,{method:b,options:c||{},duration:e,callback:g}):null},show:function(){return!arguments[0]||arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0])?this._show.apply(this,arguments):this.effect.apply(this,i(arguments,"show"))},hide:function(){return!arguments[0]||arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0])?this._hide.apply(this,arguments):this.effect.apply(this,
-i(arguments,"hide"))},toggle:function(){return!arguments[0]||arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0])||d.isFunction(arguments[0])||typeof arguments[0]=="boolean"?this.__toggle.apply(this,arguments):this.effect.apply(this,i(arguments,"toggle"))},addClass:function(b,c,e,g){return c?d.effects.animateClass.apply(this,[{add:b},c,e,g]):this._addClass(b)},removeClass:function(b,c,e,g){return c?d.effects.animateClass.apply(this,[{remove:b},c,e,g]):this._removeClass(b)},toggleClass:function(b,
-c,e,g){return typeof c!=="boolean"&&c?d.effects.animateClass.apply(this,[{toggle:b},c,e,g]):this._toggleClass(b,c)},morph:function(b,c,e,g,f){return d.effects.animateClass.apply(this,[{add:c,remove:b},e,g,f])},switchClass:function(){return this.morph.apply(this,arguments)},cssUnit:function(b){var c=this.css(b),e=[];d.each(["em","px","%","pt"],function(g,f){if(c.indexOf(f)>0)e=[parseFloat(c),f]});return e}});d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor",
-"color","outlineColor"],function(b,c){d.fx.step[c]=function(e){if(e.state==0){e.start=m(e.elem,c);e.end=k(e.end)}e.elem.style[c]="rgb("+[Math.max(Math.min(parseInt(e.pos*(e.end[0]-e.start[0])+e.start[0],10),255),0),Math.max(Math.min(parseInt(e.pos*(e.end[1]-e.start[1])+e.start[1],10),255),0),Math.max(Math.min(parseInt(e.pos*(e.end[2]-e.start[2])+e.start[2],10),255),0)].join(",")+")"}});function k(b){var c;if(b&&b.constructor==Array&&b.length==3)return b;if(c=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(b))return[parseInt(c[1],
-10),parseInt(c[2],10),parseInt(c[3],10)];if(c=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(b))return[parseFloat(c[1])*2.55,parseFloat(c[2])*2.55,parseFloat(c[3])*2.55];if(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(b))return[parseInt(c[1],16),parseInt(c[2],16),parseInt(c[3],16)];if(c=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(b))return[parseInt(c[1]+c[1],16),parseInt(c[2]+c[2],16),parseInt(c[3]+c[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(b))return a.transparent;
-return a[d.trim(b).toLowerCase()]}function m(b,c){var e;do{e=d.curCSS(b,c);if(e!=""&&e!="transparent"||d.nodeName(b,"body"))break;c="backgroundColor"}while(b=b.parentNode);return k(e)}var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,
-50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,
-192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]};d.easing.jswing=d.easing.swing;d.extend(d.easing,{def:"easeOutQuad",swing:function(b,c,e,g,f){return d.easing[d.easing.def](b,c,e,g,f)},easeInQuad:function(b,c,e,g,f){return g*(c/=f)*c+e},easeOutQuad:function(b,c,e,g,f){return-g*(c/=f)*(c-2)+e},easeInOutQuad:function(b,c,e,g,f){if((c/=f/2)<1)return g/2*c*c+e;return-g/2*(--c*(c-2)-1)+e},easeInCubic:function(b,c,e,g,f){return g*(c/=f)*c*c+e},easeOutCubic:function(b,c,e,g,f){return g*
-((c=c/f-1)*c*c+1)+e},easeInOutCubic:function(b,c,e,g,f){if((c/=f/2)<1)return g/2*c*c*c+e;return g/2*((c-=2)*c*c+2)+e},easeInQuart:function(b,c,e,g,f){return g*(c/=f)*c*c*c+e},easeOutQuart:function(b,c,e,g,f){return-g*((c=c/f-1)*c*c*c-1)+e},easeInOutQuart:function(b,c,e,g,f){if((c/=f/2)<1)return g/2*c*c*c*c+e;return-g/2*((c-=2)*c*c*c-2)+e},easeInQuint:function(b,c,e,g,f){return g*(c/=f)*c*c*c*c+e},easeOutQuint:function(b,c,e,g,f){return g*((c=c/f-1)*c*c*c*c+1)+e},easeInOutQuint:function(b,c,e,g,f){if((c/=
-f/2)<1)return g/2*c*c*c*c*c+e;return g/2*((c-=2)*c*c*c*c+2)+e},easeInSine:function(b,c,e,g,f){return-g*Math.cos(c/f*(Math.PI/2))+g+e},easeOutSine:function(b,c,e,g,f){return g*Math.sin(c/f*(Math.PI/2))+e},easeInOutSine:function(b,c,e,g,f){return-g/2*(Math.cos(Math.PI*c/f)-1)+e},easeInExpo:function(b,c,e,g,f){return c==0?e:g*Math.pow(2,10*(c/f-1))+e},easeOutExpo:function(b,c,e,g,f){return c==f?e+g:g*(-Math.pow(2,-10*c/f)+1)+e},easeInOutExpo:function(b,c,e,g,f){if(c==0)return e;if(c==f)return e+g;if((c/=
-f/2)<1)return g/2*Math.pow(2,10*(c-1))+e;return g/2*(-Math.pow(2,-10*--c)+2)+e},easeInCirc:function(b,c,e,g,f){return-g*(Math.sqrt(1-(c/=f)*c)-1)+e},easeOutCirc:function(b,c,e,g,f){return g*Math.sqrt(1-(c=c/f-1)*c)+e},easeInOutCirc:function(b,c,e,g,f){if((c/=f/2)<1)return-g/2*(Math.sqrt(1-c*c)-1)+e;return g/2*(Math.sqrt(1-(c-=2)*c)+1)+e},easeInElastic:function(b,c,e,g,f){b=1.70158;var h=0,j=g;if(c==0)return e;if((c/=f)==1)return e+g;h||(h=f*0.3);if(j<Math.abs(g)){j=g;b=h/4}else b=h/(2*Math.PI)*Math.asin(g/
-j);return-(j*Math.pow(2,10*(c-=1))*Math.sin((c*f-b)*2*Math.PI/h))+e},easeOutElastic:function(b,c,e,g,f){b=1.70158;var h=0,j=g;if(c==0)return e;if((c/=f)==1)return e+g;h||(h=f*0.3);if(j<Math.abs(g)){j=g;b=h/4}else b=h/(2*Math.PI)*Math.asin(g/j);return j*Math.pow(2,-10*c)*Math.sin((c*f-b)*2*Math.PI/h)+g+e},easeInOutElastic:function(b,c,e,g,f){b=1.70158;var h=0,j=g;if(c==0)return e;if((c/=f/2)==2)return e+g;h||(h=f*0.3*1.5);if(j<Math.abs(g)){j=g;b=h/4}else b=h/(2*Math.PI)*Math.asin(g/j);if(c<1)return-0.5*
-j*Math.pow(2,10*(c-=1))*Math.sin((c*f-b)*2*Math.PI/h)+e;return j*Math.pow(2,-10*(c-=1))*Math.sin((c*f-b)*2*Math.PI/h)*0.5+g+e},easeInBack:function(b,c,e,g,f,h){if(h==undefined)h=1.70158;return g*(c/=f)*c*((h+1)*c-h)+e},easeOutBack:function(b,c,e,g,f,h){if(h==undefined)h=1.70158;return g*((c=c/f-1)*c*((h+1)*c+h)+1)+e},easeInOutBack:function(b,c,e,g,f,h){if(h==undefined)h=1.70158;if((c/=f/2)<1)return g/2*c*c*(((h*=1.525)+1)*c-h)+e;return g/2*((c-=2)*c*(((h*=1.525)+1)*c+h)+2)+e},easeInBounce:function(b,
-c,e,g,f){return g-d.easing.easeOutBounce(b,f-c,0,g,f)+e},easeOutBounce:function(b,c,e,g,f){return(c/=f)<1/2.75?g*7.5625*c*c+e:c<2/2.75?g*(7.5625*(c-=1.5/2.75)*c+0.75)+e:c<2.5/2.75?g*(7.5625*(c-=2.25/2.75)*c+0.9375)+e:g*(7.5625*(c-=2.625/2.75)*c+0.984375)+e},easeInOutBounce:function(b,c,e,g,f){if(c<f/2)return d.easing.easeInBounce(b,c*2,0,g,f)*0.5+e;return d.easing.easeOutBounce(b,c*2-f,0,g,f)*0.5+g*0.5+e}})}(jQuery);
-(function(d){d.effects.highlight=function(i){return this.queue(function(){var k=d(this),m=["backgroundImage","backgroundColor","opacity"],a=d.effects.setMode(k,i.options.mode||"show"),b=i.options.color||"#ffff99",c=k.css("backgroundColor");d.effects.save(k,m);k.show();k.css({backgroundImage:"none",backgroundColor:b});b={backgroundColor:c};if(a=="hide")b.opacity=0;k.animate(b,{queue:false,duration:i.duration,easing:i.options.easing,complete:function(){a=="hide"&&k.hide();d.effects.restore(k,m);a==
-"show"&&d.browser.msie&&this.style.removeAttribute("filter");i.callback&&i.callback.apply(this,arguments);k.dequeue()}})})}})(jQuery);
+/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.core.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){function c(b,c){var e=b.nodeName.toLowerCase();if("area"===e){var f=b.parentNode,g=f.name,h;return!b.href||!g||f.nodeName.toLowerCase()!=="map"?!1:(h=a("img[usemap=#"+g+"]")[0],!!h&&d(h))}return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"==e?b.href||c:c)&&d(b)}function d(b){return!a(b).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.ui=a.ui||{};if(a.ui.version)return;a.extend(a.ui,{version:"1.8.21",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(b,c){return typeof b=="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):this._focus.apply(this,arguments)},scrollParent:function(){var b;return a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?b=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):b=this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0),/fixed/.test(this.css("position"))||!b.length?a(document):b},zIndex:function(c){if(c!==b)return this.css("zIndex",c);if(this.length){var d=a(this[0]),e,f;while(d.length&&d[0]!==document){e=d.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){f=parseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!==0)return f}d=d.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),a.each(["Width","Height"],function(c,d){function h(b,c,d,f){return a.each(e,function(){c-=parseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=parseFloat(a.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=parseFloat(a.curCSS(b,"margin"+this,!0))||0)}),c}var e=d==="Width"?["Left","Right"]:["Top","Bottom"],f=d.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){return c===b?g["inner"+d].call(this):this.each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=function(b,c){return typeof b!="number"?g["outer"+d].call(this,b):this.each(function(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=a.attr(b,"tabindex"),e=isNaN(d);return(e||d>=0)&&c(b,!e)}}),a(function(){var b=document.body,c=b.appendChild(c=document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=c.offsetHeight===100,a.support.selectstart="onselectstart"in c,b.removeChild(c).style.display="none"}),a.extend(a.ui,{plugin:{add:function(b,c,d){var e=a.ui[b].prototype;for(var f in d)e.plugins[f]=e.plugins[f]||[],e.plugins[f].push([c,d[f]])},call:function(a,b,c){var d=a.plugins[b];if(!d||!a.element[0].parentNode)return;for(var e=0;e<d.length;e++)a.options[d[e][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(b,c){if(a(b).css("overflow")==="hidden")return!1;var d=c&&c==="left"?"scrollLeft":"scrollTop",e=!1;return b[d]>0?!0:(b[d]=1,e=b[d]>0,b[d]=0,e)},isOverAxis:function(a,b,c){return a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.ui.isOverAxis(c,e,g)}})})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.widget.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){if(a.cleanData){var c=a.cleanData;a.cleanData=function(b){for(var d=0,e;(e=b[d])!=null;d++)try{a(e).triggerHandler("remove")}catch(f){}c(b)}}else{var d=a.fn.remove;a.fn.remove=function(b,c){return this.each(function(){return c||(!b||a.filter(b,[this]).length)&&a("*",this).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b){}}),d.call(a(this),b,c)})}}a.widget=function(b,c,d){var e=b.split(".")[0],f;b=b.split(".")[1],f=e+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][f]=function(c){return!!a.data(c,b)},a[e]=a[e]||{},a[e][b]=function(a,b){arguments.length&&this._createWidget(a,b)};var g=new c;g.options=a.extend(!0,{},g.options),a[e][b].prototype=a.extend(!0,g,{namespace:e,widgetName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBaseClass:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=function(c,d){a.fn[c]=function(e){var f=typeof e=="string",g=Array.prototype.slice.call(arguments,1),h=this;return e=!f&&g.length?a.extend.apply(null,[!0,e].concat(g)):e,f&&e.charAt(0)==="_"?h:(f?this.each(function(){var d=a.data(this,c),f=d&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!==d&&f!==b)return h=f,!1}):this.each(function(){var b=a.data(this,c);b?b.option(e||{})._init():a.data(this,c,new d(e,this))}),h)}},a.Widget=function(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidget:function(b,c){a.data(c,this.widgetName,this),this.element=a(c),this.options=a.extend(!0,{},this.options,this._getCreateOptions(),b);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this._create(),this._trigger("create"),this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled "+"ui-state-disabled")},widget:function(){return this.element},option:function(c,d){var e=c;if(arguments.length===0)return a.extend({},this.options);if(typeof c=="string"){if(d===b)return this.options[c];e={},e[c]=d}return this._setOptions(e),this},_setOptions:function(b){var c=this;return a.each(b,function(a,b){c._setOption(a,b)}),this},_setOption:function(a,b){return this.options[a]=b,a==="disabled"&&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"+" "+"ui-state-disabled").attr("aria-disabled",b),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_trigger:function(b,c,d){var e,f,g=this.options[b];d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent;if(f)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.call(this.element[0],c,d)===!1||c.isDefaultPrevented())}}})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.mouse.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){var c=!1;a(document).mouseup(function(a){c=!1}),a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c){if(!0===a.data(c.target,b.widgetName+".preventClickEvent"))return a.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(b){if(c)return;this._mouseStarted&&this._mouseUp(b),this._mouseDownEvent=b;var d=this,e=b.which==1,f=typeof this.options.cancel=="string"&&b.target.nodeName?a(b.target).closest(this.options.cancel).length:!1;if(!e||f||!this._mouseCapture(b))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){d.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=this._mouseStart(b)!==!1;if(!this._mouseStarted)return b.preventDefault(),!0}return!0===a.data(b.target,this.widgetName+".preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(a){return d._mouseMove(a)},this._mouseUpDelegate=function(a){return d._mouseUp(a)},a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),b.preventDefault(),c=!0,!0},_mouseMove:function(b){return!a.browser.msie||document.documentMode>=9||!!b.button?this._mouseStarted?(this._mouseDrag(b),b.preventDefault()):(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b)),!this._mouseStarted):this._mouseUp(b)},_mouseUp:function(b){return a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target==this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b)),!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}})})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.accordion.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:!0,clearStyle:!1,collapsible:!1,event:"click",fillSpace:!1,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:!1,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var b=this,c=b.options;b.running=0,b.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix"),b.headers=b.element.find(c.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){if(c.disabled)return;a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){if(c.disabled)return;a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){if(c.disabled)return;a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){if(c.disabled)return;a(this).removeClass("ui-state-focus")}),b.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");if(c.navigation){var d=b.element.find("a").filter(c.navigationFilter).eq(0);if(d.length){var e=d.closest(".ui-accordion-header");e.length?b.active=e:b.active=d.closest(".ui-accordion-content").prev()}}b.active=b._findActive(b.active||c.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top"),b.active.next().addClass("ui-accordion-content-active"),b._createIcons(),b.resize(),b.element.attr("role","tablist"),b.headers.attr("role","tab").bind("keydown.accordion",function(a){return b._keydown(a)}).next().attr("role","tabpanel"),b.headers.not(b.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide(),b.active.length?b.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):b.headers.eq(0).attr("tabIndex",0),a.browser.safari||b.headers.find("a").attr("tabIndex",-1),c.event&&b.headers.bind(c.event.split(" ").join(".accordion ")+".accordion",function(a){b._clickHandler.call(b,a,this),a.preventDefault()})},_createIcons:function(){var b=this.options;b.icons&&(a("<span></span>").addClass("ui-icon "+b.icons.header).prependTo(this.headers),this.active.children(".ui-icon").toggleClass(b.icons.header).toggleClass(b.icons.headerSelected),this.element.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.children(".ui-icon").remove(),this.element.removeClass("ui-accordion-icons")},destroy:function(){var b=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex"),this.headers.find("a").removeAttr("tabIndex"),this._destroyIcons();var c=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");return(b.autoHeight||b.fillHeight)&&c.css("height",""),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments),b=="active"&&this.activate(c),b=="icons"&&(this._destroyIcons(),c&&this._createIcons()),b=="disabled"&&this.headers.add(this.headers.next())[c?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(b){if(this.options.disabled||b.altKey||b.ctrlKey)return;var c=a.ui.keyCode,d=this.headers.length,e=this.headers.index(b.target),f=!1;switch(b.keyCode){case c.RIGHT:case c.DOWN:f=this.headers[(e+1)%d];break;case c.LEFT:case c.UP:f=this.headers[(e-1+d)%d];break;case c.SPACE:case c.ENTER:this._clickHandler({target:b.target},b.target),b.preventDefault()}return f?(a(b.target).attr("tabIndex",-1),a(f).attr("tabIndex",0),f.focus(),!1):!0},resize:function(){var b=this.options,c;if(b.fillSpace){if(a.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}c=this.element.parent().height(),a.browser.msie&&this.element.parent().css("overflow",d),this.headers.each(function(){c-=a(this).outerHeight(!0)}),this.headers.next().each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")}else b.autoHeight&&(c=0,this.headers.next().each(function(){c=Math.max(c,a(this).height("").height())}).height(c));return this},activate:function(a){this.options.active=a;var b=this._findActive(a)[0];return this._clickHandler({target:b},b),this},_findActive:function(b){return b?typeof b=="number"?this.headers.filter(":eq("+b+")"):this.headers.not(this.headers.not(b)):b===!1?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(b,c){var d=this.options;if(d.disabled)return;if(!b.target){if(!d.collapsible)return;this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header),this.active.next().addClass("ui-accordion-content-active");var e=this.active.next(),f={options:d,newHeader:a([]),oldHeader:d.active,newContent:a([]),oldContent:e},g=this.active=a([]);this._toggle(g,e,f);return}var h=a(b.currentTarget||c),i=h[0]===this.active[0];d.active=d.collapsible&&i?!1:this.headers.index(h);if(this.running||!d.collapsible&&i)return;var j=this.active,g=h.next(),e=this.active.next(),f={options:d,newHeader:i&&d.collapsible?a([]):h,oldHeader:this.active,newContent:i&&d.collapsible?a([]):g,oldContent:e},k=this.headers.index(this.active[0])>this.headers.index(h[0]);this.active=i?a([]):h,this._toggle(g,e,f,i,k),j.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header),i||(h.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected),h.next().addClass("ui-accordion-content-active"));return},_toggle:function(b,c,d,e,f){var g=this,h=g.options;g.toShow=b,g.toHide=c,g.data=d;var i=function(){if(!g)return;return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data),g.running=c.size()===0?b.size():c.size();if(h.animated){var j={};h.collapsible&&e?j={toShow:a([]),toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillSpace}:j={toShow:b,toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillSpace},h.proxied||(h.proxied=h.animated),h.proxiedDuration||(h.proxiedDuration=h.duration),h.animated=a.isFunction(h.proxied)?h.proxied(j):h.proxied,h.duration=a.isFunction(h.proxiedDuration)?h.proxiedDuration(j):h.proxiedDuration;var k=a.ui.accordion.animations,l=h.duration,m=h.animated;m&&!k[m]&&!a.easing[m]&&(m="slide"),k[m]||(k[m]=function(a){this.slide(a,{easing:m,duration:l||700})}),k[m](j)}else h.collapsible&&e?b.toggle():(c.hide(),b.show()),i(!0);c.prev().attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).blur(),b.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(this.running)return;this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""}),this.toHide.removeClass("ui-accordion-content-active"),this.toHide.length&&(this.toHide.parent()[0].className=this.toHide.parent()[0].className),this._trigger("change",null,this.data)}}),a.extend(a.ui.accordion,{version:"1.8.21",animations:{slide:function(b,c){b=a.extend({easing:"swing",duration:300},b,c);if(!b.toHide.size()){b.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},b);return}if(!b.toShow.size()){b.toHide.animate({height:"hide",paddingTop:"hide",paddingBottom:"hide"},b);return}var d=b.toShow.css("overflow"),e=0,f={},g={},h=["height","paddingTop","paddingBottom"],i,j=b.toShow;i=j[0].style.width,j.width(j.parent().width()-parseFloat(j.css("paddingLeft"))-parseFloat(j.css("paddingRight"))-(parseFloat(j.css("borderLeftWidth"))||0)-(parseFloat(j.css("borderRightWidth"))||0)),a.each(h,function(c,d){g[d]="hide";var e=(""+a.css(b.toShow[0],d)).match(/^([\d+-.]+)(.*)$/);f[d]={value:e[1],unit:e[2]||"px"}}),b.toShow.css({height:0,overflow:"hidden"}).show(),b.toHide.filter(":hidden").each(b.complete).end().filter(":visible").animate(g,{step:function(a,c){c.prop=="height"&&(e=c.end-c.start===0?0:(c.now-c.start)/(c.end-c.start)),b.toShow[0].style[c.prop]=e*f[c.prop].value+f[c.prop].unit},duration:b.duration,easing:b.easing,complete:function(){b.autoHeight||b.toShow.css("height",""),b.toShow.css({width:i,overflow:d}),b.complete()}})},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1e3:200})}}})})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.slider.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){var c=5;a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null},_create:function(){var b=this,d=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",g=d.values&&d.values.length||1,h=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":"")),this.range=a([]),d.range&&(d.range===!0&&(d.values||(d.values=[this._valueMin(),this._valueMin()]),d.values.length&&d.values.length!==2&&(d.values=[d.values[0],d.values[0]])),this.range=a("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range==="min"||d.range==="max"?" ui-slider-range-"+d.range:"")));for(var i=e.length;i<g;i+=1)h.push(f);this.handles=e.add(a(h.join("")).appendTo(b.element)),this.handle=this.handles.eq(0),this.handles.add(this.range).filter("a").click(function(a){a.preventDefault()}).hover(function(){d.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){d.disabled?a(this).blur():(a(".ui-slider .ui-state-focus").removeClass("ui-state-focus"),a(this).addClass("ui-state-focus"))}).blur(function(){a(this).removeClass("ui-state-focus")}),this.handles.each(function(b){a(this).data("index.ui-slider-handle",b)}),this.handles.keydown(function(d){var e=a(this).data("index.ui-slider-handle"),f,g,h,i;if(b.options.disabled)return;switch(d.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:d.preventDefault();if(!b._keySliding){b._keySliding=!0,a(this).addClass("ui-state-active"),f=b._start(d,e);if(f===!1)return}}i=b.options.step,b.options.values&&b.options.values.length?g=h=b.values(e):g=h=b.value();switch(d.keyCode){case a.ui.keyCode.HOME:h=b._valueMin();break;case a.ui.keyCode.END:h=b._valueMax();break;case a.ui.keyCode.PAGE_UP:h=b._trimAlignValue(g+(b._valueMax()-b._valueMin())/c);break;case a.ui.keyCode.PAGE_DOWN:h=b._trimAlignValue(g-(b._valueMax()-b._valueMin())/c);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(g===b._valueMax())return;h=b._trimAlignValue(g+i);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(g===b._valueMin())return;h=b._trimAlignValue(g-i)}b._slide(d,e,h)}).keyup(function(c){var d=a(this).data("index.ui-slider-handle");b._keySliding&&(b._keySliding=!1,b._stop(c,d),b._change(c,d),a(this).removeClass("ui-state-active"))}),this._refreshValue(),this._animateOff=!1},destroy:function(){return this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider"),this._mouseDestroy(),this},_mouseCapture:function(b){var c=this.options,d,e,f,g,h,i,j,k,l;return c.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),d={x:b.pageX,y:b.pageY},e=this._normValueFromMouse(d),f=this._valueMax()-this._valueMin()+1,h=this,this.handles.each(function(b){var c=Math.abs(e-h.values(b));f>c&&(f=c,g=a(this),i=b)}),c.range===!0&&this.values(1)===c.min&&(i+=1,g=a(this.handles[i])),j=this._start(b,i),j===!1?!1:(this._mouseSliding=!0,h._handleIndex=i,g.addClass("ui-state-active").focus(),k=g.offset(),l=!a(b.target).parents().andSelf().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:b.pageX-k.left-g.width()/2,top:b.pageY-k.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,i,e),this._animateOff=!0,!0))},_mouseStart:function(a){return!0},_mouseDrag:function(a){var b={x:a.pageX,y:a.pageY},c=this._normValueFromMouse(b);return this._slide(a,this._handleIndex,c),!1},_mouseStop:function(a){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;return this.orientation==="horizontal"?(b=this.elementSize.width,c=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(b=this.elementSize.height,c=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),d=c/b,d>1&&(d=1),d<0&&(d=0),this.orientation==="vertical"&&(d=1-d),e=this._valueMax()-this._valueMin(),f=this._valueMin()+d*e,this._trimAlignValue(f)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};return this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.options.values&&this.options.values.length?(d=this.values(b?0:1),this.options.values.length===2&&this.options.range===!0&&(b===0&&c>d||b===1&&c<d)&&(c=d),c!==this.values(b)&&(e=this.values(),e[b]=c,f=this._trigger("slide",a,{handle:this.handles[b],value:c,values:e}),d=this.values(b?0:1),f!==!1&&this.values(b,c,!0))):c!==this.value()&&(f=this._trigger("slide",a,{handle:this.handles[b],value:c}),f!==!1&&this.value(c))},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=this._trimAlignValue(a),this._refreshValue(),this._change(null,0);return}return this._value()},values:function(b,c){var d,e,f;if(arguments.length>1){this.options.values[b]=this._trimAlignValue(c),this._refreshValue(),this._change(null,b);return}if(!arguments.length)return this._values();if(!a.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(b):this.value();d=this.options.values,e=arguments[0];for(f=0;f<d.length;f+=1)d[f]=this._trimAlignValue(e[f]),this._change(null,f);this._refreshValue()},_setOption:function(b,c){var d,e=0;a.isArray(this.options.values)&&(e=this.options.values.length),a.Widget.prototype._setOption.apply(this,arguments);switch(b){case"disabled":c?(this.handles.filter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),this.handles.propAttr("disabled",!0),this.element.addClass("ui-disabled")):(this.handles.propAttr("disabled",!1),this.element.removeClass("ui-disabled"));break;case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":this._animateOff=!0,this._refreshValue();for(d=0;d<e;d+=1)this._change(null,d);this._animateOff=!1}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a),a},_values:function(a){var b,c,d;if(arguments.length)return b=this.options.values[a],b=this._trimAlignValue(b),b;c=this.options.values.slice();for(d=0;d<c.length;d+=1)c[d]=this._trimAlignValue(c[d]);return c},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b,d=a-c;return Math.abs(c)*2>=b&&(d+=c>0?b:-b),parseFloat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var b=this.options.range,c=this.options,d=this,e=this._animateOff?!1:c.animate,f,g={},h,i,j,k;this.options.values&&this.options.values.length?this.handles.each(function(b,i){f=(d.values(b)-d._valueMin())/(d._valueMax()-d._valueMin())*100,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",a(this).stop(1,1)[e?"animate":"css"](g,c.animate),d.options.range===!0&&(d.orientation==="horizontal"?(b===0&&d.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({width:f-h+"%"},{queue:!1,duration:c.animate})):(b===0&&d.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({height:f-h+"%"},{queue:!1,duration:c.animate}))),h=f}):(i=this.value(),j=this._valueMin(),k=this._valueMax(),f=k!==j?(i-j)/(k-j)*100:0,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",this.handle.stop(1,1)[e?"animate":"css"](g,c.animate),b==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[e?"animate":"css"]({width:f+"%"},c.animate),b==="max"&&this.orientation==="horizontal"&&this.range[e?"animate":"css"]({width:100-f+"%"},{queue:!1,duration:c.animate}),b==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},c.animate),b==="max"&&this.orientation==="vertical"&&this.range[e?"animate":"css"]({height:100-f+"%"},{queue:!1,duration:c.animate}))}}),a.extend(a.ui.slider,{version:"1.8.21"})})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.datepicker.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function($,undefined){function Datepicker(){this.debug=!1,this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.regional[""]),this.dpDiv=bindHover($('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function bindHover(a){var b="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout",function(a){var c=$(a.target).closest(b);if(!c.length)return;c.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(c){var d=$(c.target).closest(b);if($.datepicker._isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])||!d.length)return;d.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-prev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-next")&&d.addClass("ui-datepicker-next-hover")})}function extendRemove(a,b){$.extend(a,b);for(var c in b)if(b[c]==null||b[c]==undefined)a[c]=b[c];return a}function isArray(a){return a&&($.browser.safari&&typeof a=="object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(\)/))}$.extend($.ui,{datepicker:{version:"1.8.21"}});var PROP_NAME="datepicker",dpuuid=(new Date).getTime(),instActive;$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){return extendRemove(this._defaults,a||{}),this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase(),inline=nodeName=="div"||nodeName=="span";target.id||(this.uuid+=1,target.id="dp"+this.uuid);var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{}),nodeName=="input"?this._connectDatepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newInst:function(a,b){var c=a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");return{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:b?bindHover($('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')):this.dpDiv}},_connectDatepicker:function(a,b){var c=$(a);b.append=$([]),b.trigger=$([]);if(c.hasClass(this.markerClassName))return;this._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.settings.disabled&&this._disableDatepicker(a)},_attachments:function(a,b){var c=this._get(b,"appendText"),d=this._get(b,"isRTL");b.append&&b.append.remove(),c&&(b.append=$('<span class="'+this._appendClass+'">'+c+"</span>"),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),b.trigger&&b.trigger.remove();var e=this._get(b,"showOn");(e=="focus"||e=="both")&&a.focus(this._showDatepicker);if(e=="button"||e=="both"){var f=this._get(b,"buttonText"),g=this._get(b,"buttonImage");b.trigger=$(this._get(b,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:g,alt:f,title:f}):$('<button type="button"></button>').addClass(this._triggerClass).html(g==""?f:$("<img/>").attr({src:g,alt:f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){return $.datepicker._datepickerShowing&&$.datepicker._lastInput==a[0]?$.datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker._lastInput!=a[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepicker(a[0])):$.datepicker._showDatepicker(a[0]),!1})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var d=function(a){var b=0,c=0;for(var d=0;d<a.length;d++)a[d].length>b&&(b=a[d].length,c=d);return c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=$(a);if(c.hasClass(this.markerClassName))return;c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._getDefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.settings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block")},_dialogDatepicker:function(a,b,c,d,e){var f=this._dialogInst;if(!f){this.uuid+=1;var g="dp"+this.uuid;this._dialogInput=$('<input type="text" id="'+g+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>'),this._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInput),f=this._dialogInst=this._newInst(this._dialogInput,!1),f.settings={},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.settings,d||{}),b=b&&b.constructor==Date?this._formatDate(f,b):b,this._dialogInput.val(b),this._pos=e?e.length?e:[e.pageX,e.pageY]:null;if(!this._pos){var h=document.documentElement.clientWidth,i=document.documentElement.clientHeight,j=document.documentElement.scrollLeft||document.body.scrollLeft,k=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[h/2-100+j,i/2-150+k]}return this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),f.settings.onSelect=c,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP_NAME,f),this},_destroyDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return;var d=a.nodeName.toLowerCase();$.removeData(a,PROP_NAME),d=="input"?(c.append.remove(),c.trigger.remove(),b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(d=="div"||d=="span")&&b.removeClass(this.markerClassName).empty()},_enableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return;var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!1,c.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().removeClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b})},_disableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!b.hasClass(this.markerClassName))return;var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!0,c.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().addClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b}),this._disabledInputs[this._disabledInputs.length]=a},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return!0;return!1},_getInst:function(a){try{return $.data(a,PROP_NAME)}catch(b){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(a,b,c){var d=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?$.extend({},$.datepicker._defaults):d?b=="all"?$.extend({},d.settings):this._get(d,b):null;var e=b||{};typeof b=="string"&&(e={},e[b]=c);if(d){this._curInst==d&&this._hideDatepicker();var f=this._getDateDatepicker(a,!0),g=this._getMinMaxDate(d,"min"),h=this._getMinMaxDate(d,"max");extendRemove(d.settings,e),g!==null&&e.dateFormat!==undefined&&e.minDate===undefined&&(d.settings.minDate=this._formatDate(d,g)),h!==null&&e.dateFormat!==undefined&&e.maxDate===undefined&&(d.settings.maxDate=this._formatDate(d,h)),this._attachments($(a),d),this._autoSize(d),this._setDate(d,f),this._updateAlternate(d),this._updateDatepicker(d)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){var b=this._getInst(a);b&&this._updateDatepicker(b)},_setDateDatepicker:function(a,b){var c=this._getInst(a);c&&(this._setDate(c,b),this._updateDatepicker(c),this._updateAlternate(c))},_getDateDatepicker:function(a,b){var c=this._getInst(a);return c&&!c.inline&&this._setDateFromField(c,b),c?this._getDate(c):null},_doKeyDown:function(a){var b=$.datepicker._getInst(a.target),c=!0,d=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=!0;if($.datepicker._datepickerShowing)switch(a.keyCode){case 9:$.datepicker._hideDatepicker(),c=!1;break;case 13:var e=$("td."+$.datepicker._dayOverClass+":not(."+$.datepicker._currentClass+")",b.dpDiv);e[0]&&$.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,e[0]);var f=$.datepicker._get(b,"onSelect");if(f){var g=$.datepicker._formatDate(b);f.apply(b.input?b.input[0]:null,[g,b])}else $.datepicker._hideDatepicker();return!1;case 27:$.datepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(a.target,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M");break;case 34:$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 35:(a.ctrlKey||a.metaKey)&&$.datepicker._clearDate(a.target),c=a.ctrlKey||a.metaKey;break;case 36:(a.ctrlKey||a.metaKey)&&$.datepicker._gotoToday(a.target),c=a.ctrlKey||a.metaKey;break;case 37:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,d?1:-1,"D"),c=a.ctrlKey||a.metaKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M");break;case 38:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,-7,"D"),c=a.ctrlKey||a.metaKey;break;case 39:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,d?-1:1,"D"),c=a.ctrlKey||a.metaKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 40:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,7,"D"),c=a.ctrlKey||a.metaKey;break;default:c=!1}else a.keyCode==36&&a.ctrlKey?$.datepicker._showDatepicker(this):c=!1;c&&(a.preventDefault(),a.stopPropagation())},_doKeyPress:function(a){var b=$.datepicker._getInst(a.target);if($.datepicker._get(b,"constrainInput")){var c=$.datepicker._possibleChars($.datepicker._get(b,"dateFormat")),d=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||d<" "||!c||c.indexOf(d)>-1}},_doKeyUp:function(a){var b=$.datepicker._getInst(a.target);if(b.input.val()!=b.lastVal)try{var c=$.datepicker.parseDate($.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._getFormatConfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._updateAlternate(b),$.datepicker._updateDatepicker(b))}catch(d){$.datepicker.log(d)}return!0},_showDatepicker:function(a){a=a.target||a,a.nodeName.toLowerCase()!="input"&&(a=$("input",a.parentNode)[0]);if($.datepicker._isDisabledDatepicker(a)||$.datepicker._lastInput==a)return;var b=$.datepicker._getInst(a);$.datepicker._curInst&&$.datepicker._curInst!=b&&($.datepicker._curInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.datepicker._hideDatepicker($.datepicker._curInst.input[0]));var c=$.datepicker._get(b,"beforeShow"),d=c?c.apply(a,[a,b]):{};if(d===!1)return;extendRemove(b.settings,d),b.lastVal=null,$.datepicker._lastInput=a,$.datepicker._setDateFromField(b),$.datepicker._inDialog&&(a.value=""),$.datepicker._pos||($.datepicker._pos=$.datepicker._findPos(a),$.datepicker._pos[1]+=a.offsetHeight);var e=!1;$(a).parents().each(function(){return e|=$(this).css("position")=="fixed",!e}),e&&$.browser.opera&&($.datepicker._pos[0]-=document.documentElement.scrollLeft,$.datepicker._pos[1]-=document.documentElement.scrollTop);var f={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null,b.dpDiv.empty(),b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(b),f=$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.datepicker._inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",left:f.left+"px",top:f.top+"px"});if(!b.inline){var g=$.datepicker._get(b,"showAnim"),h=$.datepicker._get(b,"duration"),i=function(){var a=b.dpDiv.find("iframe.ui-datepicker-cover");if(!!a.length){var c=$.datepicker._getBorders(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepicker._datepickerShowing=!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datepicker._get(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i(),b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.datepicker._curInst=b}},_updateDatepicker:function(a){var b=this;b.maxRows=4;var c=$.datepicker._getBorders(a.dpDiv);instActive=a,a.dpDiv.empty().append(this._generateHTML(a));var d=a.dpDiv.find("iframe.ui-datepicker-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOverClass+" a").mouseover();var e=this._getNumberOfMonths(a),f=e[1],g=17;a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css("width",g*f+"em"),a.dpDiv[(e[0]!=1||e[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),a==$.datepicker._curInst&&$.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var h=a.yearshtml;setTimeout(function(){h===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml),h=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(a){return{thin:1,medium:2,thick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var d=a.dpDiv.outerWidth(),e=a.dpDiv.outerHeight(),f=a.input?a.input.outerWidth():0,g=a.input?a.input.outerHeight():0,h=document.documentElement.clientWidth+$(document).scrollLeft(),i=document.documentElement.clientHeight+$(document).scrollTop();return b.left-=this._get(a,"isRTL")?d-f:0,b.left-=c&&b.left==a.input.offset().left?$(document).scrollLeft():0,b.top-=c&&b.top==a.input.offset().top+g?$(document).scrollTop():0,b.left-=Math.min(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),b.top-=Math.min(b.top,b.top+e>i&&i>e?Math.abs(e+g):0),b},_findPos:function(a){var b=this._getInst(a),c=this._get(b,"isRTL");while(a&&(a.type=="hidden"||a.nodeType!=1||$.expr.filters.hidden(a)))a=a[c?"previousSibling":"nextSibling"];var d=$(a).offset();return[d.left,d.top]},_hideDatepicker:function(a){var b=this._curInst;if(!b||a&&b!=$.data(a,PROP_NAME))return;if(this._datepickerShowing){var c=this._get(b,"showAnim"),d=this._get(b,"duration"),e=function(){$.datepicker._tidyDialog(b)};$.effects&&$.effects[c]?b.dpDiv.hide(c,$.datepicker._get(b,"showOptions"),d,e):b.dpDiv[c=="slideDown"?"slideUp":c=="fadeIn"?"fadeOut":"hide"](c?d:null,e),c||e(),this._datepickerShowing=!1;var f=this._get(b,"onClose");f&&f.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),this._inDialog=!1}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(!$.datepicker._curInst)return;var b=$(a.target),c=$.datepicker._getInst(b[0]);(b[0].id!=$.datepicker._mainDivId&&b.parents("#"+$.datepicker._mainDivId).length==0&&!b.hasClass($.datepicker.markerClassName)&&!b.closest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowing&&(!$.datepicker._inDialog||!$.blockUI)||b.hasClass($.datepicker.markerClassName)&&$.datepicker._curInst!=c)&&$.datepicker._hideDatepicker()},_adjustDate:function(a,b,c){var d=$(a),e=this._getInst(d[0]);if(this._isDisabledDatepicker(d[0]))return;this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c),this._updateDatepicker(e)},_gotoToday:function(a){var b=$(a),c=this._getInst(b[0]);if(this._get(c,"gotoCurrent")&&c.currentDay)c.selectedDay=c.currentDay,c.drawMonth=c.selectedMonth=c.currentMonth,c.drawYear=c.selectedYear=c.currentYear;else{var d=new Date;c.selectedDay=d.getDate(),c.drawMonth=c.selectedMonth=d.getMonth(),c.drawYear=c.selectedYear=d.getFullYear()}this._notifyChange(c),this._adjustDate(b)},_selectMonthYear:function(a,b,c){var d=$(a),e=this._getInst(d[0]);e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10),this._notifyChange(e),this._adjustDate(d)},_selectDay:function(a,b,c,d){var e=$(a);if($(d).hasClass(this._unselectableClass)||this._isDisabledDatepicker(e[0]))return;var f=this._getInst(e[0]);f.selectedDay=f.currentDay=$("a",d).html(),f.selectedMonth=f.currentMonth=b,f.selectedYear=f.currentYear=c,this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))},_clearDate:function(a){var b=$(a),c=this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(a,b){var c=$(a),d=this._getInst(c[0]);b=b!=null?b:this._formatDate(d),d.input&&d.input.val(b),this._updateAlternate(d);var e=this._get(d,"onSelect");e?e.apply(d.input?d.input[0]:null,[b,d]):d.input&&d.input.trigger("change"),d.inline?this._updateDatepicker(d):(this._hideDatepicker(),this._lastInput=d.input[0],typeof d.input[0]!="object"&&d.input.focus(),this._lastInput=null)},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),d=this._getDate(a),e=this.formatDate(c,d,this._getFormatConfig(a));$(b).each(function(){$(this).val(e)})}},noWeekends:function(a){var b=a.getDay();return[b>0&&b<6,""]},iso8601Week:function(a){var b=new Date(a.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var d=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;d=typeof d!="string"?d:(new Date).getFullYear()%100+parseInt(d,10);var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,g=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,h=(c?c.monthNames:null)||this._defaults.monthNames,i=-1,j=-1,k=-1,l=-1,m=!1,n=function(b){var c=s+1<a.length&&a.charAt(s+1)==b;return c&&s++,c},o=function(a){var c=n(a),d=a=="@"?14:a=="!"?20:a=="y"&&c?4:a=="o"?3:2,e=new RegExp("^\\d{1,"+d+"}"),f=b.substring(r).match(e);if(!f)throw"Missing number at position "+r;return r+=f[0].length,parseInt(f[0],10)},p=function(a,c,d){var e=$.map(n(a)?d:c,function(a,b){return[[b,a]]}).sort(function(a,b){return-(a[1].length-b[1].length)}),f=-1;$.each(e,function(a,c){var d=c[1];if(b.substr(r,d.length).toLowerCase()==d.toLowerCase())return f=c[0],r+=d.length,!1});if(f!=-1)return f+1;throw"Unknown name at position "+r},q=function(){if(b.charAt(r)!=a.charAt(s))throw"Unexpected literal at position "+r;r++},r=0;for(var s=0;s<a.length;s++)if(m)a.charAt(s)=="'"&&!n("'")?m=!1:q();else switch(a.charAt(s)){case"d":k=o("d");break;case"D":p("D",e,f);break;case"o":l=o("o");break;case"m":j=o("m");break;case"M":j=p("M",g,h);break;case"y":i=o("y");break;case"@":var t=new Date(o("@"));i=t.getFullYear(),j=t.getMonth()+1,k=t.getDate();break;case"!":var t=new Date((o("!")-this._ticksTo1970)/1e4);i=t.getFullYear(),j=t.getMonth()+1,k=t.getDate();break;case"'":n("'")?q():m=!0;break;default:q()}if(r<b.length)throw"Extra/unparsed characters found in date: "+b.substring(r);i==-1?i=(new Date).getFullYear():i<100&&(i+=(new Date).getFullYear()-(new Date).getFullYear()%100+(i<=d?0:-100));if(l>-1){j=1,k=l;do{var u=this._getDaysInMonth(i,j-1);if(k<=u)break;j++,k-=u}while(!0)}var t=this._daylightSavingAdjust(new Date(i,j-1,k));if(t.getFullYear()!=i||t.getMonth()+1!=j||t.getDate()!=k)throw"Invalid date";return t},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,e=(c?c.dayNames:null)||this._defaults.dayNames,f=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,h=function(b){var c=m+1<a.length&&a.charAt(m+1)==b;return c&&m++,c},i=function(a,b,c){var d=""+b;if(h(a))while(d.length<c)d="0"+d;return d},j=function(a,b,c,d){return h(a)?d[b]:c[b]},k="",l=!1;if(b)for(var m=0;m<a.length;m++)if(l)a.charAt(m)=="'"&&!h("'")?l=!1:k+=a.charAt(m);else switch(a.charAt(m)){case"d":k+=i("d",b.getDate(),2);break;case"D":k+=j("D",b.getDay(),d,e);break;case"o":k+=i("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864e5),3);break;case"m":k+=i("m",b.getMonth()+1,2);break;case"M":k+=j("M",b.getMonth(),f,g);break;case"y":k+=h("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":k+=b.getTime();break;case"!":k+=b.getTime()*1e4+this._ticksTo1970;break;case"'":h("'")?k+="'":l=!0;break;default:k+=a.charAt(m)}return k},_possibleChars:function(a){var b="",c=!1,d=function(b){var c=e+1<a.length&&a.charAt(e+1)==b;return c&&e++,c};for(var e=0;e<a.length;e++)if(c)a.charAt(e)=="'"&&!d("'")?c=!1:b+=a.charAt(e);else switch(a.charAt(e)){case"d":case"m":case"y":case"@":b+="0123456789";break;case"D":case"M":return null;case"'":d("'")?b+="'":c=!0;break;default:b+=a.charAt(e)}return b},_get:function(a,b){return a.settings[b]!==undefined?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()==a.lastVal)return;var c=this._get(a,"dateFormat"),d=a.lastVal=a.input?a.input.val():null,e,f;e=f=this._getDefaultDate(a);var g=this._getFormatConfig(a);try{e=this.parseDate(c,d,g)||f}catch(h){this.log(h),d=b?"":d}a.selectedDay=e.getDate(),a.drawMonth=a.selectedMonth=e.getMonth(),a.drawYear=a.selectedYear=e.getFullYear(),a.currentDay=d?e.getDate():0,a.currentMonth=d?e.getMonth():0,a.currentYear=d?e.getFullYear():0,this._adjustInstDate(a)},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var d=function(a){var b=new Date;return b.setDate(b.getDate()+a),b},e=function(b){try{return $.datepicker.parseDate($.datepicker._get(a,"dateFormat"),b,$.datepicker._getFormatConfig(a))}catch(c){}var d=(b.toLowerCase().match(/^c/)?$.datepicker._getDate(a):null)||new Date,e=d.getFullYear(),f=d.getMonth(),g=d.getDate(),h=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,i=h.exec(b);while(i){switch(i[2]||"d"){case"d":case"D":g+=parseInt(i[1],10);break;case"w":case"W":g+=parseInt(i[1],10)*7;break;case"m":case"M":f+=parseInt(i[1],10),g=Math.min(g,$.datepicker._getDaysInMonth(e,f));break;case"y":case"Y":e+=parseInt(i[1],10),g=Math.min(g,$.datepicker._getDaysInMonth(e,f))}i=h.exec(b)}return new Date(e,f,g)},f=b==null||b===""?c:typeof b=="string"?e(b):typeof b=="number"?isNaN(b)?c:d(b):new Date(b.getTime());return f=f&&f.toString()=="Invalid Date"?c:f,f&&(f.setHours(0),f.setMinutes(0),f.setSeconds(0),f.setMilliseconds(0)),this._daylightSavingAdjust(f)},_daylightSavingAdjust:function(a){return a?(a.setHours(a.getHours()>12?a.getHours()+2:0),a):null},_setDate:function(a,b,c){var d=!b,e=a.selectedMonth,f=a.selectedYear,g=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=g.getDate(),a.drawMonth=a.selectedMonth=a.currentMonth=g.getMonth(),a.drawYear=a.selectedYear=a.currentYear=g.getFullYear(),(e!=a.selectedMonth||f!=a.selectedYear)&&!c&&this._notifyChange(a),this._adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:function(a){var b=!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return b},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),d=this._get(a,"showButtonPanel"),e=this._get(a,"hideIfNoPrevNext"),f=this._get(a,"navigationAsDateFormat"),g=this._getNumberOfMonths(a),h=this._get(a,"showCurrentAtPos"),i=this._get(a,"stepMonths"),j=g[0]!=1||g[1]!=1,k=this._daylightSavingAdjust(a.currentDay?new Date(a.currentYear,a.currentMonth,a.currentDay):new Date(9999,9,9)),l=this._getMinMaxDate(a,"min"),m=this._getMinMaxDate(a,"max"),n=a.drawMonth-h,o=a.drawYear;n<0&&(n+=12,o--);if(m){var p=this._daylightSavingAdjust(new Date(m.getFullYear(),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=l&&p<l?l:p;while(this._daylightSavingAdjust(new Date(o,n,1))>p)n--,n<0&&(n=11,o--)}a.drawMonth=n,a.drawYear=o;var q=this._get(a,"prevText");q=f?this.formatDate(q,this._daylightSavingAdjust(new Date(o,n-i,1)),this._getFormatConfig(a)):q;var r=this._canAdjustMonth(a,-1,o,n)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+a.id+"', -"+i+", 'M');\""+' title="'+q+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>":e?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+q+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>",s=this._get(a,"nextText");s=f?this.formatDate(s,this._daylightSavingAdjust(new Date(o,n+i,1)),this._getFormatConfig(a)):s;var t=this._canAdjustMonth(a,1,o,n)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+a.id+"', +"+i+", 'M');\""+' title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":e?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>",u=this._get(a,"currentText"),v=this._get(a,"gotoCurrent")&&a.currentDay?k:b;u=f?this.formatDate(u,v,this._getFormatConfig(a)):u;var w=a.inline?"":'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+dpuuid+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>",x=d?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?w:"")+(this._isInRange(a,v)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._gotoToday('#"+a.id+"');\""+">"+u+"</button>":"")+(c?"":w)+"</div>":"",y=parseInt(this._get(a,"firstDay"),10);y=isNaN(y)?0:y;var z=this._get(a,"showWeek"),A=this._get(a,"dayNames"),B=this._get(a,"dayNamesShort"),C=this._get(a,"dayNamesMin"),D=this._get(a,"monthNames"),E=this._get(a,"monthNamesShort"),F=this._get(a,"beforeShowDay"),G=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths"),I=this._get(a,"calculateWeek")||this.iso8601Week,J=this._getDefaultDate(a),K="";for(var L=0;L<g[0];L++){var M="";this.maxRows=4;for(var N=0;N<g[1];N++){var O=this._daylightSavingAdjust(new Date(o,n,a.selectedDay)),P=" ui-corner-all",Q="";if(j){Q+='<div class="ui-datepicker-group';if(g[1]>1)switch(N){case 0:Q+=" ui-datepicker-group-first",P=" ui-corner-"+(c?"right":"left");break;case g[1]-1:Q+=" ui-datepicker-group-last",P=" ui-corner-"+(c?"left":"right");break;default:Q+=" ui-datepicker-group-middle",P=""}Q+='">'}Q+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+P+'">'+(/all|left/.test(P)&&L==0?c?t:r:"")+(/all|right/.test(P)&&L==0?c?r:t:"")+this._generateMonthYearHeader(a,n,o,l,m,L>0||N>0,D,E)+'</div><table class="ui-datepicker-calendar"><thead>'+"<tr>";var R=z?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(var S=0;S<7;S++){var T=(S+y)%7;R+="<th"+((S+y+6)%7>=5?' class="ui-datepicker-week-end"':"")+">"+'<span title="'+A[T]+'">'+C[T]+"</span></th>"}Q+=R+"</tr></thead><tbody>";var U=this._getDaysInMonth(o,n);o==a.selectedYear&&n==a.selectedMonth&&(a.selectedDay=Math.min(a.selectedDay,U));var V=(this._getFirstDayOfMonth(o,n)-y+7)%7,W=Math.ceil((V+U)/7),X=j?this.maxRows>W?this.maxRows:W:W;this.maxRows=X;var Y=this._daylightSavingAdjust(new Date(o,n,1-V));for(var Z=0;Z<X;Z++){Q+="<tr>";var _=z?'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(Y)+"</td>":"";for(var S=0;S<7;S++){var ba=F?F.apply(a.input?a.input[0]:null,[Y]):[!0,""],bb=Y.getMonth()!=n,bc=bb&&!H||!ba[0]||l&&Y<l||m&&Y>m;_+='<td class="'+((S+y+6)%7>=5?" ui-datepicker-week-end":"")+(bb?" ui-datepicker-other-month":"")+(Y.getTime()==O.getTime()&&n==a.selectedMonth&&a._keyEvent||J.getTime()==Y.getTime()&&J.getTime()==O.getTime()?" "+this._dayOverClass:"")+(bc?" "+this._unselectableClass+" ui-state-disabled":"")+(bb&&!G?"":" "+ba[1]+(Y.getTime()==k.getTime()?" "+this._currentClass:"")+(Y.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!bb||G)&&ba[2]?' title="'+ba[2]+'"':"")+(bc?"":' onclick="DP_jQuery_'+dpuuid+".datepicker._selectDay('#"+a.id+"',"+Y.getMonth()+","+Y.getFullYear()+', this);return false;"')+">"+(bb&&!G?"&#xa0;":bc?'<span class="ui-state-default">'+Y.getDate()+"</span>":'<a class="ui-state-default'+(Y.getTime()==b.getTime()?" ui-state-highlight":"")+(Y.getTime()==k.getTime()?" ui-state-active":"")+(bb?" ui-priority-secondary":"")+'" href="#">'+Y.getDate()+"</a>")+"</td>",Y.setDate(Y.getDate()+1),Y=this._daylightSavingAdjust(Y)}Q+=_+"</tr>"}n++,n>11&&(n=0,o++),Q+="</tbody></table>"+(j?"</div>"+(g[0]>0&&N==g[1]-1?'<div class="ui-datepicker-row-break"></div>':""):""),M+=Q}K+=M}return K+=x+($.browser.msie&&parseInt($.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':""),a._keyEvent=!1,K},_generateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=this._get(a,"changeMonth"),j=this._get(a,"changeYear"),k=this._get(a,"showMonthAfterYear"),l='<div class="ui-datepicker-title">',m="";if(f||!i)m+='<span class="ui-datepicker-month">'+g[b]+"</span>";else{var n=d&&d.getFullYear()==c,o=e&&e.getFullYear()==c;m+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" "+">";for(var p=0;p<12;p++)(!n||p>=d.getMonth())&&(!o||p<=e.getMonth())&&(m+='<option value="'+p+'"'+(p==b?' selected="selected"':"")+">"+h[p]+"</option>");m+="</select>"}k||(l+=m+(f||!i||!j?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(f||!j)l+='<span class="ui-datepicker-year">'+c+"</span>";else{var q=this._get(a,"yearRange").split(":"),r=(new Date).getFullYear(),s=function(a){var b=a.match(/c[+-].*/)?c+parseInt(a.substring(1),10):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=s(q[0]),u=Math.max(t,s(q[1]||""));t=d?Math.max(t,d.getFullYear()):t,u=e?Math.min(u,e.getFullYear()):u,a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" "+">";for(;t<=u;t++)a.yearshtml+='<option value="'+t+'"'+(t==c?' selected="selected"':"")+">"+t+"</option>";a.yearshtml+="</select>",l+=a.yearshtml,a.yearshtml=null}}return l+=this._get(a,"yearSuffix"),k&&(l+=(f||!i||!j?"&#xa0;":"")+m),l+="</div>",l},_adjustInstDate:function(a,b,c){var d=a.drawYear+(c=="Y"?b:0),e=a.drawMonth+(c=="M"?b:0),f=Math.min(a.selectedDay,this._getDaysInMonth(d,e))+(c=="D"?b:0),g=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=g.getDate(),a.drawMonth=a.selectedMonth=g.getMonth(),a.drawYear=a.selectedYear=g.getFullYear(),(c=="M"||c=="Y")&&this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max"),e=c&&b<c?c:b;return e=d&&e>d?d:e,e},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=this._get(a,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){var e=this._getNumberOfMonths(a),f=this._daylightSavingAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));return b<0&&f.setDate(this._getDaysInMonth(f.getFullYear(),f.getMonth())),this._isInRange(a,f)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!d||b.getTime()<=d.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");return b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10),{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=a.selectedDay,a.currentMonth=a.selectedMonth,a.currentYear=a.selectedYear);var e=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfig(a))}}),$.fn.datepicker=function(a){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.initialized=!0);var b=Array.prototype.slice.call(arguments,1);return typeof a!="string"||a!="isDisabled"&&a!="getDate"&&a!="widget"?a=="option"&&arguments.length==2&&typeof arguments[1]=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b)):this.each(function(){typeof a=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)}):$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b))},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="1.8.21",window["DP_jQuery_"+dpuuid]=$})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.ui.progressbar.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this.oldValue=this._value(),this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove(),a.Widget.prototype.destroy.apply(this,arguments)},value:function(a){return a===b?this._value():(this._setOption("value",a),this)},_setOption:function(b,c){b==="value"&&(this.options.value=c,this._refreshValue(),this._value()===this.options.max&&this._trigger("complete")),a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;return typeof a!="number"&&(a=0),Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*this._value()/this.options.max},_refreshValue:function(){var a=this.value(),b=this._percentage();this.oldValue!==a&&(this.oldValue=a,this._trigger("change")),this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(b.toFixed(0)+"%"),this.element.attr("aria-valuenow",a)}}),a.extend(a.ui.progressbar,{version:"1.8.21"})})(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.effects.core.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+jQuery.effects||function(a,b){function c(b){var c;return b&&b.constructor==Array&&b.length==3?b:(c=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(b))?[parseInt(c[1],10),parseInt(c[2],10),parseInt(c[3],10)]:(c=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(b))?[parseFloat(c[1])*2.55,parseFloat(c[2])*2.55,parseFloat(c[3])*2.55]:(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(b))?[parseInt(c[1],16),parseInt(c[2],16),parseInt(c[3],16)]:(c=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(b))?[parseInt(c[1]+c[1],16),parseInt(c[2]+c[2],16),parseInt(c[3]+c[3],16)]:(c=/rgba\(0, 0, 0, 0\)/.exec(b))?e.transparent:e[a.trim(b).toLowerCase()]}function d(b,d){var e;do{e=a.curCSS(b,d);if(e!=""&&e!="transparent"||a.nodeName(b,"body"))break;d="backgroundColor"}while(b=b.parentNode);return c(e)}function h(){var a=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,b={},c,d;if(a&&a.length&&a[0]&&a[a[0]]){var e=a.length;while(e--)c=a[e],typeof a[c]=="string"&&(d=c.replace(/\-(\w)/g,function(a,b){return b.toUpperCase()}),b[d]=a[c])}else for(c in a)typeof a[c]=="string"&&(b[c]=a[c]);return b}function i(b){var c,d;for(c in b)d=b[c],(d==null||a.isFunction(d)||c in g||/scrollbar/.test(c)||!/color/i.test(c)&&isNaN(parseFloat(d)))&&delete b[c];return b}function j(a,b){var c={_:0},d;for(d in b)a[d]!=b[d]&&(c[d]=b[d]);return c}function k(b,c,d,e){typeof b=="object"&&(e=c,d=null,c=b,b=c.effect),a.isFunction(c)&&(e=c,d=null,c={});if(typeof c=="number"||a.fx.speeds[c])e=d,d=c,c={};return a.isFunction(d)&&(e=d,d=null),c=c||{},d=d||c.duration,d=a.fx.off?0:typeof d=="number"?d:d in a.fx.speeds?a.fx.speeds[d]:a.fx.speeds._default,e=e||c.complete,[b,c,d,e]}function l(b){return!b||typeof b=="number"||a.fx.speeds[b]?!0:typeof b=="string"&&!a.effects[b]?!0:!1}a.effects={},a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","borderColor","color","outlineColor"],function(b,e){a.fx.step[e]=function(a){a.colorInit||(a.start=d(a.elem,e),a.end=c(a.end),a.colorInit=!0),a.elem.style[e]="rgb("+Math.max(Math.min(parseInt(a.pos*(a.end[0]-a.start[0])+a.start[0],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[1]-a.start[1])+a.start[1],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[2]-a.start[2])+a.start[2],10),255),0)+")"}});var e={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},f=["add","remove","toggle"],g={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(b,c,d,e){return a.isFunction(d)&&(e=d,d=null),this.queue(function(){var g=a(this),k=g.attr("style")||" ",l=i(h.call(this)),m,n=g.attr("class")||"";a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),m=i(h.call(this)),g.attr("class",n),g.animate(j(l,m),{queue:!1,duration:c,easing:d,complete:function(){a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),typeof g.attr("style")=="object"?(g.attr("style").cssText="",g.attr("style").cssText=k):g.attr("style",k),e&&e.apply(this,arguments),a.dequeue(this)}})})},a.fn.extend({_addClass:a.fn.addClass,addClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{add:b},c,d,e]):this._addClass(b)},_removeClass:a.fn.removeClass,removeClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{remove:b},c,d,e]):this._removeClass(b)},_toggleClass:a.fn.toggleClass,toggleClass:function(c,d,e,f,g){return typeof d=="boolean"||d===b?e?a.effects.animateClass.apply(this,[d?{add:c}:{remove:c},e,f,g]):this._toggleClass(c,d):a.effects.animateClass.apply(this,[{toggle:c},d,e,f])},switchClass:function(b,c,d,e,f){return a.effects.animateClass.apply(this,[{add:c,remove:b},d,e,f])}}),a.extend(a.effects,{version:"1.8.21",save:function(a,b){for(var c=0;c<b.length;c++)b[c]!==null&&a.data("ec.storage."+b[c],a[0].style[b[c]])},restore:function(a,b){for(var c=0;c<b.length;c++)b[c]!==null&&a.css(b[c],a.data("ec.storage."+b[c]))},setMode:function(a,b){return b=="toggle"&&(b=a.is(":hidden")?"show":"hide"),b},getBaseline:function(a,b){var c,d;switch(a[0]){case"top":c=0;break;case"middle":c=.5;break;case"bottom":c=1;break;default:c=a[0]/b.height}switch(a[1]){case"left":d=0;break;case"center":d=.5;break;case"right":d=1;break;default:d=a[1]/b.width}return{x:d,y:c}},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent();var c={width:b.outerWidth(!0),height:b.outerHeight(!0),"float":b.css("float")},d=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e=document.activeElement;try{e.id}catch(f){e=document.body}return b.wrap(d),(b[0]===e||a.contains(b[0],e))&&a(e).focus(),d=b.parent(),b.css("position")=="static"?(d.css({position:"relative"}),b.css({position:"relative"})):(a.extend(c,{position:b.css("position"),zIndex:b.css("z-index")}),a.each(["top","left","bottom","right"],function(a,d){c[d]=b.css(d),isNaN(parseInt(c[d],10))&&(c[d]="auto")}),b.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),d.css(c).show()},removeWrapper:function(b){var c,d=document.activeElement;return b.parent().is(".ui-effects-wrapper")?(c=b.parent().replaceWith(b),(b[0]===d||a.contains(b[0],d))&&a(d).focus(),c):b},setTransition:function(b,c,d,e){return e=e||{},a.each(c,function(a,c){var f=b.cssUnit(c);f[0]>0&&(e[c]=f[0]*d+f[1])}),e}}),a.fn.extend({effect:function(b,c,d,e){var f=k.apply(this,arguments),g={options:f[1],duration:f[2],callback:f[3]},h=g.options.mode,i=a.effects[b];return a.fx.off||!i?h?this[h](g.duration,g.callback):this.each(function(){g.callback&&g.callback.call(this)}):i.call(this,g)},_show:a.fn.show,show:function(a){if(l(a))return this._show.apply(this,arguments);var b=k.apply(this,arguments);return b[1].mode="show",this.effect.apply(this,b)},_hide:a.fn.hide,hide:function(a){if(l(a))return this._hide.apply(this,arguments);var b=k.apply(this,arguments);return b[1].mode="hide",this.effect.apply(this,b)},__toggle:a.fn.toggle,toggle:function(b){if(l(b)||typeof b=="boolean"||a.isFunction(b))return this.__toggle.apply(this,arguments);var c=k.apply(this,arguments);return c[1].mode="toggle",this.effect.apply(this,c)},cssUnit:function(b){var c=this.css(b),d=[];return a.each(["em","px","%","pt"],function(a,b){c.indexOf(b)>0&&(d=[parseFloat(c),b])}),d}}),a.easing.jswing=a.easing.swing,a.extend(a.easing,{def:"easeOutQuad",swing:function(b,c,d,e,f){return a.easing[a.easing.def](b,c,d,e,f)},easeInQuad:function(a,b,c,d,e){return d*(b/=e)*b+c},easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c},easeInOutQuad:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b+c:-d/2*(--b*(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return d*(b/=e)*b*b+c},easeOutCubic:function(a,b,c,d,e){return d*((b=b/e-1)*b*b+1)+c},easeInOutCubic:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b+c:d/2*((b-=2)*b*b+2)+c},easeInQuart:function(a,b,c,d,e){return d*(b/=e)*b*b*b+c},easeOutQuart:function(a,b,c,d,e){return-d*((b=b/e-1)*b*b*b-1)+c},easeInOutQuart:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b+c:-d/2*((b-=2)*b*b*b-2)+c},easeInQuint:function(a,b,c,d,e){return d*(b/=e)*b*b*b*b+c},easeOutQuint:function(a,b,c,d,e){return d*((b=b/e-1)*b*b*b*b+1)+c},easeInOutQuint:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b*b+c:d/2*((b-=2)*b*b*b*b+2)+c},easeInSine:function(a,b,c,d,e){return-d*Math.cos(b/e*(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return d*Math.sin(b/e*(Math.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2*(Math.cos(Math.PI*b/e)-1)+c},easeInExpo:function(a,b,c,d,e){return b==0?c:d*Math.pow(2,10*(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b==e?c+d:d*(-Math.pow(2,-10*b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){return b==0?c:b==e?c+d:(b/=e/2)<1?d/2*Math.pow(2,10*(b-1))+c:d/2*(-Math.pow(2,-10*--b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d*(Math.sqrt(1-(b/=e)*b)-1)+c},easeOutCirc:function(a,b,c,d,e){return d*Math.sqrt(1-(b=b/e-1)*b)+c},easeInOutCirc:function(a,b,c,d,e){return(b/=e/2)<1?-d/2*(Math.sqrt(1-b*b)-1)+c:d/2*(Math.sqrt(1-(b-=2)*b)+1)+c},easeInElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e)==1)return c+d;g||(g=e*.3);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g))+c},easeOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e)==1)return c+d;g||(g=e*.3);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*b)*Math.sin((b*e-f)*2*Math.PI/g)+d+c},easeInOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e/2)==2)return c+d;g||(g=e*.3*1.5);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return b<1?-0.5*h*Math.pow(2,10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g)+c:h*Math.pow(2,-10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g)*.5+d+c},easeInBack:function(a,c,d,e,f,g){return g==b&&(g=1.70158),e*(c/=f)*c*((g+1)*c-g)+d},easeOutBack:function(a,c,d,e,f,g){return g==b&&(g=1.70158),e*((c=c/f-1)*c*((g+1)*c+g)+1)+d},easeInOutBack:function(a,c,d,e,f,g){return g==b&&(g=1.70158),(c/=f/2)<1?e/2*c*c*(((g*=1.525)+1)*c-g)+d:e/2*((c-=2)*c*(((g*=1.525)+1)*c+g)+2)+d},easeInBounce:function(b,c,d,e,f){return e-a.easing.easeOutBounce(b,f-c,0,e,f)+d},easeOutBounce:function(a,b,c,d,e){return(b/=e)<1/2.75?d*7.5625*b*b+c:b<2/2.75?d*(7.5625*(b-=1.5/2.75)*b+.75)+c:b<2.5/2.75?d*(7.5625*(b-=2.25/2.75)*b+.9375)+c:d*(7.5625*(b-=2.625/2.75)*b+.984375)+c},easeInOutBounce:function(b,c,d,e,f){return c<f/2?a.easing.easeInBounce(b,c*2,0,e,f)*.5+d:a.easing.easeOutBounce(b,c*2-f,0,e,f)*.5+e*.5+d}})}(jQuery);;/*! jQuery UI - v1.8.21 - 2012-06-05
+* https://github.com/jquery/jquery-ui
+* Includes: jquery.effects.highlight.js
+* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
+(function(a,b){a.effects.highlight=function(b){return this.queue(function(){var c=a(this),d=["backgroundImage","backgroundColor","opacity"],e=a.effects.setMode(c,b.options.mode||"show"),f={backgroundColor:c.css("backgroundColor")};e=="hide"&&(f.opacity=0),a.effects.save(c,d),c.show().css({backgroundImage:"none",backgroundColor:b.options.color||"#ffff99"}).animate(f,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),e=="show"&&!a.support.opacity&&this.style.removeAttribute("filter"),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);;
\ No newline at end of file

From e0f95f92f796a7a8cfa3b3218d2fb570b6b94419 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Wed, 11 Jul 2012 17:12:46 +1200
Subject: [PATCH 17/30] Move Requirements config into a config file #338

---
 application/config/requirements.php    | 31 ++++++++++++++++++++++++++
 application/libraries/Requirements.php |  9 ++++++++
 application/libraries/Themes.php       |  3 ---
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 application/config/requirements.php

diff --git a/application/config/requirements.php b/application/config/requirements.php
new file mode 100644
index 0000000000..52c04321b0
--- /dev/null
+++ b/application/config/requirements.php
@@ -0,0 +1,31 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+/**
+* REQUIREMENTS CONFIGURATION
+*/
+
+/**
+ * Do we want requirements to suffix onto the requirement link
+ * tags for caching or is it disabled.
+ * */
+$config['suffix_requirements'] = TRUE;
+
+/**
+ * Enable combining of css/javascript files.
+ **/
+$config['combined_files_enabled'] = TRUE;
+
+/**
+ * Put all javascript includes at the bottom of the template
+ * before the closing <body> tag instead of the <head> tag.
+ * This means script downloads won't block other HTTP-requests,
+ * which can be a performance improvement.
+ * @see Requirements_Backend::$write_js_to_body for details
+ **/
+$config['write_js_to_body'] = FALSE;
+
+/**
+ * Using the JSMin library to minify any
+ * javascript file passed to {@link combine_files()}.
+ **/
+$config['combine_js_with_jsmin'] = TRUE;
\ No newline at end of file
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index b2b39f7eb7..a2b732f64c 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -458,6 +458,15 @@ class Requirements_Backend {
 	 */
 	public $write_js_to_body = true;
 
+	public function __construct()
+	{
+		// Set up defaults from config file
+		$this->combine_js_with_jsmin = Kohana::config('requirements.combine_js_with_jsmin');
+		$this->set_suffix_requirements(Kohana::config('requirements.suffix_requirements'));
+		$this->set_combined_files_enabled(Kohana::config('requirements.combined_files_enabled'));
+		$this->set_write_js_to_body(Kohana::config('requirements.write_js_to_body'));
+	}
+
 	function set_combined_files_enabled($enable) {
 		$this->combined_files_enabled = (bool) $enable;
 	}
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 2ca014fd10..a8ba4760f7 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -83,9 +83,6 @@ public function admin_header_block()
 	 */
 	public function requirements()
 	{
-		Requirements::clear();
-		Requirements::set_write_js_to_body(FALSE);
-		
 		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
 		
 		Requirements::js("media/js/jquery");

From 1cc5bfe1f14d48ffd3f5aae26f24f1542b93d9a9 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 26 Oct 2012 20:48:43 +1300
Subject: [PATCH 18/30] Move admin ie CSS in to media/css/ie6.css #550

Conflicts:

	application/views/admin/layout.php
---
 application/libraries/Themes.php | 2 +-
 media/css/admin/ie6.css          | 3 ---
 media/css/ie6.css                | 6 +++++-
 3 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 media/css/admin/ie6.css

diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index a8ba4760f7..7b11f8f512 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -281,7 +281,7 @@ public function admin_requirements()
 		Requirements::js('media/js/jquery.base64');
 		Requirements::js('media/js/admin');
 		Requirements::css('media/css/admin/all');
-		Requirements::ieCSS("lt IE 7", 'media/css/admin/ie6');
+		Requirements::ieCSS("lt IE 7", 'media/css/ie6');
 	}
 	
 	public function frontend_requirements()
diff --git a/media/css/admin/ie6.css b/media/css/admin/ie6.css
deleted file mode 100644
index 164620a57e..0000000000
--- a/media/css/admin/ie6.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body{
-	width:expression(document.documentElement.clientWidth < 960 ? "960px" : "auto");
-}
diff --git a/media/css/ie6.css b/media/css/ie6.css
index 7974ce913f..de49ce64ad 100644
--- a/media/css/ie6.css
+++ b/media/css/ie6.css
@@ -1,6 +1,10 @@
+body{
+	width:expression(document.documentElement.clientWidth < 960 ? "960px" : "auto");
+}
+
 #footer .footer-info ul li {
 	background-image: expression( (this===this.parentNode.childNodes[0]) ? "none" : "auto");
 	padding-left: expression( (this===this.parentNode.childNodes[0]) ? "0" : "auto");
 }
 .small-block .block-bg ul li,
-.incident-name ul li {border: expression( (this===this.parentNode.childNodes[0]) ? "none" : "auto");}
\ No newline at end of file
+.incident-name ul li {border: expression( (this===this.parentNode.childNodes[0]) ? "none" : "auto");}

From 0eff814e0a330f3829e1a5eb7bc032cd54c4ea05 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 23 Nov 2012 12:40:38 +1300
Subject: [PATCH 19/30] More/Better theme requirements Events

* Pass themes object to themes_add_requirements action
* Add event for adding requirements before admin/frontend stuff
---
 application/libraries/Themes.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 7b11f8f512..d67e4ed8d5 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -255,6 +255,8 @@ public function requirements()
 				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/jquery.bgiframe.min', TRUE).'<![endif]-->','jquery.bgiframe.min');
 		}
 		
+		Event::run('ushahidi_action.themes_add_requirements_pre_theme', $this);
+		
 		if ($this->admin)
 		{
 			$this->admin_requirements();
@@ -271,7 +273,7 @@ public function requirements()
 			Requirements::customJS($this->js,'pagejs');
 		}
 		
-		Event::run('ushahidi_action.themes_add_requirements');
+		Event::run('ushahidi_action.themes_add_requirements', $this);
 	}
 
 	public function admin_requirements()

From 346fa82f8cf6e5833711546d7979a3794e85ef79 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 23 Nov 2012 12:41:14 +1300
Subject: [PATCH 20/30] Move hook/register_themes code into Themes library

---
 application/hooks/register_themes.php  | 132 +----------------------
 application/libraries/Requirements.php |   2 +-
 application/libraries/Themes.php       | 141 ++++++++++++++++++++++++-
 3 files changed, 141 insertions(+), 134 deletions(-)

diff --git a/application/hooks/register_themes.php b/application/hooks/register_themes.php
index 5623799eb3..f2373ac0bc 100755
--- a/application/hooks/register_themes.php
+++ b/application/hooks/register_themes.php
@@ -29,137 +29,7 @@ public function __construct()
 		// Hook into routing
 		if (Kohana::config('config.installer_check') == FALSE OR file_exists(DOCROOT."application/config/database.php"))
 		{
-			Event::add('system.ready', array($this, 'register'));
-		}
-	}
-
-	/**
-	 * Loads ushahidi themes
-	 */
-	public function register()
-	{
-		$this->themes = addon::get_addons('theme', TRUE);
-		
-		$theme = Kohana::config("settings.site_style");
-		$theme = empty($theme) ? 'default' : $theme;
-		$this->_load_theme($theme);
-		
-		// Save theme CSS and JS for inclusion later
-		Kohana::config_set('settings.site_style_js', $this->theme_js);
-		Kohana::config_set('settings.site_style_css', $this->theme_css);
-		// Save loaded themes for use by Requirements library
-		Kohana::config_set('settings.site_styles_loaded', $this->loaded_themes);
-	}
-	
-	/**
-	 * Load theme
-	 * Loads theme into modules, includes its hooks and recursively loads parent themes
-	 * @param string $theme theme name/directory
-	 **/
-	private function _load_theme($theme)
-	{
-		// Record loading this theme, so we can avoid dependency loops
-		$this->loaded_themes[] = $theme;
-		
-		// Get meta data to check the base theme
-		$meta = $this->themes[$theme];
-		
-		// If base theme is set, the base theme exists, and we haven't loaded it yet
-		// Load the base theme
-		if (! empty($meta['Base Theme'])
-				AND isset($this->themes[$meta['Base Theme']])
-				AND ! in_array($meta['Base Theme'], $this->loaded_themes)
-			)
-		{
-			$this->_load_theme($meta['Base Theme']);
-		}
-		
-		// Add theme to modules
-		$theme_base = THEMEPATH . $theme;
-		Kohana::config_set('core.modules', array_merge(array($theme_base), Kohana::config("core.modules")));
-
-		// We need to manually include the hook file for each theme
-		if (file_exists($theme_base.'/hooks'))
-		{
-			$d = dir($theme_base.'/hooks'); // Load all the hooks
-			while (($entry = $d->read()) !== FALSE)
-			{
-				if ($entry[0] != '.')
-				{
-					include $theme_base.'/hooks/'.$entry;
-				}
-			}
-		}
-		
-		$this->load_theme_css($theme);
-		$this->load_theme_js($theme);
-	}
-
-	/*
-	 * Find theme css and store for inclusion later
-	 */
-	private function load_theme_css($theme)
-	{
-		$meta = $this->themes[$theme];
-		// Add special cases for old themes
-		if (empty($meta['CSS']))
-		{
-			$meta['CSS'] = array();
-			$meta['CSS'][] = 'base';
-			$meta['CSS'][] = 'style';
-			$meta['CSS'][] = '_default';
-			$meta['CSS'][] = $theme;
-		}
-		else
-		{
-			$meta['CSS'] = explode(',', $meta['CSS']);
-			$meta['CSS'] = array_map('trim',$meta['CSS']);
-		}
-		
-		// Add specified theme stylesheets
-		foreach ($meta['CSS'] as $css)
-		{
-			if (file_exists(THEMEPATH."$theme/css/$css.css"))
-				$this->theme_css[$css] = "themes/$theme/css/$css";
-		}
-		
-		// Check for overrides of already added stylesheets
-		foreach ($this->theme_css as $css => $path)
-		{
-			if (file_exists(THEMEPATH."$theme/css/$css.css"))
-				$this->theme_css[$css] = "themes/$theme/css/$css";
-		}
-	}
-
-	/*
-	 * Find theme css and store for inclusion later
-	 */
-	private function load_theme_js($theme)
-	{
-		$meta = $this->themes[$theme];
-		// Add special cases for old themes
-		if (empty($meta['JS']))
-		{
-			$meta['JS'] = array();
-		}
-		else
-		{
-			$meta['JS'] = explode(',', $meta['JS']);
-			$meta['JS'] = array_map('trim',$meta['JS']);
-		}
-		
-		// Add specified theme js
-		foreach ($meta['JS'] as $js)
-		{
-			if (file_exists(THEMEPATH."$theme/js/$js.js"))
-				$this->theme_js[$js] = "themes/$theme/js/$js";
-		}
-		
-		// Check for overrides of already added js
-		foreach ($this->theme_css as $js => $path)
-		{
-			if (file_exists(THEMEPATH."$theme/js/$js.js"))
-				$this->theme_js[$js] = "themes/$theme/js/$js";
+			Event::add('system.ready', array('Themes', 'register_theme'));
 		}
 	}
 }
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index a2b732f64c..ee6ccbc223 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -1065,7 +1065,7 @@ public function ieThemedCSS($version, $name, $module = null, $media = null) {
 	private function themedCSSPath($name, $module = null)
 	{
 		// try to include from a loaded theme
-		foreach (Kohana::config("settings.site_styles_loaded") as $theme)
+		foreach (Themes::loaded_themes() as $theme)
 		{
 			$path  = THEMEPATH . "$theme/css/$name.css";
 			if (file_exists($path)) {
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index d67e4ed8d5..873e759d29 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -295,13 +295,13 @@ public function frontend_requirements()
 		}
 		
 		// Theme CSS
-		foreach(Kohana::config('settings.site_style_css') as $css)
+		foreach(self::$theme_css as $css)
 		{
 			Requirements::css($css);
 		}
 		
 		// Theme JS
-		foreach(Kohana::config('settings.site_style_js') as $js)
+		foreach(self::$theme_js as $js)
 		{
 			Requirements::js($js);
 		}
@@ -483,4 +483,141 @@ public function ushahidi_stats_js()
 		}
 		return '';
 	}
+	
+	/* Static functions for theme loading */
+	
+	private static $themes = array();
+	private static $loaded_themes = array();
+	private static $theme_js = array();
+	private static $theme_css = array();
+	
+
+	/**
+	 * Loads ushahidi themes
+	 */
+	public static function register_theme()
+	{
+		self::$themes = addon::get_addons('theme', TRUE);
+		
+		$theme = Kohana::config("settings.site_style");
+		$theme = empty($theme) ? 'default' : $theme;
+		self::load_theme($theme);
+	}
+	
+	/**
+	 * Load theme
+	 * Loads theme into modules, includes its hooks and recursively loads parent themes
+	 * @param string $theme theme name/directory
+	 **/
+	public static function load_theme($theme)
+	{
+		// Record loading this theme, so we can avoid dependency loops
+		self::$loaded_themes[] = $theme;
+		
+		// Get meta data to check the base theme
+		$meta = self::$themes[$theme];
+		
+		// If base theme is set, the base theme exists, and we haven't loaded it yet
+		// Load the base theme
+		if (! empty($meta['Base Theme'])
+				AND isset(self::$themes[$meta['Base Theme']])
+				AND ! in_array($meta['Base Theme'], self::$loaded_themes)
+			)
+		{
+			self::load_theme($meta['Base Theme']);
+		}
+		
+		// Add theme to modules
+		$theme_base = THEMEPATH . $theme;
+		Kohana::config_set('core.modules', array_merge(array($theme_base), Kohana::config("core.modules")));
+
+		// We need to manually include the hook file for each theme
+		if (file_exists($theme_base.'/hooks'))
+		{
+			$d = dir($theme_base.'/hooks'); // Load all the hooks
+			while (($entry = $d->read()) !== FALSE)
+			{
+				if ($entry[0] != '.')
+				{
+					include $theme_base.'/hooks/'.$entry;
+				}
+			}
+		}
+		
+		self::load_theme_css($theme);
+		self::load_theme_js($theme);
+	}
+
+	/*
+	 * Find theme css and store for inclusion later
+	 */
+	private static function load_theme_css($theme)
+	{
+		$meta = self::$themes[$theme];
+		// Add special cases for old themes
+		if (empty($meta['CSS']))
+		{
+			$meta['CSS'] = array();
+			$meta['CSS'][] = 'base';
+			$meta['CSS'][] = 'style';
+			$meta['CSS'][] = '_default';
+			$meta['CSS'][] = $theme;
+		}
+		else
+		{
+			$meta['CSS'] = explode(',', $meta['CSS']);
+			$meta['CSS'] = array_map('trim',$meta['CSS']);
+		}
+		
+		// Add specified theme stylesheets
+		foreach ($meta['CSS'] as $css)
+		{
+			if (file_exists(THEMEPATH."$theme/css/$css.css"))
+				self::$theme_css[$css] = "themes/$theme/css/$css";
+		}
+		
+		// Check for overrides of already added stylesheets
+		foreach (self::$theme_css as $css => $path)
+		{
+			if (file_exists(THEMEPATH."$theme/css/$css.css"))
+				self::$theme_css[$css] = "themes/$theme/css/$css";
+		}
+	}
+
+	/*
+	 * Find theme css and store for inclusion later
+	 */
+	private static function load_theme_js($theme)
+	{
+		$meta = self::$themes[$theme];
+		// Add special cases for old themes
+		if (empty($meta['JS']))
+		{
+			$meta['JS'] = array();
+		}
+		else
+		{
+			$meta['JS'] = explode(',', $meta['JS']);
+			$meta['JS'] = array_map('trim',$meta['JS']);
+		}
+		
+		// Add specified theme js
+		foreach ($meta['JS'] as $js)
+		{
+			if (file_exists(THEMEPATH."$theme/js/$js.js"))
+				self::$theme_js[$js] = "themes/$theme/js/$js";
+		}
+		
+		// Check for overrides of already added js
+		foreach (self::$theme_css as $js => $path)
+		{
+			if (file_exists(THEMEPATH."$theme/js/$js.js"))
+				self::$theme_js[$js] = "themes/$theme/js/$js";
+		}
+	}
+	
+	public static function loaded_themes()
+	{
+		return self::$loaded_themes;
+	}
 }

From cfb5dcfe2b9975fb9d61807496cbac314d3d2c81 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Mon, 3 Dec 2012 15:59:10 +1300
Subject: [PATCH 21/30] Combine header_block() and admin_header_block()

---
 application/controllers/admin.php  |  2 +-
 application/libraries/Themes.php   | 18 +++++++++++-------
 application/views/admin/layout.php |  3 ---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/application/controllers/admin.php b/application/controllers/admin.php
index 98e5d1aa03..cd5d87b1d1 100644
--- a/application/controllers/admin.php
+++ b/application/controllers/admin.php
@@ -230,7 +230,7 @@ private function _new_or_not($release_version=NULL, $version_ushahidi=NULL)
 	public function _pre_render()
 	{
 		$this->themes->requirements();
-		$this->template->header_block = $this->themes->admin_header_block();
+		$this->template->header_block = $this->themes->header_block();
 		$this->template->footer_block = $this->themes->footer_block();
 	}
 
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 873e759d29..207504cc31 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -59,9 +59,17 @@ public function header_block()
 	{
 		// For backward compatibility render Requirements here rather than in the view
 		$content = Requirements::render('head');
+		
 		// Filter::header_block - Modify Header Block
-		Event::run('ushahidi_filter.header_block', $content);
-
+		if ($this->admin)
+		{
+			Event::run('ushahidi_filter.admin_header_block', $content);
+		}
+		elseif ($this->frontend)
+		{
+			Event::run('ushahidi_filter.header_block', $content);
+		}
+		
 		return $content;
 	}
 
@@ -71,11 +79,7 @@ public function header_block()
 	*/
 	public function admin_header_block()
 	{
-		$content = '';
-		// Filter::admin_header_block - Modify Admin Header Block
-		Event::run('ushahidi_filter.admin_header_block', $content);
-
-		return $content;
+		$this->header_block();
 	}
 
 	/**
diff --git a/application/views/admin/layout.php b/application/views/admin/layout.php
index 88fddcafd6..0e9de98455 100644
--- a/application/views/admin/layout.php
+++ b/application/views/admin/layout.php
@@ -28,9 +28,6 @@
 		<?php endif; ?>
 	</script>
 
-	<?php // Render CSS and Javascript Files
-	echo Requirements::render('head'); ?>
-
 	<?php echo $header_block; ?>
 </head>
 <body>

From d453e7c4806781f49a0f9eb0473f289061bfa767 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 23 Nov 2012 12:40:18 +1300
Subject: [PATCH 22/30] Strip back Requirements library - remove combined files
 functions

* Give all CSS/JS uniquenessIDs, based on filename if not supplied
* Require uniquenessID on custom CSS/JS/HeadTag
* Handle handle write_js_to_body option in Themes library not
  Requirements
* Give themedCSS a better uniqueid
* Split out Render by type instead of location
* Remove combined files code - rewrite later
* Remove auto js/css extension adding magic
* Add notice for missing JS/CSS files
---
 application/config/requirements.php    |   3 +-
 application/helpers/plugin.php         |  10 +-
 application/libraries/Requirements.php | 554 +++++--------------------
 application/libraries/Themes.php       | 114 ++---
 4 files changed, 184 insertions(+), 497 deletions(-)

diff --git a/application/config/requirements.php b/application/config/requirements.php
index 52c04321b0..d8b50de5b2 100644
--- a/application/config/requirements.php
+++ b/application/config/requirements.php
@@ -5,8 +5,7 @@
 */
 
 /**
- * Do we want requirements to suffix onto the requirement link
- * tags for caching or is it disabled.
+ * Do we want requirements to suffix modification time onto file names
  * */
 $config['suffix_requirements'] = TRUE;
 
diff --git a/application/helpers/plugin.php b/application/helpers/plugin.php
index 897046f63d..f94f8a3654 100644
--- a/application/helpers/plugin.php
+++ b/application/helpers/plugin.php
@@ -26,12 +26,12 @@ public static function add_javascript($javascripts = array())
 		{
 			foreach($javascripts as $javascript)
 			{
-				Requirements::js('plugins/'.$javascript);
+				Requirements::js('plugins/'.$javascript.'.js');
 			}
 		}
 		else
 		{
-			Requirements::js('plugins/'.$javascripts);
+			Requirements::js('plugins/'.$javascripts.'.js');
 		}
 	}
 	
@@ -45,7 +45,7 @@ public static function remove_javascript($javascripts = array())
 	{
 		foreach ($javascripts as $javascript)
 		{
-			Requirements::block('plugins/'.$javascripts);
+			Requirements::block('plugins/'.$javascripts.'.js');
 		}
 	}
 	
@@ -61,12 +61,12 @@ public static function add_stylesheet($stylesheets = array())
 		{
 			foreach($stylesheets as $stylesheet)
 			{
-				Requirements::css('plugins/'.$stylesheet);
+				Requirements::css('plugins/'.$stylesheet.'.css');
 			}
 		}
 		else
 		{
-			Requirements::css('plugins/'.$stylesheets);
+			Requirements::css('plugins/'.$stylesheets.'.css');
 		}
 	}
 	
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index ee6ccbc223..05c4fd1f56 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -30,30 +30,6 @@
  * @license	   https://github.com/silverstripe/sapphire Modified BSD License
  */
 class Requirements {
-	
-	/**
-	 * Enable combining of css/javascript files.
-	 * @param boolean $enable
-	 */
-	public static function set_combined_files_enabled($enable) {
-		self::backend()->set_combined_files_enabled($enable);
-	}
-
-	/**
-	 * Checks whether combining of css/javascript files is enabled.
-	 * @return boolean
-	 */
-	public static function get_combined_files_enabled() {
-	  return self::backend()->get_combined_files_enabled();
-	}
-
-	/**
-	 * Set the relative folder e.g. "assets" for where to store combined files
-	 * @param string $folder Path to folder
-	 */
-	public static function set_combined_files_folder($folder) {
-		self::backend()->setCombinedFilesFolder($folder);
-	}
 
 	/**
 	 * Set whether we want to suffix requirements with the time / 
@@ -103,8 +79,8 @@ public static function set_backend(Requirements_Backend $backend) {
 	 * See {@link Requirements_Backend::javascript()} for more info
 	 * 
 	 */
-	static function js($file) {
-		self::backend()->js($file);
+	static function js($file, $uniquenessID = null) {
+		self::backend()->js($file, $uniquenessID);
 	}
 	
 	/**
@@ -114,7 +90,7 @@ static function js($file) {
 	 * @param script The script content
 	 * @param uniquenessID Use this to ensure that pieces of code only get added once.
 	 */
-	static function customJS($script, $uniquenessID = null) {
+	static function customJS($script, $uniquenessID) {
 		self::backend()->customJS($script, $uniquenessID);
 	}
 
@@ -126,7 +102,7 @@ static function customJS($script, $uniquenessID = null) {
 	 * @param string $script CSS selectors as a string (without <style> tag enclosing selectors).
 	 * @param int $uniquenessID Group CSS by a unique ID as to avoid duplicate custom CSS in header
 	 */
-	static function customCSS($script, $uniquenessID = null) {
+	static function customCSS($script, $uniquenessID, $media = null) {
 		self::backend()->customCSS($script, $uniquenessID);
 	}
 	
@@ -137,7 +113,7 @@ static function customCSS($script, $uniquenessID = null) {
 	 * @param string $html
 	 * @param string $uniquenessID
 	 */
-	static function customHeadTags($html, $uniquenessID = null) {
+	static function customHeadTags($html, $uniquenessID) {
 		self::backend()->customHeadTags($html, $uniquenessID);
 	}
 	
@@ -149,8 +125,8 @@ static function customHeadTags($html, $uniquenessID = null) {
 	 * @param $media String Comma-separated list of media-types (e.g. "screen,projector") 
 	 * @see http://www.w3.org/TR/REC-CSS2/media.html
 	 */
-	static function css($file, $media = null) {
-		self::backend()->css($file, $media);
+	static function css($file, $uniquenessID = null, $media = null) {
+		self::backend()->css($file, $uniquenessID, $media);
 	}
 	
 	/**
@@ -250,70 +226,11 @@ static function restore() {
 	 * Render the appropriate include tags for the registered requirements. 
 	 * See {@link Requirements_Backend::render()} for more information.
 	 * 
-	 * @param string $for where is the html going? accepts values 'head' or 'body'
+	 * @param string $type which requirements to render? accepts values 'all' 'css' 'js' or 'headtag'
 	 * @return string HTML include tags for inclusion in template
 	 */
-	static function render($renderFor) {
-		return self::backend()->render($renderFor);
-	}
-	
-	/**
-	 * Add i18n files from the given javascript directory.
-	 * 
-	 * @param String
-	 * @param Boolean
-	 * @param Boolean
-	 * 
-	 * See {@link Requirements_Backend::add_i18n_js()} for more information.
-	 */
-	/*public static function add_i18n_js($langDir, $return = false, $langOnly = false) {
-		return self::backend()->add_i18n_js($langDir, $return, $langOnly);
-	}*/
-	
-	/**
-	 * Concatenate several css or javascript files into a single dynamically generated file.
-	 * See {@link Requirements_Backend::combine_files()} for more info.
-	 *
-	 * @param string $combinedFileName
-	 * @param array $files
-	 */
-	static function combine_files($combinedFileName, $files) {
-		self::backend()->combine_files($combinedFileName, $files);
-	}
-	
-	/**
-	 * Returns all combined files.
-	 * See {@link Requirements_Backend::get_combine_files()}
-	 * 
-	 * @return array
-	 */
-	static function get_combine_files() {
-		return self::backend()->get_combine_files();
-	}
-	
-	/**
-	 * Deletes all dynamically generated combined files from the filesystem. 
-	 * See {@link Requirements_Backend::delete_combine_files()}
-	 * 
-	 * @param string $combinedFileName If left blank, all combined files are deleted.
-	 */
-	static function delete_combined_files($combinedFileName = null) {
-		return self::backend()->delete_combined_files($combinedFileName);
-	}
-	
-
-	/**
-	 * Re-sets the combined files definition. See {@link Requirements_Backend::clear_combined_files()}
-	 */
-	static function clear_combined_files() {
-		self::backend()->clear_combined_files();
-	}
-		
-	/**
-	 * See {@link combine_files()}.
- 	 */
-	static function process_combined_files() {
-		return self::backend()->process_combined_files();
+	static function render($type = 'all') {
+		return self::backend()->render($type);
 	}
 
 	/**
@@ -326,17 +243,6 @@ static function get_custom_scripts() {
 		return self::backend()->get_custom_scripts();
 	}
 	
-	/**
-	 * Set whether you want to write the JS to the body of the page or 
-	 * in the head section 
-	 * 
-	 * @see Requirements_Backend::set_write_js_to_body()
-	 * @param boolean
-	 */
-	static function set_write_js_to_body($var) {
-		self::backend()->set_write_js_to_body($var);
-	}
-	
 	static function debug() {
 		return self::backend()->debug();
 	}
@@ -463,30 +369,6 @@ public function __construct()
 		// Set up defaults from config file
 		$this->combine_js_with_jsmin = Kohana::config('requirements.combine_js_with_jsmin');
 		$this->set_suffix_requirements(Kohana::config('requirements.suffix_requirements'));
-		$this->set_combined_files_enabled(Kohana::config('requirements.combined_files_enabled'));
-		$this->set_write_js_to_body(Kohana::config('requirements.write_js_to_body'));
-	}
-
-	function set_combined_files_enabled($enable) {
-		$this->combined_files_enabled = (bool) $enable;
-	}
-	
-	function get_combined_files_enabled() {
-		return $this->combined_files_enabled;
-	}
-
-	/**
-	 * @param String $folder
-	 */
-	function setCombinedFilesFolder($folder) {
-		$this->combinedFilesFolder = $folder;
-	}
-	
-	/**
-	 * @return String Folder relative to the webroot
-	 */
-	function getCombinedFilesFolder() {
-		return ($this->combinedFilesFolder) ? $this->combinedFilesFolder : Kohana::config('upload.directory', FALSE);
 	}
 	
 	/**
@@ -508,22 +390,14 @@ function get_suffix_requirements() {
 		return $this->suffix_requirements;
 	}
 	
-	/**
-	 * Set whether you want the files written to the head or the body. It
-	 * writes to the body by default which can break some scripts
-	 *
-	 * @param boolean
-	 */
-	public function set_write_js_to_body($var) {
-		$this->write_js_to_body = $var;
-	}
 	/**
 	 * Register the given javascript file as required.
 	 * Filenames should be relative to the base, eg, 'framework/javascript/loader.js'
-	 * @param $file String|Array Filenames should be relative to the base, eg, 'framework/javascript/tree/tree.js'
+	 * @param $file String|Array Filenames should be relative to the base, eg, 'media/js/style.js'
+	 * @param string $uniquenessID
 	 */
 	
-	public function js($file) {
+	public function js($file, $uniquenessID = null) {
 		// If array, loop over array and add individual js files
 		if (is_array($file))
 		{
@@ -534,7 +408,12 @@ public function js($file) {
 			return;
 		}
 		
-		$this->js[$file] = true;
+		if (! $uniquenessID)
+		{
+			$uniquenessID = substr( $file, strrpos( $file, '/' ) +1 );
+		}
+		
+		$this->js[$uniquenessID] = $file;
 	}
 	
 	/**
@@ -552,11 +431,9 @@ public function get_js() {
 	 * @param script The script content
 	 * @param uniquenessID Use this to ensure that pieces of code only get added once.
 	 */
-	public function customJS($script, $uniquenessID = null) {
-		if($uniquenessID) $this->customJS[$uniquenessID] = $script;
-		else $this->customJS[] = $script;
-		
+	public function customJS($script, $uniquenessID) {
 		$script .= "\n";
+		$this->customJS[$uniquenessID] = $script;
 	}
 	
 	/**
@@ -565,9 +442,8 @@ public function customJS($script, $uniquenessID = null) {
 	 * @param string $script CSS selectors as a string (without <style> tag enclosing selectors).
 	 * @param int $uniquenessID Group CSS by a unique ID as to avoid duplicate custom CSS in header
 	 */
-	function customCSS($script, $uniquenessID = null) {
-		if($uniquenessID) $this->customCSS[$uniquenessID] = $script;
-		else $this->customCSS[] = $script;
+	function customCSS($script, $uniquenessID) {
+		$this->customCSS[$uniquenessID] = $script;
 	}
 	
 	/**
@@ -576,20 +452,20 @@ function customCSS($script, $uniquenessID = null) {
 	 * @param string $html
 	 * @param string $uniquenessID
 	 */
-	function customHeadTags($html, $uniquenessID = null) {
-		if($uniquenessID) $this->customHeadTags[$uniquenessID] = $html;
-		else $this->customHeadTags[] = $html;
+	function customHeadTags($html, $uniquenessID) {
+		$this->customHeadTags[$uniquenessID] = $html;
 	}
 
 	
 	/**
 	 * Register the given stylesheet file as required.
 	 * 
-	 * @param $file String|Array Filenames should be relative to the base, eg, 'framework/javascript/tree/tree.css'
+	 * @param $file String|Array Filenames should be relative to the base, eg, 'meida/css/tree.css'
+	 * @param string $uniquenessID
 	 * @param $media String Comma-separated list of media-types (e.g. "screen,projector") 
 	 * @see http://www.w3.org/TR/REC-CSS2/media.html
 	 */
-	function css($file, $media = null) {
+	function css($file, $uniquenessID = null, $media = null) {
 		// If array, loop over array and add individual js files
 		if (is_array($file))
 		{
@@ -600,7 +476,13 @@ function css($file, $media = null) {
 			return;
 		}
 		
-		$this->css[$file] = array(
+		if (! $uniquenessID)
+		{
+			$uniquenessID = substr( $file, strrpos( $file, '/' ) +1 );
+		}
+		
+		$this->css[$uniquenessID] = array(
+			"file" => $file,
 			"media" => $media
 		);
 	}
@@ -680,24 +562,48 @@ function restore() {
 	/**
 	 * Generate the appropriate include tags for the registered requirements. 
 	 * 
-	 * @param string $for where is the html going? accepts values 'head' or 'body'
+	 * @param string $type which type of requirement to render? accepts values 'all' 'css' 'js' or 'headtags'
 	 * @return string HTML include tags for inclusion in template
 	 */
-	function render($renderFor = 'head') {
+	function render($type = 'all') {
 		$content = '';
+		
+		switch ($type)
+		{
+			case 'css':
+				$content .= $this->renderCSS();
+				break;
+			case 'js':
+				$content .= $this->renderJS();
+				break;
+			case 'headtags':
+				$content .= $this->renderHeadTags();
+				break;
+			case 'all':
+			default:
+				$content .= $this->renderCSS();
+				$content .= $this->renderHeadTags();
+				$content .= $this->renderJS();
+				break;
+		}
+		
+		return $content;
+	}
 
-		if($this->css || $this->js || $this->customCSS || $this->customJS || $this->customHeadTags) {
-			$requirements = '';
-			$jsRequirements = '';
-			
-			// Combine files - updates $this->js and $this->css 
-			$this->process_combined_files(); 
-	
-			foreach(array_diff_key($this->js,$this->blocked) as $file => $dummy) {
+	/**
+	 * Generate the appropriate include tags for the registered JS requirements. 
+	 * 
+	 * @return string HTML include tags for inclusion in template
+	 */
+	function renderJS()
+	{
+		$content = '';
+		if($this->js || $this->customJS) {
+			foreach(array_diff_key($this->js,$this->blocked) as $id => $file) {
 				$path = $this->path_for_file($file, 'js');
 				if($path) {
 					//$jsRequirements .= html::script($path, TRUE);
-					$jsRequirements .= "<script type=\"text/javascript\" src=\"$path\"></script>\n";
+					$content .= "<script type=\"text/javascript\" src=\"$path\"></script>\n";
 				}
 			}
 			
@@ -705,41 +611,60 @@ function render($renderFor = 'head') {
 			// they might rely on
 			if($this->customJS) {
 				foreach(array_diff_key($this->customJS,$this->blocked) as $script) { 
-					$jsRequirements .= "<script type=\"text/javascript\">\n//<![CDATA[\n";
-					$jsRequirements .= "$script\n";
-					$jsRequirements .= "\n//]]>\n</script>\n";
+					$content .= "<script type=\"text/javascript\">\n//<![CDATA[\n";
+					$content .= "$script\n";
+					$content .= "\n//]]>\n</script>\n";
 				}
 			}
-			
-			foreach(array_diff_key($this->css,$this->blocked) as $file => $params) {
+		}
+		
+		return $content;
+	}
+
+	
+	/**
+	 * Generate the appropriate include tags for the registered Head Tag requirements. 
+	 * 
+	 * @return string HTML include tags for inclusion in template
+	 */
+	function renderHeadTags()
+	{
+		$content = '';
+		if($this->customHeadTags) {
+			foreach(array_diff_key($this->customHeadTags,$this->blocked) as $customHeadTag) { 
+				$content .= "$customHeadTag\n"; 
+			}
+		}
+		
+		return $content;
+	}
+
+	
+	/**
+	 * Generate the appropriate include tags for the registered CSS requirements. 
+	 * 
+	 * @return string HTML include tags for inclusion in template
+	 */
+	function renderCSS()
+	{
+		$content = '';
+		if($this->css || $this->customCSS) {
+			foreach(array_diff_key($this->css,$this->blocked) as $id => $params) {
+				$file = $params['file'];
 				$path = $this->path_for_file($file, 'css');
 				if($path) {
 					//$media = (isset($params['media']) && !empty($params['media'])) ? $params['media'] : "";
 					//$requirements .= html::stylesheet($path, $media, TRUE);
 					$media = (isset($params['media']) && !empty($params['media'])) ? " media=\"{$params['media']}\"" : "";
-					$requirements .= "<link rel=\"stylesheet\" type=\"text/css\"{$media} href=\"$path\" />\n";
+					$content .= "<link rel=\"stylesheet\" type=\"text/css\"{$media} href=\"$path\" />\n";
 					
 				}
 			}
 			
 			foreach(array_diff_key($this->customCSS, $this->blocked) as $css) { 
-				$requirements .= "<style type=\"text/css\">\n$css\n</style>\n";
-			}
-			
-			foreach(array_diff_key($this->customHeadTags,$this->blocked) as $customHeadTag) { 
-				$requirements .= "$customHeadTag\n"; 
-			}
-			
-			if ($renderFor == 'head')
-			{
-				$content .= $requirements;
-				if(! $this->write_js_to_body) {
-					$content .= $jsRequirements;
-				}
-			} elseif ($renderFor == 'body' && $this->write_js_to_body) {
-				$content .= $jsRequirements;
+				$content .= "<style type=\"text/css\">\n$css\n</style>\n";
 			}
-		} 
+		}
 		
 		return $content;
 	}
@@ -755,15 +680,6 @@ protected function path_for_file($fileOrUrl, $type) {
 		if(preg_match('/^http[s]?/', $fileOrUrl)) {
 			return $fileOrUrl;
 		} else {
-			// Add extension if not present
-			$suffix = ".$type";
-			$length = strlen($suffix);
-			if ( $length > 0 AND substr_compare($fileOrUrl, $suffix, -$length, $length, FALSE) !== 0)
-			{
-				// Add the defined suffix
-				$fileOrUrl .= $suffix;
-			}
-			
 			if (file_exists(DOCROOT . $fileOrUrl)) {
 				// Get url prefix, either site base url or CDN url
 				$prefix = url::file_loc($type);
@@ -780,251 +696,9 @@ protected function path_for_file($fileOrUrl, $type) {
 				return "{$prefix}{$fileOrUrl}{$mtimesuffix}{$suffix}";
 			}
 		}
+		Kohana::log('alert', "Requirments: file $fileOrUrl not found");
 		return false;
 	}
-	
-	/**
-	 * Concatenate several css or javascript files into a single dynamically generated
-	 * file. This increases performance by fewer HTTP requests.
-	 * 
-	 * The combined file is regenerated
-	 * based on every file modification time. Optionally a rebuild can be triggered
-	 * by appending ?flush=1 to the URL.
-	 * If all files to be combined are javascript, we use the external JSMin library
-	 * to minify the javascript. This can be controlled by {@link $combine_js_with_jsmin}.
-	 * 
-	 * CAUTION: You're responsible for ensuring that the load order for combined files
-	 * is retained - otherwise combining javascript files can lead to functional errors
-	 * in the javascript logic, and combining css can lead to wrong styling inheritance.
-	 * Depending on the javascript logic, you also have to ensure that files are not included
-	 * in more than one combine_files() call.
-	 * Best practice is to include every javascript file in exactly *one* combine_files()
-	 * directive to avoid the issues mentioned above - this is enforced by this function.
-	 * 
-	 * CAUTION: Combining CSS Files discards any "media" information.
-	 *
-	 * Example for combined JavaScript:
-	 * <code>
-	 * Requirements::combine_files(
-	 *  'foobar.js',
-	 *  array(
-	 * 		'mysite/javascript/foo.js',
-	 * 		'mysite/javascript/bar.js',
-	 * 	)
-	 * );
-	 * </code>
-	 *
-	 * Example for combined CSS:
-	 * <code>
-	 * Requirements::combine_files(
-	 *  'foobar.css',
-	 * 	array(
-	 * 		'mysite/javascript/foo.css',
-	 * 		'mysite/javascript/bar.css',
-	 * 	)
-	 * );
-	 * </code>
-	 *
-	 * @see http://code.google.com/p/jsmin-php/
-	 * 
-	 * @todo Should we enforce unique inclusion of files, or leave it to the developer? Can auto-detection cause breaks?
-	 * 
-	 * @param string $combinedFileName Filename of the combined file
-	 * @param array $files Array of filenames relative to the webroot
-	 */
-	function combine_files($combinedFileName, $files) {
-		// duplicate check
-		foreach($this->combine_files as $_combinedFileName => $_files) {
-			$duplicates = array_intersect($_files, $files);
-			if($duplicates && $combinedFileName != $_combinedFileName) {
-				user_error("Requirements_Backend::combine_files(): Already included files " . implode(',', $duplicates) . " in combined file '{$_combinedFileName}'", E_USER_NOTICE);
-				return false;
-			}
-		}
-		foreach($files as $index=>$file) {
-			if(is_array($file)) {
-				// Either associative array path=>path type=>type or numeric 0=>path 1=>type
-				// Otherwise, assume path is the first item
-				if (isset($file['type']) && ($file['type'] == 'css' || $file['type'] == 'javascript' || $file['type'] == 'js')) {
-					switch ($file['type']) {
-						case 'css':
-							$this->css($file['path']);
-							break;
-						default:
-							$this->js($file['path']);
-							break;
-					}
-					$files[$index] = $file['path'];
-				} elseif (isset($file[1]) && ($file[1] == 'css' || $file[1] == 'javascript' || $file[1] == 'js')) {
-					switch ($file[1]) {
-						case 'css':
-							$this->css($file[0]);
-							break;
-						default:
-							$this->js($file[0]);
-							break;
-					}
-					$files[$index] = $file[0];
-				} else {
-					$file = array_shift($file);
-				}
-			}
-			if (!is_array($file)) {
-				if(substr($file, -2) == 'js') {
-					$this->js($file);
-				} elseif(substr($file, -3) == 'css') {
-					$this->css($file);
-				} else {
-					user_error("Requirements_Backend::combine_files(): Couldn't guess file type for file '$file', please specify by passing using an array instead.", E_USER_NOTICE);
-				}
-			}
-		}
-		$this->combine_files[$combinedFileName] = $files;
-	}
-	
-		/**
-	 * Returns all combined files.
-	 * @return array
-	 */
-	function get_combine_files() {
-		return $this->combine_files;
-	}
-	
-	/**
-	 * Deletes all dynamically generated combined files from the filesystem. 
-	 * 
-	 * @param string $combinedFileName If left blank, all combined files are deleted.
-	 */
-	function delete_combined_files($combinedFileName = null) {
-		$combinedFiles = ($combinedFileName) ? array($combinedFileName => null) : $this->combine_files;
-		$combinedFolder = ($this->getCombinedFilesFolder()) ? (DOCROOT . $this->combinedFilesFolder) : DOCROOT . Kohana::config('upload.directory', FALSE);
-		foreach($combinedFiles as $combinedFile => $sourceItems) {
-			$filePath = $combinedFolder . '/' . $combinedFile;
-			if(file_exists($filePath)) {
-				unlink($filePath);
-			}
-		}
-	}
-	
-	function clear_combined_files() {
-		$this->combine_files = array();
-	}
-
-	/**
-	 * See {@link combine_files()}
-	 *
-	 */
-	function process_combined_files() {
-		if( !$this->combined_files_enabled) {
-			return;
-		}
-		
-		// Make a map of files that could be potentially combined
-		$combinerCheck = array();
-		foreach($this->combine_files as $combinedFile => $sourceItems) {
-			foreach($sourceItems as $sourceItem) {
-				if(isset($combinerCheck[$sourceItem]) && $combinerCheck[$sourceItem] != $combinedFile){ 
-					user_error("Requirements_Backend::process_combined_files - file '$sourceItem' appears in two combined files:" .	" '{$combinerCheck[$sourceItem]}' and '$combinedFile'", E_USER_WARNING);
-				}
-				$combinerCheck[$sourceItem] = $combinedFile;
-				
-			}
-		}
-
-		// Work out the relative URL for the combined files from the base folder
-		$combinedFilesFolder = ($this->getCombinedFilesFolder()) ? ($this->getCombinedFilesFolder() . '/') : '';
-
-		// Figure out which ones apply to this pageview
-		$combinedFiles = array();
-		$newJSRequirements = array();
-		$newCSSRequirements = array();
-		foreach($this->js as $file => $dummy) {
-			if(isset($combinerCheck[$file])) {
-				$newJSRequirements[$combinedFilesFolder . $combinerCheck[$file]] = true;
-				$combinedFiles[$combinerCheck[$file]] = true;
-			} else {
-				$newJSRequirements[$file] = true;
-			}
-		}
-		
-		foreach($this->css as $file => $params) {
-			if(isset($combinerCheck[$file])) {
-				$newCSSRequirements[$combinedFilesFolder . $combinerCheck[$file]] = true;
-				$combinedFiles[$combinerCheck[$file]] = true;
-			} else {
-				$newCSSRequirements[$file] = $params;
-			}
-		}
-
-		// Process the combined files
-		$base = DOCROOT;
-		foreach(array_diff_key($combinedFiles, $this->blocked) as $combinedFile => $dummy) {
-			$fileList = $this->combine_files[$combinedFile];
-			$combinedFilePath = $base . $combinedFilesFolder . '/' . $combinedFile;
-
-
-			// Make the folder if necessary
-			if(!file_exists(dirname($combinedFilePath))) {
-				mkdir(dirname($combinedFilePath));
-			}
-			
-			// If the file isn't writebale, don't even bother trying to make the combined file
-			// Complex test because is_writable fails if the file doesn't exist yet.
-			if((file_exists($combinedFilePath) && !is_writable($combinedFilePath)) ||
-				(!file_exists($combinedFilePath) && !is_writable(dirname($combinedFilePath)))) {
-				user_error("Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'", E_USER_WARNING);
-				continue;
-			}
-
-			 // Determine if we need to build the combined include
-			if(file_exists($combinedFilePath) && !isset($_GET['flush'])) {
-				// file exists, check modification date of every contained file
-				$srcLastMod = 0;
-				foreach($fileList as $file) {
-					$srcLastMod = max(filemtime($base . $file), $srcLastMod);
-				}
-				$refresh = $srcLastMod > filemtime($combinedFilePath);
-			} else {
-				// file doesn't exist, or refresh was explicitly required
-				$refresh = true;
-			}
-
-			if(!$refresh) continue;
-
-			$combinedData = "";
-			foreach(array_diff($fileList, $this->blocked) as $file) {
-				$fileContent = file_get_contents($base . $file);
-				// if we have a javascript file and jsmin is enabled, minify the content
-				$isJS = stripos($file, '.js');
-				if($isJS && $this->combine_js_with_jsmin) {
-					increase_time_limit_to();
-					$fileContent = JSMin::minify($fileContent);
-				}
-				// write a header comment for each file for easier identification and debugging
-				// also the semicolon between each file is required for jQuery to be combinable properly
-				$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n".($isJS ? ';' : '')."\n";
-			}
-
-			$successfulWrite = false;
-			$fh = fopen($combinedFilePath, 'wb');
-			if($fh) {
-				if(fwrite($fh, $combinedData) == strlen($combinedData)) $successfulWrite = true;
-				fclose($fh);
-				unset($fh);
-			}
-
-			// Unsuccessful write - just include the regular JS files, rather than the combined one
-			if(!$successfulWrite) {
-				user_error("Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'", E_USER_WARNING);
-				continue;
-			}
-		}
-
-		// @todo Alters the original information, which means you can't call this
-		// method repeatedly - it will behave different on the second call!
-		$this->js = $newJSRequirements;
-		$this->css = $newCSSRequirements;
-  }
   
   function get_custom_scripts() {
 		$requirements = "";
@@ -1042,7 +716,7 @@ function get_custom_scripts() {
 	 * @see Requirements::themedCSS()
 	 */
 	public function themedCSS($name, $module = null, $media = null) {
-		$this->css($this->themedCSSPath($name, $module), $media);
+		$this->css($this->themedCSSPath($name, $module), $name, $media);
 		return;
 	}
 
@@ -1050,7 +724,7 @@ public function themedCSS($name, $module = null, $media = null) {
 	 * @see Requirements::ieCSS()
 	 */
 	public function ieCSS($version, $name, $media = null) {
-		Requirements::customHeadTags("<!--[if $version]>".html::stylesheet(url::file_loc('css').$name,$media,TRUE)."<![endif]-->",'iecss-'.$name);
+		$this->customHeadTags("<!--[if $version]>".html::stylesheet(url::file_loc('css').$name,$media,TRUE)."<![endif]-->",'iecss-'.$name);
 		return;
 	}
 
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 207504cc31..b98356884e 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -57,8 +57,17 @@ public function __construct()
 	 */
 	public function header_block()
 	{
+		$content = '';
 		// For backward compatibility render Requirements here rather than in the view
-		$content = Requirements::render('head');
+		if (Kohana::config('requirements.write_js_to_body'))
+		{
+			$content .= Requirements::render('css');
+			$content .= Requirements::render('headtags');
+		}
+		else
+		{
+			$content .= Requirements::render();
+		}
 		
 		// Filter::header_block - Modify Header Block
 		if ($this->admin)
@@ -67,9 +76,9 @@ public function header_block()
 		}
 		elseif ($this->frontend)
 		{
-			Event::run('ushahidi_filter.header_block', $content);
+		Event::run('ushahidi_filter.header_block', $content);
 		}
-		
+
 		return $content;
 	}
 
@@ -89,31 +98,31 @@ public function requirements()
 	{
 		Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
 		
-		Requirements::js("media/js/jquery");
-		Requirements::js("media/js/jquery.ui.min");
+		Requirements::js("media/js/jquery.js");
+		Requirements::js("media/js/jquery.ui.min.js");
 		//Requirements::js(Kohana::config('core.site_protocol')."://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js");
-		Requirements::js("media/js/jquery.pngFix.pack");
-		Requirements::js("media/js/jquery.timeago");
+		Requirements::js("media/js/jquery.pngFix.pack.js");
+		Requirements::js("media/js/jquery.timeago.js");
 		
-		Requirements::css("media/css/jquery-ui-themeroller");
+		Requirements::css("media/css/jquery-ui-themeroller.css");
 		
-		Requirements::js('media/js/global');
-		Requirements::css('media/css/global');
+		Requirements::js('media/js/global.js');
+		Requirements::css('media/css/global.css');
 
 		if ($this->map_enabled)
 		{
-			Requirements::js("media/js/OpenLayers");
-			Requirements::js("media/js/ushahidi");
+			Requirements::js("media/js/OpenLayers.js");
+			Requirements::js("media/js/ushahidi.js");
 			Requirements::js($this->api_url);
 			Requirements::customJS("OpenLayers.ImgPath = '".url::file_loc('js')."media/img/openlayers/"."';",'openlayers-imgpath');
 			
-			Requirements::css("media/css/openlayers");
+			Requirements::css("media/css/openlayers.css");
 		}
 		
 		if ($this->hovertip_enabled)
 		{
-			Requirements::js('media/js/jquery.hovertip-1.0');
-			Requirements::css('media/css/jquery.hovertip-1.0', '');
+			Requirements::js('media/js/jquery.hovertip-1.0.js');
+			Requirements::css('media/css/jquery.hovertip-1.0.css', '');
 			Requirements::customJS(
 				"$(function() {
 						if($('.tooltip[title]') != null)
@@ -125,57 +134,58 @@ public function requirements()
 		
 		if ($this->slider_enabled)
 		{
-			Requirements::js('media/js/selectToUISlider.jQuery');
+			Requirements::js('media/js/selectToUISlider.jQuery.js');
 		}
 
 		if ($this->timeline_enabled)
 		{
-			Requirements::js("media/js/jquery.jqplot.min");
-			Requirements::css("media/css/jquery.jqplot.min");
-			Requirements::js("media/js/jqplot.dateAxisRenderer.min");
+			Requirements::js("media/js/jquery.jqplot.min.js");
+			Requirements::css("media/css/jquery.jqplot.min.css");
+			Requirements::js("media/js/jqplot.dateAxisRenderer.min.js");
 		}
 
 		if ($this->treeview_enabled)
 		{
-			Requirements::css("media/css/jquery.treeview");
-			Requirements::js("media/js/jquery.treeview");
+			Requirements::css("media/css/jquery.treeview.css");
+			Requirements::js("media/js/jquery.treeview.js");
 		}
 	
 		// Load ProtoChart
 		if ($this->protochart_enabled)
 		{
 			Requirements::customJS("jQuery.noConflict()", 'jquery-noconflict');
-			Requirements::js('media/js/protochart/prototype');
+			Requirements::js('media/js/protochart/prototype.js');
 			Requirements::customHeadTags(
-				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/protochart/excanvas-compressed', TRUE).'<![endif]-->');
-			Requirements::js('media/js/protochart/ProtoChart');
+				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/protochart/excanvas-compressed', TRUE).'<![endif]-->', 
+				'ie-excanvas-compressed');
+			Requirements::js('media/js/protochart/ProtoChart.js');
 		}
 	
 		// Load Raphael
 		if ($this->raphael_enabled)
 		{
 			// The only reason we include prototype is to keep the div element naming convention consistent
-			//Requirements::js('media/js/protochart/prototype');
-			Requirements::js('media/js/raphael');
+			//Requirements::js('media/js/protochart/prototype.js');
+			Requirements::js('media/js/raphael.js');
 			Requirements::customJS('var impact_json = '.$this->impact_json .';','impact_json');
-			Requirements::js('media/js/raphael-ushahidi-impact');
+			Requirements::js('media/js/raphael-ushahidi-impact.js');
 		}
 
 		if ($this->validator_enabled)
 		{
-			Requirements::js("media/js/jquery.validate.min");
+			Requirements::js("media/js/jquery.validate.min.js");
 		}
 
 		if ($this->photoslider_enabled)
 		{
-			Requirements::css("media/css/picbox/picbox");
-			Requirements::js("media/js/picbox");
+			Requirements::css("media/css/picbox/picbox.css");
+			Requirements::js("media/js/picbox.js");
 		}
 
 		if ($this->colorpicker_enabled)
 		{
-			Requirements::css("media/css/colorpicker");
-			Requirements::js("media/js/colorpicker");
+			Requirements::css("media/css/colorpicker.css");
+			Requirements::js("media/js/colorpicker.js");
 		}
 
 		// Load jwysiwyg
@@ -192,13 +202,13 @@ public function requirements()
 		// Table Row Sort
 		if ($this->tablerowsort_enabled)
 		{
-			Requirements::js('media/js/jquery.tablednd_0_5');
+			Requirements::js('media/js/jquery.tablednd_0_5.js');
 		}
 	
 		// JSON2 for IE+
 		if ($this->json2_enabled)
 		{
-			Requirements::js('media/js/json2');
+			Requirements::js('media/js/json2.js');
 		}
 		
 		if ($this->datepicker_enabled)
@@ -254,7 +264,7 @@ public function requirements()
 				Date.format = 'mm/dd/yyyy';
 			",'locale-dates');
 	
-			Requirements::js('media/js/jquery.datePicker');
+			Requirements::js('media/js/jquery.datePicker.js');
 			Requirements::customHeadTags(
 				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/jquery.bgiframe.min', TRUE).'<![endif]-->','jquery.bgiframe.min');
 		}
@@ -274,6 +284,7 @@ public function requirements()
 		// Inline Javascript
 		if (!empty($this->js))
 		{
+			//@todo add deprecated warning
 			Requirements::customJS($this->js,'pagejs');
 		}
 		
@@ -282,12 +293,12 @@ public function requirements()
 
 	public function admin_requirements()
 	{
-		Requirements::js('media/js/jquery.form');
-		Requirements::js('media/js/jquery.validate.min');
-		Requirements::js('media/js/jquery.base64');
-		Requirements::js('media/js/admin');
-		Requirements::css('media/css/admin/all');
-		Requirements::ieCSS("lt IE 7", 'media/css/ie6');
+		Requirements::js('media/js/jquery.form.js');
+		Requirements::js('media/js/jquery.validate.min.js');
+		Requirements::js('media/js/jquery.base64.js');
+		Requirements::js('media/js/admin.js');
+		Requirements::css('media/css/admin/all.css');
+		Requirements::ieCSS("lt IE 7", 'media/css/ie6.css');
 	}
 	
 	public function frontend_requirements()
@@ -310,9 +321,9 @@ public function frontend_requirements()
 			Requirements::js($js);
 		}
 		
-		Requirements::ieThemedCSS("lte IE 7", "iehacks");
-		Requirements::ieThemedCSS("IE 7", "ie7hacks");
-		Requirements::ieThemedCSS("IE 6", "ie6hacks");
+		Requirements::ieThemedCSS("lte IE 7", "iehacks.css");
+		Requirements::ieThemedCSS("IE 7", "ie7hacks.css");
+		Requirements::ieThemedCSS("IE 6", "ie6hacks.css");
 	}
 
 	/**
@@ -326,7 +337,10 @@ public function footer_block()
 				$this->ushahidi_stats_js()."\n".
 				$this->scheduler_js();
 		
-		$content .= Requirements::render('body');
+		if (Kohana::config('requirements.write_js_to_body'))
+		{
+			$content .= Requirements::render('js');
+		}
 
 		// Filter::footer_block - Modify Footer Block
 		Event::run('ushahidi_filter.footer_block', $content);
@@ -506,7 +520,7 @@ public static function register_theme()
 		$theme = Kohana::config("settings.site_style");
 		$theme = empty($theme) ? 'default' : $theme;
 		self::load_theme($theme);
-	}
+}
 	
 	/**
 	 * Load theme
@@ -577,14 +591,14 @@ private static function load_theme_css($theme)
 		foreach ($meta['CSS'] as $css)
 		{
 			if (file_exists(THEMEPATH."$theme/css/$css.css"))
-				self::$theme_css[$css] = "themes/$theme/css/$css";
+				self::$theme_css[$css] = "themes/$theme/css/$css.css";
 		}
 		
 		// Check for overrides of already added stylesheets
 		foreach (self::$theme_css as $css => $path)
 		{
 			if (file_exists(THEMEPATH."$theme/css/$css.css"))
-				self::$theme_css[$css] = "themes/$theme/css/$css";
+				self::$theme_css[$css] = "themes/$theme/css/$css.css";
 		}
 	}
 
@@ -609,14 +623,14 @@ private static function load_theme_js($theme)
 		foreach ($meta['JS'] as $js)
 		{
 			if (file_exists(THEMEPATH."$theme/js/$js.js"))
-				self::$theme_js[$js] = "themes/$theme/js/$js";
+				self::$theme_js[$js] = "themes/$theme/js/$js.js";
 		}
 		
 		// Check for overrides of already added js
 		foreach (self::$theme_css as $js => $path)
 		{
 			if (file_exists(THEMEPATH."$theme/js/$js.js"))
-				self::$theme_js[$js] = "themes/$theme/js/$js";
+				self::$theme_js[$js] = "themes/$theme/js/$js.js";
 		}
 	}
 	

From 38240bbffd141f8c3405e17fff71d1567340e245 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 27 Nov 2012 13:25:38 +1300
Subject: [PATCH 23/30] Add option to combine CSS / JS files

* Add option to requirements to support combining files
* Add groups for base and admin combined files
* Move admin/all.css to admin.css so url() links work when combined
* Add CDN support for combined files
  * Auto upload combined files to the CDN
  * Fix minor issues in Cloudfiles classes -
    probably related to PHP 5.4
  * Make cdn helper handle files not located in media/uploads
    or already with full path.
---
 application/config/requirements.php           |  19 +-
 application/helpers/cdn.php                   |   4 +-
 application/libraries/Cloudfiles.php          |   6 +-
 application/libraries/Requirements.php        | 356 +++++++++++++++++-
 application/libraries/Themes.php              |  51 ++-
 .../libraries/cloudfiles/CF_Container.php     |   2 +-
 .../libraries/cloudfiles/CF_Object.php        |   2 +-
 media/css/{admin/all.css => admin.css}        |  84 ++---
 8 files changed, 460 insertions(+), 64 deletions(-)
 rename media/css/{admin/all.css => admin.css} (88%)

diff --git a/application/config/requirements.php b/application/config/requirements.php
index d8b50de5b2..c96f3bc0a7 100644
--- a/application/config/requirements.php
+++ b/application/config/requirements.php
@@ -14,6 +14,17 @@
  **/
 $config['combined_files_enabled'] = TRUE;
 
+/**
+ * Using the JSMin library to minify any
+ * javascript file passed to {@link combine_files()}.
+ **/
+$config['combine_js_with_jsmin'] = TRUE;
+
+/**
+ * Enable auto uploading combined css/js to CDN
+ **/
+$config['cdn_store_combined_files'] = TRUE;
+
 /**
  * Put all javascript includes at the bottom of the template
  * before the closing <body> tag instead of the <head> tag.
@@ -21,10 +32,4 @@
  * which can be a performance improvement.
  * @see Requirements_Backend::$write_js_to_body for details
  **/
-$config['write_js_to_body'] = FALSE;
-
-/**
- * Using the JSMin library to minify any
- * javascript file passed to {@link combine_files()}.
- **/
-$config['combine_js_with_jsmin'] = TRUE;
\ No newline at end of file
+$config['write_js_to_body'] = FALSE;
\ No newline at end of file
diff --git a/application/helpers/cdn.php b/application/helpers/cdn.php
index cc6a82df58..fe61489dfb 100644
--- a/application/helpers/cdn.php
+++ b/application/helpers/cdn.php
@@ -49,14 +49,14 @@ private static function connection()
 	 * @param string $filename Name of the file to be uploaded
 	 * @return string
 	 */
-	public static function upload($filename)
+	public static function upload($filename, $appendUploadDir = TRUE)
 	{
 		try
 		{
 			self::connection();
 
 			// Upload to the CDN and return new filename
-			return self::$cdn->upload($filename);
+			return self::$cdn->upload($filename, $appendUploadDir);
 		}
 		catch (Exception $e)
 		{
diff --git a/application/libraries/Cloudfiles.php b/application/libraries/Cloudfiles.php
index 571440b604..b2f59927c6 100644
--- a/application/libraries/Cloudfiles.php
+++ b/application/libraries/Cloudfiles.php
@@ -96,14 +96,14 @@ public function authenticate()
 	}
 
 	// $file must be the absolute path to the file
-	public function upload($filename)
+	public function upload($filename, $appendUploadDir = TRUE)
 	{
 		$this->authenticate();
 
 		$local_directory = Kohana::config('upload.directory', TRUE);
 		$local_directory = rtrim($local_directory, '/').'/';
 
-		$fullpath = $local_directory.$filename;
+		$fullpath = $appendUploadDir ? $local_directory.$filename : DOCROOT.$filename;
 
 		// Put this in a special directory based on subdomain if subdomain is set
 		$dir = $this->_special_dir();
@@ -123,7 +123,7 @@ public function upload($filename)
 		$uri = $container->make_public();
 
 		// Return the file path URL
-		return $file->public_ssl_uri();
+		return (Kohana::config('config.external_site_protocol') == 'https') ? $file->public_ssl_uri() : $file->public_uri();
 	}
 
 	public function delete($url)
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index 05c4fd1f56..f401306b36 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -30,6 +30,30 @@
  * @license	   https://github.com/silverstripe/sapphire Modified BSD License
  */
 class Requirements {
+	
+	/**
+	 * Enable combining of css/javascript files.
+	 * @param boolean $enable
+	 */
+	public static function set_combined_files_enabled($enable) {
+		self::backend()->set_combined_files_enabled($enable);
+	}
+
+	/**
+	 * Checks whether combining of css/javascript files is enabled.
+	 * @return boolean
+	 */
+	public static function get_combined_files_enabled() {
+	  return self::backend()->get_combined_files_enabled();
+	}
+
+	/**
+	 * Set the relative folder e.g. "assets" for where to store combined files
+	 * @param string $folder Path to folder
+	 */
+	public static function set_combined_files_folder($folder) {
+		self::backend()->setCombinedFilesFolder($folder);
+	}
 
 	/**
 	 * Set whether we want to suffix requirements with the time / 
@@ -232,6 +256,52 @@ static function restore() {
 	static function render($type = 'all') {
 		return self::backend()->render($type);
 	}
+	
+	/**
+	 * Concatenate several css or javascript files into a single dynamically generated file.
+	 * See {@link Requirements_Backend::combine_files()} for more info.
+	 *
+	 * @param string $combinedFileName
+	 * @param array $files
+	 */
+	static function combine_files($combinedFileName, $files) {
+		self::backend()->combine_files($combinedFileName, $files);
+	}
+	
+	/**
+	 * Returns all combined files.
+	 * See {@link Requirements_Backend::get_combine_files()}
+	 * 
+	 * @return array
+	 */
+	static function get_combine_files() {
+		return self::backend()->get_combine_files();
+	}
+	
+	/**
+	 * Deletes all dynamically generated combined files from the filesystem. 
+	 * See {@link Requirements_Backend::delete_combine_files()}
+	 * 
+	 * @param string $combinedFileName If left blank, all combined files are deleted.
+	 */
+	static function delete_combined_files($combinedFileName = null) {
+		return self::backend()->delete_combined_files($combinedFileName);
+	}
+	
+
+	/**
+	 * Re-sets the combined files definition. See {@link Requirements_Backend::clear_combined_files()}
+	 */
+	static function clear_combined_files() {
+		self::backend()->clear_combined_files();
+	}
+		
+	/**
+	 * See {@link combine_files()}.
+ 	 */
+	static function process_combined_files() {
+		return self::backend()->process_combined_files();
+	}
 
 	/**
 	 * Returns all custom scripts
@@ -333,7 +403,7 @@ class Requirements_Backend {
 	 *
 	 * @var array $combine_files
 	 */
-	public $combine_files = array();
+	public $combine_files = array('js' => array(), 'css' => array());
 
 	/**
 	 * Using the JSMin library to minify any
@@ -369,6 +439,29 @@ public function __construct()
 		// Set up defaults from config file
 		$this->combine_js_with_jsmin = Kohana::config('requirements.combine_js_with_jsmin');
 		$this->set_suffix_requirements(Kohana::config('requirements.suffix_requirements'));
+		$this->set_combined_files_enabled(Kohana::config('requirements.combined_files_enabled'));
+	}
+
+	function set_combined_files_enabled($enable) {
+		$this->combined_files_enabled = (bool) $enable;
+	}
+	
+	function get_combined_files_enabled() {
+		return $this->combined_files_enabled;
+	}
+
+	/**
+	 * @param String $folder
+	 */
+	function setCombinedFilesFolder($folder) {
+		$this->combinedFilesFolder = $folder;
+	}
+	
+	/**
+	 * @return String Folder relative to the webroot
+	 */
+	function getCombinedFilesFolder() {
+		return ($this->combinedFilesFolder) ? $this->combinedFilesFolder : Kohana::config('upload.relative_directory', FALSE);
 	}
 	
 	/**
@@ -595,10 +688,13 @@ function render($type = 'all') {
 	 * 
 	 * @return string HTML include tags for inclusion in template
 	 */
-	function renderJS()
+	private function renderJS()
 	{
 		$content = '';
 		if($this->js || $this->customJS) {
+			// Combine files - updates $this->js
+			$this->process_combined_files('js');
+		
 			foreach(array_diff_key($this->js,$this->blocked) as $id => $file) {
 				$path = $this->path_for_file($file, 'js');
 				if($path) {
@@ -627,7 +723,7 @@ function renderJS()
 	 * 
 	 * @return string HTML include tags for inclusion in template
 	 */
-	function renderHeadTags()
+	private function renderHeadTags()
 	{
 		$content = '';
 		if($this->customHeadTags) {
@@ -645,10 +741,14 @@ function renderHeadTags()
 	 * 
 	 * @return string HTML include tags for inclusion in template
 	 */
-	function renderCSS()
+	private function renderCSS()
 	{
+		
 		$content = '';
 		if($this->css || $this->customCSS) {
+			// Combine files - updates $this->css 
+			$this->process_combined_files('css');
+			
 			foreach(array_diff_key($this->css,$this->blocked) as $id => $params) {
 				$file = $params['file'];
 				$path = $this->path_for_file($file, 'css');
@@ -696,11 +796,253 @@ protected function path_for_file($fileOrUrl, $type) {
 				return "{$prefix}{$fileOrUrl}{$mtimesuffix}{$suffix}";
 			}
 		}
-		Kohana::log('alert', "Requirments: file $fileOrUrl not found");
+		Kohana::log('alert', "Requirements: file $fileOrUrl not found");
 		return false;
 	}
-  
-  function get_custom_scripts() {
+	
+	/**
+	 * Concatenate several css or javascript files into a single dynamically generated
+	 * file. This increases performance by fewer HTTP requests.
+	 * 
+	 * The combined file is only included if one or more of the individual files was included
+	 * with Requirements::js() or Requirements::css() already.
+	 * 
+	 * The combined file is regenerated based on every file modification time.
+	 * Optionally a rebuild can be triggered by appending ?flush=1 to the URL.
+	 * If all files to be combined are javascript, we use the external JSMin library
+	 * to minify the javascript. This can be controlled by {@link $combine_js_with_jsmin}.
+	 * 
+	 * CAUTION: You're responsible for ensuring that the load order for combined files
+	 * is retained - otherwise combining javascript files can lead to functional errors
+	 * in the javascript logic, and combining css can lead to wrong styling inheritance.
+	 * Depending on the javascript logic, you also have to ensure that files are not included
+	 * in more than one combine_files() call.
+	 * 
+	 * Best practice is to include every javascript file in exactly *one* combine_files()
+	 * directive to avoid the issues mentioned above - this is enforced by this function.
+	 * 
+	 * CAUTION: Combining CSS Files discards any "media" information.
+	 *
+	 * Example for combined JavaScript:
+	 * <code>
+	 * Requirements::combine_files(
+	 *  'foobar.js',
+	 *  array(
+	 * 		'mysite/javascript/foo.js',
+	 * 		'mysite/javascript/bar.js',
+	 * 		'baz.min' => 'mysite/javascript/baz.min',
+	 * 	)
+	 * );
+	 * </code>
+	 *
+	 * Example for combined CSS:
+	 * <code>
+	 * Requirements::combine_files(
+	 *  'foobar.css',
+	 * 	array(
+	 * 		'mysite/javascript/foo.css',
+	 * 		'mysite/javascript/bar.css',
+	 * 	)
+	 * );
+	 * </code>
+	 *
+	 * @see http://code.google.com/p/jsmin-php/
+	 * 
+	 * @todo Should we enforce unique inclusion of files, or leave it to the developer? Can auto-detection cause breaks?
+	 * 
+	 * @param string $combinedFileName Filename of the combined file
+	 * @param array $files Array of filenames relative to the webroot
+	 */
+	function combine_files($combinedFileName, $files) {
+		$type = stripos($combinedFileName, '.js') ? 'js' : 'css';
+		
+		// duplicate check
+		foreach($this->combine_files[$type] as $_combinedFileName => $_files) {
+			$duplicates = array_intersect($_files, $files);
+			if($duplicates && $combinedFileName != $_combinedFileName) {
+				Kohana::log('info', "Requirements_Backend::combine_files(): Already included files " . implode(',', $duplicates) . " in combined file '{$_combinedFileName}'");
+				return false;
+			}
+		}
+		
+		// If the $files array is indexed, generate uniquenessID from last part of filename
+		if (array_values($files) === $files)
+		{
+			$new_files = array();
+			foreach($files as $file)
+			{
+				$uniquenessID = substr( $file, strrpos( $file, '/' ) +1 );
+				$new_files[$uniquenessID] = $file;
+			}
+			$files = $new_files;
+		}
+		
+		$this->combine_files[$type][$combinedFileName] = $files;
+	}
+	
+	/**
+	 * Returns all combined files.
+	 * @return array
+	 */
+	function get_combine_files() {
+		return $this->combine_files;
+	}
+	
+	/**
+	 * Deletes all dynamically generated combined files from the filesystem. 
+	 * 
+	 * @param string $combinedFileName If left blank, all combined files are deleted.
+	 */
+	function delete_combined_files($combinedFileName = null) {
+		$combinedFiles = ($combinedFileName) ? array($combinedFileName => null) : array_merge($this->combine_files['css'], $this->combine_files['js']);
+		$combinedFolder = ($this->getCombinedFilesFolder()) ? (DOCROOT . $this->combinedFilesFolder) : DOCROOT . Kohana::config('upload.directory', FALSE);
+		foreach($combinedFiles as $combinedFile => $sourceItems) {
+			$filePath = $combinedFolder . '/' . $combinedFile;
+			if(file_exists($filePath)) {
+				unlink($filePath);
+			}
+		}
+	}
+	
+	function clear_combined_files() {
+		$this->combine_files = array('js' => array(), 'css' => array());
+	}
+
+	/**
+	 * See {@link combine_files()}
+	 *
+	 */
+	function process_combined_files($type = 'all') {
+		if( !$this->combined_files_enabled) {
+			return;
+		}
+		
+		switch ($type)
+		{
+			case 'js':
+				$this->_process_combined_files('js');
+				break;
+			case 'css':
+				$this->_process_combined_files('css');
+				break;
+			case 'all':
+			default:
+				$this->_process_combined_files('js');
+				$this->_process_combined_files('css');
+				break;
+		}
+	}
+
+	/**
+	 * See {@link combine_files()}
+	 *
+	 */
+	private function _process_combined_files($type) {
+		// Make a map of files that could be potentially combined
+		$combinerCheck = array();
+		foreach($this->combine_files[$type] as $combinedFile => $sourceItems) {
+			foreach($sourceItems as $id => $sourceItem) {
+				if(isset($combinerCheck[$sourceItem]) && $combinerCheck[$sourceItem] != $combinedFile){ 
+					Kohana::log('alert',"Requirements_Backend::process_combined_files - file '$sourceItem' appears in two combined files:" .	" '{$combinerCheck[$sourceItem]}' and '$combinedFile'");
+				}
+				$combinerCheck[$sourceItem] = $combinedFile;
+				$combinerCheck[$id] = $combinedFile;
+			}
+		}
+
+		// Work out the relative URL for the combined files from the base folder
+		$combinedFilesFolder = ($this->getCombinedFilesFolder()) ? ($this->getCombinedFilesFolder() . '/') : '';
+
+		// Figure out which ones apply to this pageview
+		$combinedFiles = array();
+		$newRequirements = array();
+		foreach($this->$type as $id => $params) {
+			$file = ($type == 'js') ? $params : $params['file'];
+			if(isset($combinerCheck[$file])) {
+				$newRequirements[$combinerCheck[$file]] = ($type == 'js') ? $combinedFilesFolder . $combinerCheck[$file] : array('file' => $combinedFilesFolder . $combinerCheck[$file]);
+				$combinedFiles[$combinerCheck[$file]] = true;
+			} elseif(isset($combinerCheck[$id])) {
+				$newRequirements[$combinerCheck[$id]] = ($type == 'js') ? $combinedFilesFolder . $combinerCheck[$id] : array('file' => $combinedFilesFolder . $combinerCheck[$id]);
+				$combinedFiles[$combinerCheck[$id]] = true;
+			} else {
+				$newRequirements[$id] = $params;
+			}
+		}
+
+		// Process the combined files
+		$base = DOCROOT;
+		foreach(array_diff_key($combinedFiles, $this->blocked) as $combinedFile => $dummy) {
+			$fileList = $this->combine_files[$type][$combinedFile];
+			$combinedFilePath = $base . $combinedFilesFolder . $combinedFile;
+
+			// Make the folder if necessary
+			if(!file_exists(dirname($combinedFilePath))) {
+				mkdir(dirname($combinedFilePath));
+			}
+
+			// If the file isn't writebale, don't even bother trying to make the combined file
+			// Complex test because is_writable fails if the file doesn't exist yet.
+			if((file_exists($combinedFilePath) && !is_writable($combinedFilePath)) ||
+				(!file_exists($combinedFilePath) && !is_writable(dirname($combinedFilePath)))) {
+				Kohana::log('alert', "Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'");
+				continue;
+			}
+
+			 // Determine if we need to build the combined include
+			if(file_exists($combinedFilePath) && !isset($_GET['flush'])) {
+				// file exists, check modification date of every contained file
+				$srcLastMod = 0;
+				foreach($fileList as $file) {
+					$srcLastMod = max(filemtime($base . $file), $srcLastMod);
+				}
+				$refresh = $srcLastMod > filemtime($combinedFilePath);
+			} else {
+				// file doesn't exist, or refresh was explicitly required
+				$refresh = true;
+			}
+
+			if(!$refresh) continue;
+
+			$combinedData = "";
+			foreach(array_diff($fileList, $this->blocked) as $id => $file) {
+				$fileContent = file_get_contents($base . $file);
+				// if we have a javascript file and jsmin is enabled, minify the content
+				if($type == 'js' && $this->combine_js_with_jsmin) {
+					//increase_time_limit_to();
+					$fileContent = JSMin::minify($fileContent);
+				}
+				// write a header comment for each file for easier identification and debugging
+				// also the semicolon between each file is required for jQuery to be combinable properly
+				$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n" . ($type == 'js' ? ';' : '') . "\n";
+			}
+
+			$successfulWrite = false;
+			$fh = fopen($combinedFilePath, 'wb');
+			if($fh) {
+				if(fwrite($fh, $combinedData) == strlen($combinedData)) $successfulWrite = true;
+				fclose($fh);
+				unset($fh);
+			}
+			
+			// Should we push this to the CDN too?
+			if (Kohana::config("cdn.cdn_store_dynamic_content") AND Kohana::config("requirements.cdn_store_combined_files"))
+			{
+				$cdn_combined_path = cdn::upload($combinedFilesFolder . $combinedFile, FALSE);
+			}
+
+			// Unsuccessful write - just include the regular JS files, rather than the combined one
+			if(!$successfulWrite) {
+				Kohana::log('alert', "Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'");
+				continue;
+			}
+		}
+
+		// @todo Alters the original information, which means you can't call this
+		// method repeatedly - it will behave different on the second call!
+		$this->$type = $newRequirements;
+	}
+	
+	function get_custom_scripts() {
 		$requirements = "";
 		
 		if($this->customJS) {
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index b98356884e..40c5d6febb 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -269,6 +269,55 @@ public function requirements()
 				'<!--[if IE]>'.html::script(url::file_loc('js').'media/js/jquery.bgiframe.min', TRUE).'<![endif]-->','jquery.bgiframe.min');
 		}
 		
+		// JS base combines
+		$base_js = array(
+			'media/js/jquery.js',
+			'media/js/jquery.ui.min.js',
+			'media/js/jquery.pngFix.pack.js',
+			'media/js/jquery.timeago.js',
+			'media/js/global.js',
+			//'media/js/OpenLayers.js',
+			//'media/js/ushahidi.js',
+			'media/js/jquery.treeview.js',
+			'media/js/selectToUISlider.jQuery.js',
+			'media/js/jquery.validate.min.js',
+			'media/js/colorpicker.js',
+		);
+		if ($this->timeline_enabled)
+		{
+			$base_js[] = 'media/js/jquery.jqplot.min.js';
+			$base_js[] = 'media/js/jqplot.dateAxisRenderer.min.js';
+		}
+		Requirements::combine_files('0_base.js', $base_js);
+		
+		// CSS base combines
+		$base_css = array(
+			'media/css/jquery-ui-themeroller.css',
+			'media/css/global.css',
+			'media/css/openlayers.css',
+			'media/css/jquery.treeview.css',
+			'media/css/colorpicker.css',
+		);
+		if ($this->timeline_enabled)
+		{
+			$base_css[] = 'media/css/jquery.jqplot.min.css';
+		}
+		Requirements::combine_files('0_base.css', $base_css);
+		
+		// JS admin combies
+		Requirements::combine_files('1_admin.js', array(
+			'media/js/jquery.form.js',
+			'media/js/jquery.base64.js',
+			'media/js/admin.js',
+			'media/js/jquery.hovertip-1.0.js',
+		));
+		
+		// CSS admin combines
+		Requirements::combine_files('1_admin.css', array(
+			'media/css/jquery.hovertip-1.0.css',
+			'media/css/admin.css'
+		));
+		
 		Event::run('ushahidi_action.themes_add_requirements_pre_theme', $this);
 		
 		if ($this->admin)
@@ -297,7 +346,7 @@ public function admin_requirements()
 		Requirements::js('media/js/jquery.validate.min.js');
 		Requirements::js('media/js/jquery.base64.js');
 		Requirements::js('media/js/admin.js');
-		Requirements::css('media/css/admin/all.css');
+		Requirements::css('media/css/admin.css');
 		Requirements::ieCSS("lt IE 7", 'media/css/ie6.css');
 	}
 	
diff --git a/application/libraries/cloudfiles/CF_Container.php b/application/libraries/cloudfiles/CF_Container.php
index 7673133c0e..dc47c17b3a 100644
--- a/application/libraries/cloudfiles/CF_Container.php
+++ b/application/libraries/cloudfiles/CF_Container.php
@@ -910,7 +910,7 @@ function delete_object($obj,$container=NULL)
      */
     function create_paths($path_name)
     {
-        if ($path_name[0] == '/') {
+        if (isset($path_name[0]) && $path_name[0] == '/') {
             $path_name = mb_substr($path_name, 0, 1);
         }
         $elements = explode('/', $path_name, -1);
diff --git a/application/libraries/cloudfiles/CF_Object.php b/application/libraries/cloudfiles/CF_Object.php
index bb7c4765b5..326b50ecd5 100644
--- a/application/libraries/cloudfiles/CF_Object.php
+++ b/application/libraries/cloudfiles/CF_Object.php
@@ -29,7 +29,7 @@ class CF_Object
      */
     function __construct(&$container, $name, $force_exists=False, $dohead=True)
     {
-        if ($name[0] == "/") {
+        if (isset($name[0]) && $name[0] == "/") {
             $r = "Object name '".$name;
             $r .= "' cannot contain begin with a '/' character.";
             throw new Kohana_Exception($r);
diff --git a/media/css/admin/all.css b/media/css/admin.css
similarity index 88%
rename from media/css/admin/all.css
rename to media/css/admin.css
index eca0d8ba9f..e6aab03a6d 100755
--- a/media/css/admin/all.css
+++ b/media/css/admin.css
@@ -89,7 +89,7 @@ a:hover{ text-decoration:none;}
 	font-size:12px;
 	color:#fff;
 	padding:0 3px 0 10px;
-	background:url(../../img/admin/top-separator.gif) no-repeat 0 8px;
+	background:url(../img/admin/top-separator.gif) no-repeat 0 8px;
 	display:inline;
 	list-style:none;
 }
@@ -222,7 +222,7 @@ ul.sub-nav  li a:hover{ text-decoration:underline;}
 
 /*-- content --*/
 #content{
-	background:url(../../img/admin/content-bg.gif) repeat-x;
+	background:url(../img/admin/content-bg.gif) repeat-x;
 	width:940px;
 	padding:10px 10px 0;
 	overflow:hidden;
@@ -259,7 +259,7 @@ ul.inf {
 	float:right;
 }
 ul.inf li{
-	background:url(../../img/admin/separator.gif) no-repeat 0 4px;
+	background:url(../img/admin/separator.gif) no-repeat 0 4px;
 	padding:0 7px 0 5px;
 	color:#898989;
 	float:left;
@@ -304,7 +304,7 @@ ul.inf li a{
 }
 .info-container .i-c-head ul li{
 	padding:0 10px 0 12px;
-	background:url(../../img/admin/separator.gif) no-repeat 0 3px;
+	background:url(../img/admin/separator.gif) no-repeat 0 3px;
 	float:left;
 	list-style:none;
 }
@@ -314,7 +314,7 @@ ul.inf li a{
 	width:12px;
 	height:12px;
 	text-indent:-3000px;
-	background:url(../../img/admin/icon-rss.gif) no-repeat;
+	background:url(../img/admin/icon-rss.gif) no-repeat;
 	overflow:hidden;
 }
 .post {
@@ -381,12 +381,12 @@ ul.post-info li a{
 	text-decoration:none;
 }
 
-ul.post-info li a.ok{ background:url(../../img/admin/icon-ok.gif) no-repeat 100% 3px;}
-ul.post-info li a.none{ background:url(../../img/admin/icon-none.gif) no-repeat 100% 3px;}
-ul.post-info li a.mail{ background:url(../../img/admin/icon-mail.gif) no-repeat 100% 3px;}
-ul.post-info li a.phone{ background:url(../../img/admin/icon-phone.gif) no-repeat 100% 2px;}
-ul.post-info li a.sms{ background:url(../../img/admin/icon-phone.gif) no-repeat 100% 2px;}
-ul.post-info li a.twitter{ background:url(../../img/admin/icon-twitter.gif) no-repeat 100% 2px;}
+ul.post-info li a.ok{ background:url(../img/admin/icon-ok.gif) no-repeat 100% 3px;}
+ul.post-info li a.none{ background:url(../img/admin/icon-none.gif) no-repeat 100% 3px;}
+ul.post-info li a.mail{ background:url(../img/admin/icon-mail.gif) no-repeat 100% 3px;}
+ul.post-info li a.phone{ background:url(../img/admin/icon-phone.gif) no-repeat 100% 2px;}
+ul.post-info li a.sms{ background:url(../img/admin/icon-phone.gif) no-repeat 100% 2px;}
+ul.post-info li a.twitter{ background:url(../img/admin/icon-twitter.gif) no-repeat 100% 2px;}
 .post  h4{
 	padding:9px 0 0;
 	font-weight:normal;
@@ -422,7 +422,7 @@ ul.nav-list {
 }
 ul.nav-list li{
 	padding:18px 0 19px;
-	background:url(../../img/admin/dots.gif) repeat-x 0 100%;
+	background:url(../img/admin/dots.gif) repeat-x 0 100%;
 	float:left;
 	width:395px;
 	list-style:none;
@@ -434,16 +434,16 @@ ul.nav-list li a{
 	line-height:20px;
 	color:#9b0000;
 }
-ul.nav-list li a.reports {background:url(../../img/admin/report-icon.gif) no-repeat 0 0;}
-ul.nav-list li a.categories { background:url(../../img/admin/category-icon.gif) no-repeat 0 5px;}
-ul.nav-list li a.locations { background:url(../../img/admin/locations-icon.gif) no-repeat 0 2px;}
-ul.nav-list li a.media { background:url(../../img/admin/media-icon.gif) no-repeat 0 2px;}
-ul.nav-list li a.messages { background:url(../../img/admin/messages-icon.gif) no-repeat 0 2px;}
-ul.nav-list li a.alerts { background:url(../../img/admin/alerts-icon.png) no-repeat 0 2px;}
-ul.nav-list li a.votes { background:url(../../img/admin/votes-icon.png) no-repeat 0 2px;}
-ul.nav-list li a.checkins { background:url(../../img/admin/checkins-icon.png) no-repeat 0 2px;}
+ul.nav-list li a.reports {background:url(../img/admin/report-icon.gif) no-repeat 0 0;}
+ul.nav-list li a.categories { background:url(../img/admin/category-icon.gif) no-repeat 0 5px;}
+ul.nav-list li a.locations { background:url(../img/admin/locations-icon.gif) no-repeat 0 2px;}
+ul.nav-list li a.media { background:url(../img/admin/media-icon.gif) no-repeat 0 2px;}
+ul.nav-list li a.messages { background:url(../img/admin/messages-icon.gif) no-repeat 0 2px;}
+ul.nav-list li a.alerts { background:url(../img/admin/alerts-icon.png) no-repeat 0 2px;}
+ul.nav-list li a.votes { background:url(../img/admin/votes-icon.png) no-repeat 0 2px;}
+ul.nav-list li a.checkins { background:url(../img/admin/checkins-icon.png) no-repeat 0 2px;}
 ul.nav-list li span.locations {
-	background:url(../../img/admin/locations-icon.gif) no-repeat 0 2px;
+	background:url(../img/admin/locations-icon.gif) no-repeat 0 2px;
 	padding:0 0 5px 40px;
 	float:left;
 	font-size:18px;
@@ -487,7 +487,7 @@ ul.nav-list li li strong{
 }
 /*-- footer --*/
 #footer{
-	background:#202020 url(../../img/admin/footer-bg.jpg) repeat-x;
+	background:#202020 url(../img/admin/footer-bg.jpg) repeat-x;
 	border-top:4px solid #cb0000;
 	border-bottom:4px solid #cb0000;
 	height:213px;
@@ -499,7 +499,7 @@ ul.nav-list li li strong{
 #footer a{
         
 	margin:34px 0 0 60px;
-	background:url(../../img/admin/logo.gif) no-repeat;
+	background:url(../img/admin/logo.gif) no-repeat;
 	width:257px;
 	height:39px;
 	display:block;
@@ -657,7 +657,7 @@ a.hide {
 	font-size:11px;
 	color:#b75f5f;
 	padding:0 0 0 43px;
-	background:url(../../img/admin/separator-1.gif) no-repeat 17px 3px;
+	background:url(../img/admin/separator-1.gif) no-repeat 17px 3px;
 }
 table{
 	margin:0;
@@ -709,7 +709,7 @@ table td{
 .table .col-2_sub{
 	width:519px;
 	padding-left:30px;
-	background:url(../../img/arrow-play.gif) no-repeat 13px 22px;
+	background:url(../img/arrow-play.gif) no-repeat 13px 22px;
 }
 .table .col-3{
 	width:103px;
@@ -733,7 +733,7 @@ table td{
 	background-color:#ffffcc;
 }
 .table .col-show-handle{
-	background-image: url(../../img/admin/drag.gif);
+	background-image: url(../img/admin/drag.gif);
 	background-repeat: no-repeat;
 	background-position: center center;
 	cursor: move;
@@ -782,7 +782,7 @@ ul.links li{
 }
 ul.info li {
 	padding:0 9px 0 10px;
-	background:url(../../img/admin/separator-2.gif) no-repeat 0 3px;
+	background:url(../img/admin/separator-2.gif) no-repeat 0 3px;
 }
 ul.info li.none-separator{ padding-left:0;}
 ul.info li strong {
@@ -804,7 +804,7 @@ ul.links li a:hover{
 }
 .table .col-4 ul li{
 	padding:0 10px 0 12px;
-	background:url(../../img/admin/separator.gif) no-repeat 0 4px;
+	background:url(../img/admin/separator.gif) no-repeat 0 4px;
 	float:left;
 	list-style:none;
 }
@@ -814,7 +814,7 @@ ul.links li a:hover{
 /*-- tooltips --*/
 .tooltip{
 	cursor: help;
-	background:url(../../img/tooltip.gif) no-repeat 100% 4px;
+	background:url(../img/tooltip.gif) no-repeat 100% 4px;
 	padding-right:10px;
 }
 a.tooltip{
@@ -985,7 +985,7 @@ a.calendar {
 	float:left;
 	width:22px;
 	height:21px;
-	background:url(../../img/icon-calendar.gif) no-repeat;
+	background:url(../img/icon-calendar.gif) no-repeat;
 }
 .time {
 	width:188px;
@@ -1011,7 +1011,7 @@ a.new-cat, a.show-messages {
 	text-decoration:underline;
 	font-size:10px;
 	padding:1px 0 0 18px;
-	background:url(../../img/icon-plus.gif) no-repeat 0 4px;
+	background:url(../img/icon-plus.gif) no-repeat 0 4px;
 	float:right;
 }
 a.new-cat:hover, a.show-messages:hover{ text-decoration:none;}
@@ -1019,7 +1019,7 @@ a.category_translations {
 	text-decoration:underline;
 	font-size:10px;
 	padding:5px 0 0 18px;
-	background:url(../../img/icon-plus.gif) no-repeat 0 4px;
+	background:url(../img/icon-plus.gif) no-repeat 0 4px;
 	float:left;
 	margin: 10px 10px 0 10px;
 }
@@ -1201,9 +1201,9 @@ a.rem{
 	width:13px;
 	height:13px;
 	float:left;
-	background:url(../../img/icon-plus.gif) no-repeat;
+	background:url(../img/icon-plus.gif) no-repeat;
 }
-a.rem { background:url(../../img/icon-minus.gif) no-repeat;}
+a.rem { background:url(../img/icon-minus.gif) no-repeat;}
 input.short {
 	width:50px;
 }
@@ -1660,7 +1660,7 @@ a.new-form_field{
 	font-size:11px;
 	font-weight:bold;
 	padding:1px 0 0 18px;
-	background:url(../../img/icon-plus.gif) no-repeat 0 2px;
+	background:url(../img/icon-plus.gif) no-repeat 0 2px;
 }
 .forms_item{
 	float:left;
@@ -1725,7 +1725,7 @@ a.new-form_field{
 	border:1px solid #fff;
 }
 .jColorSelect div{
-	background:url(../../img/icon_check.gif) no-repeat;
+	background:url(../img/icon_check.gif) no-repeat;
 	float:left;
 	width:13px;
 	height:13px;
@@ -2204,10 +2204,10 @@ ul.map-toggles li { display:none; float:right; list-style-type: none; }
 ul.map-toggles li a, 
 ul.map-toggles li a:active { display:inline-block; padding:3px 5px 3px 17px; outline:none; }
 
-	a.wider-map		{ background:transparent url(../../img/admin/icon_sprite.png) -4px -202px no-repeat;  }
-	a.taller-map	{ background:transparent url(../../img/admin/icon_sprite.png) -4px -221px no-repeat;  }
-	a.shorter-map	{ background:transparent url(../../img/admin/icon_sprite.png) -4px -241px no-repeat;  }
-	a.smaller-map	{ background:transparent url(../../img/admin/icon_sprite.png) -4px -182px no-repeat;  }
+	a.wider-map		{ background:transparent url(../img/admin/icon_sprite.png) -4px -202px no-repeat;  }
+	a.taller-map	{ background:transparent url(../img/admin/icon_sprite.png) -4px -221px no-repeat;  }
+	a.shorter-map	{ background:transparent url(../img/admin/icon_sprite.png) -4px -241px no-repeat;  }
+	a.smaller-map	{ background:transparent url(../img/admin/icon_sprite.png) -4px -182px no-repeat;  }
 	
 /* Map Labeler */	
 #geometryLabelerHolder{
@@ -2559,10 +2559,10 @@ div.dp-popup td.disabled {
 	margin: 4px 0 0 6px;
 }
 	.sort-ASC {
-		background: url(../../img/admin/drag.gif) 0 0 no-repeat;
+		background: url(../img/admin/drag.gif) 0 0 no-repeat;
 	}
 	.sort-DESC {
-		background: url(../../img/admin/drag.gif) 0 -8px no-repeat;
+		background: url(../img/admin/drag.gif) 0 -8px no-repeat;
 	}
 
 /* Report search form */

From 32f5e11e12e6bcf6f0ebcd74663b923449776c52 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Thu, 29 Nov 2012 12:01:12 +1300
Subject: [PATCH 24/30] Add support for -rtl.css files #261

* RTL languages are detected based on special core.text_direction
  i18n string
* If language is RTL we check for CSS files with the same name but a
  -rtl suffix
* Support -rtl versions of combined files too.
---
 application/config/locale.php          |  9 ++++++-
 application/helpers/ush_locale.php     | 19 ++++++++++++--
 application/libraries/Requirements.php | 35 ++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/application/config/locale.php b/application/config/locale.php
index 87ac931ee0..b692c00aae 100644
--- a/application/config/locale.php
+++ b/application/config/locale.php
@@ -19,4 +19,11 @@
  * Locale timezone. Defaults to use the server timezone.
  * @see http://php.net/timezones
  */
-$config['timezone'] = '';
\ No newline at end of file
+$config['timezone'] = '';
+
+/**
+ * Force text-direction to be either LTR or RTL
+ * Possible values: 'rtl' 'ltr' or FALSE
+ * @see Ush_Locale::is_rtl_language()
+ */
+$config['force_text_direction'] = FALSE;
diff --git a/application/helpers/ush_locale.php b/application/helpers/ush_locale.php
index 3c3ddd362e..6f55188580 100644
--- a/application/helpers/ush_locale.php
+++ b/application/helpers/ush_locale.php
@@ -213,6 +213,22 @@ public static function language($iso639)
 		}
 	}
 
+	/**
+	 * Is a language written Right-to-left
+	 * @param $locale
+	 */
+	public static function is_rtl_language($locale = NULL)
+	{
+		// Check for text direction override
+		if (Kohana::config('locale.force_text_direction') == 'rtl') return TRUE;
+		if (Kohana::config('locale.force_text_direction') == 'ltr') return FALSE;
+
+		// Check for special translation string 'ui_main.text_direction'
+		if (Kohana::lang('core.text_direction', $locale) == 'rtl') return TRUE;
+
+		return FALSE;
+	}
+
 	/**
 	 * @param   string	 ISO-3166 country code
 	 */
@@ -530,9 +546,8 @@ public static function get_i18n($refresh = FALSE)
 	
 	/**
 	 * Detect language from GET param, session or settings.
-	 * @param string 
 	 */
-	public static function detect_language($language = FALSE)
+	public static function detect_language()
 	{
 		// Locale form submitted?
 		if (isset($_GET['l']) && !empty($_GET['l']))
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index f401306b36..93244149cf 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -781,6 +781,17 @@ protected function path_for_file($fileOrUrl, $type) {
 			return $fileOrUrl;
 		} else {
 			if (file_exists(DOCROOT . $fileOrUrl)) {
+
+				// Check for RTL replacements
+				if ($type == 'css' AND ush_locale::is_rtl_language())
+				{
+					$rtlFile = substr($fileOrUrl, 0, strpos($fileOrUrl, ".$type")) . "-rtl" . substr($fileOrUrl, strpos($fileOrUrl, ".$type"));
+					if (file_exists(DOCROOT . $rtlFile))
+					{
+						$fileOrUrl = $rtlFile;
+					}
+				}
+				
 				// Get url prefix, either site base url or CDN url
 				$prefix = url::file_loc($type);
 				
@@ -975,6 +986,30 @@ private function _process_combined_files($type) {
 			$fileList = $this->combine_files[$type][$combinedFile];
 			$combinedFilePath = $base . $combinedFilesFolder . $combinedFile;
 
+			// Check for RTL alternatives
+			if ($type == 'css' AND ush_locale::is_rtl_language())
+			{
+				$has_rtl_files = FALSE;
+				foreach($fileList as $index => $file)
+				{
+					$rtlFile = substr($file, 0, strpos($file, ".$type")) . "-rtl" . substr($file, strpos($file, ".$type"));
+					if (file_exists(DOCROOT . $rtlFile))
+					{
+						$fileList[$index] = $rtlFile;
+						$has_rtl_files = TRUE;
+					}
+				}
+				
+				// Update combined files details, only if the include RTL alternatives
+				// We store the RTL version separate from the LTR version, so we don't regenerate every time someone changes language
+				if ($has_rtl_files)
+				{
+					$combinedFile = substr($combinedFile, 0, -4).'-rtl.css';
+					$combinedFilePath = $base . $combinedFilesFolder . $combinedFile;
+					$newRequirements[$combinedFile] = ($type == 'js') ? $combinedFilesFolder . $combinedFile : array('file' => $combinedFilesFolder . $combinedFile);
+				}
+			}
+
 			// Make the folder if necessary
 			if(!file_exists(dirname($combinedFilePath))) {
 				mkdir(dirname($combinedFilePath));

From c2f73b67cb9313655c037b72830cacc16490515b Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 30 Nov 2012 15:02:28 +1300
Subject: [PATCH 25/30] Combine the theme files

* Auto combine CSS files for themes
* Including the Minify_CSS_UriRewriter to fix url() links in theme css
* Include CSSMin to minify CSS files
* Add extra static call CSSMin::go()
---
 application/config/requirements.php           |   6 +
 application/libraries/CSSmin.php              | 741 ++++++++++++++++++
 .../libraries/Minify_CSS_UriRewriter.php      | 313 ++++++++
 application/libraries/Requirements.php        |  23 +-
 application/libraries/Themes.php              |   4 +
 5 files changed, 1086 insertions(+), 1 deletion(-)
 create mode 100644 application/libraries/CSSmin.php
 create mode 100644 application/libraries/Minify_CSS_UriRewriter.php

diff --git a/application/config/requirements.php b/application/config/requirements.php
index c96f3bc0a7..33798c5b07 100644
--- a/application/config/requirements.php
+++ b/application/config/requirements.php
@@ -20,6 +20,12 @@
  **/
 $config['combine_js_with_jsmin'] = TRUE;
 
+/**
+ * Using the CSSMin library to minify any
+ * css file passed to {@link combine_files()}.
+ **/
+$config['combine_css_with_cssmin'] = TRUE;
+
 /**
  * Enable auto uploading combined css/js to CDN
  **/
diff --git a/application/libraries/CSSmin.php b/application/libraries/CSSmin.php
new file mode 100644
index 0000000000..6741eeeccf
--- /dev/null
+++ b/application/libraries/CSSmin.php
@@ -0,0 +1,741 @@
+<?php
+
+/*!
+ * cssmin.php rev 91c5ea5
+ * Author: Tubal Martin - http://blog.margenn.com/
+ * Repo: https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port
+ *
+ * This is a PHP port of the Javascript port of the CSS minification tool
+ * distributed with YUICompressor, itself a port of the cssmin utility by
+ * Isaac Schlueter - http://foohack.com/
+ * Permission is hereby granted to use the PHP version under the same
+ * conditions as the YUICompressor.
+ */
+
+/*!
+ * YUI Compressor
+ * http://developer.yahoo.com/yui/compressor/
+ * Author: Julien Lecomte - http://www.julienlecomte.net/
+ * Copyright (c) 2011 Yahoo! Inc. All rights reserved.
+ * The copyrights embodied in the content of this file are licensed
+ * by Yahoo! Inc. under the BSD (revised) open source license.
+ */
+
+class CSSmin
+{
+    const NL = '___YUICSSMIN_PRESERVED_NL___';
+    const TOKEN = '___YUICSSMIN_PRESERVED_TOKEN_';
+    const COMMENT = '___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_';
+    const CLASSCOLON = '___YUICSSMIN_PSEUDOCLASSCOLON___';
+
+    private $comments;
+    private $preserved_tokens;
+    private $memory_limit;
+    private $max_execution_time;
+    private $pcre_backtrack_limit;
+    private $pcre_recursion_limit;
+    private $raise_php_limits;
+
+    /**
+     * Minify CSS
+     *
+     * @uses __construct()
+     * @uses min()
+     * @param string $js Javascript to be minified
+     * @return string
+     */
+    public static function go($css) {
+      $cssmin = new CSSMin();
+      return $cssmin->run($css);
+    }
+
+    /**
+     * @param bool|int $raise_php_limits
+     * If true, PHP settings will be raised if needed
+     */
+    public function __construct($raise_php_limits = TRUE)
+    {
+        // Set suggested PHP limits
+        $this->memory_limit = 128 * 1048576; // 128MB in bytes
+        $this->max_execution_time = 60; // 1 min
+        $this->pcre_backtrack_limit = 1000 * 1000;
+        $this->pcre_recursion_limit =  500 * 1000;
+
+        $this->raise_php_limits = (bool) $raise_php_limits;
+    }
+
+    /**
+     * Minify a string of CSS
+     * @param string $css
+     * @param int|bool $linebreak_pos
+     * @return string
+     */
+    public function run($css = '', $linebreak_pos = FALSE)
+    {
+        if (empty($css)) {
+            return '';
+        }
+
+        if ($this->raise_php_limits) {
+            $this->do_raise_php_limits();
+        }
+
+        $this->comments = array();
+        $this->preserved_tokens = array();
+
+        $start_index = 0;
+        $length = strlen($css);
+
+        $css = $this->extract_data_urls($css);
+
+        // collect all comment blocks...
+        while (($start_index = $this->index_of($css, '/*', $start_index)) >= 0) {
+            $end_index = $this->index_of($css, '*/', $start_index + 2);
+            if ($end_index < 0) {
+                $end_index = $length;
+            }
+            $comment_found = $this->str_slice($css, $start_index + 2, $end_index);
+            $this->comments[] = $comment_found;
+            $comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___';
+            $css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index);
+            // Set correct start_index: Fixes issue #2528130
+            $start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found);
+        }
+
+        // preserve strings so their content doesn't get accidentally minified
+        $css = preg_replace_callback('/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|'."(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S", array($this, 'replace_string'), $css);
+
+        // Let's divide css code in chunks of 25.000 chars aprox.
+        // Reason: PHP's PCRE functions like preg_replace have a "backtrack limit"
+        // of 100.000 chars by default (php < 5.3.7) so if we're dealing with really
+        // long strings and a (sub)pattern matches a number of chars greater than
+        // the backtrack limit number (i.e. /(.*)/s) PCRE functions may fail silently
+        // returning NULL and $css would be empty.
+        $charset = '';
+        $charset_regexp = '/@charset [^;]+;/i';
+        $css_chunks = array();
+        $css_chunk_length = 25000; // aprox size, not exact
+        $start_index = 0;
+        $i = $css_chunk_length; // save initial iterations
+        $l = strlen($css);
+
+
+        // if the number of characters is 25000 or less, do not chunk
+        if ($l <= $css_chunk_length) {
+            $css_chunks[] = $css;
+        } else {
+            // chunk css code securely
+            while ($i < $l) {
+                $i += 50; // save iterations. 500 checks for a closing curly brace }
+                if ($l - $start_index <= $css_chunk_length || $i >= $l) {
+                    $css_chunks[] = $this->str_slice($css, $start_index);
+                    break;
+                }
+                if ($css[$i - 1] === '}' && $i - $start_index > $css_chunk_length) {
+                    // If there are two ending curly braces }} separated or not by spaces,
+                    // join them in the same chunk (i.e. @media blocks)
+                    $next_chunk = substr($css, $i);
+                    if (preg_match('/^\s*\}/', $next_chunk)) {
+                        $i = $i + $this->index_of($next_chunk, '}') + 1;
+                    }
+
+                    $css_chunks[] = $this->str_slice($css, $start_index, $i);
+                    $start_index = $i;
+                }
+            }
+        }
+
+        // Minify each chunk
+        for ($i = 0, $n = count($css_chunks); $i < $n; $i++) {
+            $css_chunks[$i] = $this->minify($css_chunks[$i], $linebreak_pos);
+            // Keep the first @charset at-rule found
+            if (empty($charset) && preg_match($charset_regexp, $css_chunks[$i], $matches)) {
+                $charset = $matches[0];
+            }
+            // Delete all @charset at-rules
+            $css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]);
+        }
+
+        // Update the first chunk and push the charset to the top of the file.
+        $css_chunks[0] = $charset . $css_chunks[0];
+
+        return implode('', $css_chunks);
+    }
+
+    /**
+     * Sets the memory limit for this script
+     * @param int|string $limit
+     */
+    public function set_memory_limit($limit)
+    {
+        $this->memory_limit = $this->normalize_int($limit);
+    }
+
+    /**
+     * Sets the maximum execution time for this script
+     * @param int|string $seconds
+     */
+    public function set_max_execution_time($seconds)
+    {
+        $this->max_execution_time = (int) $seconds;
+    }
+
+    /**
+     * Sets the PCRE backtrack limit for this script
+     * @param int $limit
+     */
+    public function set_pcre_backtrack_limit($limit)
+    {
+        $this->pcre_backtrack_limit = (int) $limit;
+    }
+
+    /**
+     * Sets the PCRE recursion limit for this script
+     * @param int $limit
+     */
+    public function set_pcre_recursion_limit($limit)
+    {
+        $this->pcre_recursion_limit = (int) $limit;
+    }
+
+    /**
+     * Try to configure PHP to use at least the suggested minimum settings
+     */
+    private function do_raise_php_limits()
+    {
+        $php_limits = array(
+            'memory_limit' => $this->memory_limit,
+            'max_execution_time' => $this->max_execution_time,
+            'pcre.backtrack_limit' => $this->pcre_backtrack_limit,
+            'pcre.recursion_limit' =>  $this->pcre_recursion_limit
+        );
+
+        // If current settings are higher respect them.
+        foreach ($php_limits as $name => $suggested) {
+            $current = $this->normalize_int(ini_get($name));
+            // memory_limit exception: allow -1 for "no memory limit".
+            if ($current > -1 && ($suggested == -1 || $current < $suggested)) {
+                ini_set($name, $suggested);
+            }
+        }
+    }
+
+    /**
+     * Does bulk of the minification
+     * @param string $css
+     * @param int|bool $linebreak_pos
+     * @return string
+     */
+    private function minify($css, $linebreak_pos)
+    {
+        // strings are safe, now wrestle the comments
+        for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
+
+            $token = $this->comments[$i];
+            $placeholder = '/' . self::COMMENT . $i . '___/';
+
+            // ! in the first position of the comment means preserve
+            // so push to the preserved tokens keeping the !
+            if (substr($token, 0, 1) === '!') {
+                $this->preserved_tokens[] = $token;
+                $token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+                $css = preg_replace($placeholder, $token_tring, $css, 1);
+                // Preserve new lines for /*! important comments
+                $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css);
+                $css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/S', '$1'.self::NL, $css);
+                continue;
+            }
+
+            // \ in the last position looks like hack for Mac/IE5
+            // shorten that to /*\*/ and the next one to /**/
+            if (substr($token, (strlen($token) - 1), 1) === '\\') {
+                $this->preserved_tokens[] = '\\';
+                $css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                $i = $i + 1; // attn: advancing the loop
+                $this->preserved_tokens[] = '';
+                $css = preg_replace('/' . self::COMMENT . $i . '___/',  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                continue;
+            }
+
+            // keep empty comments after child selectors (IE7 hack)
+            // e.g. html >/**/ body
+            if (strlen($token) === 0) {
+                $start_index = $this->index_of($css, $this->str_slice($placeholder, 1, -1));
+                if ($start_index > 2) {
+                    if (substr($css, $start_index - 3, 1) === '>') {
+                        $this->preserved_tokens[] = '';
+                        $css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                    }
+                }
+            }
+
+            // in all other cases kill the comment
+            $css = preg_replace('/\/\*' . $this->str_slice($placeholder, 1, -1) . '\*\//', '', $css, 1);
+        }
+
+
+        // Normalize all whitespace strings to single spaces. Easier to work with that way.
+        $css = preg_replace('/\s+/', ' ', $css);
+
+        // Shorten & preserve calculations calc(...) since spaces are important
+        $css = preg_replace_callback('/calc(\((?:[^\(\)]+|(?1))*\))/i', array($this, 'replace_calc'), $css);
+
+        // Replace positive sign from numbers preceded by : or a white-space before the leading space is removed
+        // +1.2em to 1.2em, +.8px to .8px, +2% to 2%
+        $css = preg_replace('/((?<!\\\\)\:|\s)\+(\.?\d+)/S', '$1$2', $css);
+
+        // Remove leading zeros from integer and float numbers preceded by : or a white-space
+        // 000.6 to .6, -0.8 to -.8, 0050 to 50, -01.05 to -1.05
+        $css = preg_replace('/((?<!\\\\)\:|\s)(\-?)0+(\.?\d+)/S', '$1$2$3', $css);
+
+        // Remove trailing zeros from float numbers preceded by : or a white-space
+        // -6.0100em to -6.01em, .0100 to .01, 1.200px to 1.2px
+        $css = preg_replace('/((?<!\\\\)\:|\s)(\-?)(\d?\.\d+?)0+([^\d])/S', '$1$2$3$4', $css);
+
+        // Remove trailing .0 -> -9.0 to -9
+        $css = preg_replace('/((?<!\\\\)\:|\s)(\-?\d+)\.0([^\d])/S', '$1$2$3', $css);
+
+        // Replace 0 length numbers with 0
+        $css = preg_replace('/((?<!\\\\)\:|\s)\-?\.?0+([^\d])/S', '${1}0$2', $css);
+
+        // Remove the spaces before the things that should not have spaces before them.
+        // But, be careful not to turn "p :link {...}" into "p:link{...}"
+        // Swap out any pseudo-class colons with the token, and then swap back.
+        $css = preg_replace_callback('/(?:^|\})(?:(?:[^\{\:])+\:)+(?:[^\{]*\{)/', array($this, 'replace_colon'), $css);
+        $css = preg_replace('/\s+([\!\{\}\;\:\>\+\(\)\]\~\=,])/', '$1', $css);
+        $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css);
+
+        // retain space for special IE6 cases
+        $css = preg_replace('/\:first\-(line|letter)(\{|,)/i', ':first-$1 $2', $css);
+
+        // no space after the end of a preserved comment
+        $css = preg_replace('/\*\/ /', '*/', $css);
+
+        // Put the space back in some cases, to support stuff like
+        // @media screen and (-webkit-min-device-pixel-ratio:0){
+        $css = preg_replace('/\band\(/i', 'and (', $css);
+
+        // Remove the spaces after the things that should not have spaces after them.
+        $css = preg_replace('/([\!\{\}\:;\>\+\(\[\~\=,])\s+/S', '$1', $css);
+
+        // remove unnecessary semicolons
+        $css = preg_replace('/;+\}/', '}', $css);
+
+        // Fix for issue: #2528146
+        // Restore semicolon if the last property is prefixed with a `*` (lte IE7 hack)
+        // to avoid issues on Symbian S60 3.x browsers.
+        $css = preg_replace('/(\*[a-z0-9\-]+\s*\:[^;\}]+)(\})/', '$1;$2', $css);
+
+        // Replace 0 length units 0(px,em,%) with 0.
+        $css = preg_replace('/((?<!\\\\)\:|\s)\-?0(?:em|ex|ch|rem|vw|vh|vm|vmin|cm|mm|in|px|pt|pc|%)/iS', '${1}0', $css);
+
+        // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0.
+        $css = preg_replace('/\:0(?: 0){1,3}(;|\})/', ':0$1', $css);
+
+        // Fix for issue: #2528142
+        // Replace text-shadow:0; with text-shadow:0 0 0;
+        $css = preg_replace('/(text-shadow\:0)(;|\})/ie', "strtolower('$1 0 0$2')", $css);
+
+        // Replace background-position:0; with background-position:0 0;
+        // same for transform-origin
+        $css = preg_replace('/(background\-position|(?:webkit|moz|o|ms|)\-?transform\-origin)\:0(;|\})/ieS', "strtolower('$1:0 0$2')", $css);
+
+        // Shorten colors from rgb(51,102,153) to #336699, rgb(100%,0%,0%) to #ff0000 (sRGB color space)
+        // Shorten colors from hsl(0, 100%, 50%) to #ff0000 (sRGB color space)
+        // This makes it more likely that it'll get further compressed in the next step.
+        $css = preg_replace_callback('/rgb\s*\(\s*([0-9,\s\-\.\%]+)\s*\)(.{1})/i', array($this, 'rgb_to_hex'), $css);
+        $css = preg_replace_callback('/hsl\s*\(\s*([0-9,\s\-\.\%]+)\s*\)(.{1})/i', array($this, 'hsl_to_hex'), $css);
+
+        // Shorten colors from #AABBCC to #ABC or short color name.
+        $css = $this->compress_hex_colors($css);
+
+        // border: none to border:0, outline: none to outline:0
+        $css = preg_replace('/(border\-?(?:top|right|bottom|left|)|outline)\:none(;|\})/ieS', "strtolower('$1:0$2')", $css);
+
+        // shorter opacity IE filter
+        $css = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $css);
+
+        // Remove empty rules.
+        $css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css);
+
+        // Some source control tools don't like it when files containing lines longer
+        // than, say 8000 characters, are checked in. The linebreak option is used in
+        // that case to split long lines after a specific column.
+        if ($linebreak_pos !== FALSE && (int) $linebreak_pos >= 0) {
+            $linebreak_pos = (int) $linebreak_pos;
+            $start_index = $i = 0;
+            while ($i < strlen($css)) {
+                $i++;
+                if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) {
+                    $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i);
+                    $start_index = $i;
+                }
+            }
+        }
+
+        // Replace multiple semi-colons in a row by a single one
+        // See SF bug #1980989
+        $css = preg_replace('/;;+/', ';', $css);
+
+        // Restore new lines for /*! important comments
+        $css = preg_replace('/'. self::NL .'/', "\n", $css);
+
+        // restore preserved comments and strings
+        for ($i = 0, $max = count($this->preserved_tokens); $i < $max; $i++) {
+            $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
+        }
+
+        // Trim the final string (for any leading or trailing white spaces)
+        return trim($css);
+    }
+
+    /**
+     * Utility method to replace all data urls with tokens before we start
+     * compressing, to avoid performance issues running some of the subsequent
+     * regexes against large strings chunks.
+     *
+     * @param string $css
+     * @return string
+     */
+    private function extract_data_urls($css)
+    {
+        // Leave data urls alone to increase parse performance.
+        $max_index = strlen($css) - 1;
+        $append_index = $index = $last_index = $offset = 0;
+        $sb = array();
+        $pattern = '/url\(\s*(["\']?)data\:/i';
+
+        // Since we need to account for non-base64 data urls, we need to handle
+        // ' and ) being part of the data string. Hence switching to indexOf,
+        // to determine whether or not we have matching string terminators and
+        // handling sb appends directly, instead of using matcher.append* methods.
+
+        while (preg_match($pattern, $css, $m, 0, $offset)) {
+            $index = $this->index_of($css, $m[0], $offset);
+            $last_index = $index + strlen($m[0]);
+            $start_index = $index + 4; // "url(".length()
+            $end_index = $last_index - 1;
+            $terminator = $m[1]; // ', " or empty (not quoted)
+            $found_terminator = FALSE;
+
+            if (strlen($terminator) === 0) {
+                $terminator = ')';
+            }
+
+            while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
+                $end_index = $this->index_of($css, $terminator, $end_index + 1);
+
+                // endIndex == 0 doesn't really apply here
+                if ($end_index > 0 && substr($css, $end_index - 1, 1) !== '\\') {
+                    $found_terminator = TRUE;
+                    if (')' != $terminator) {
+                        $end_index = $this->index_of($css, ')', $end_index);
+                    }
+                }
+            }
+
+            // Enough searching, start moving stuff over to the buffer
+            $sb[] = $this->substring($css, $append_index, $index);
+
+            if ($found_terminator) {
+                $token = $this->substring($css, $start_index, $end_index);
+                $token = preg_replace('/\s+/', '', $token);
+                $this->preserved_tokens[] = $token;
+
+                $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
+                $sb[] = $preserver;
+
+                $append_index = $end_index + 1;
+            } else {
+                // No end terminator found, re-add the whole match. Should we throw/warn here?
+                $sb[] = $this->substring($css, $index, $last_index);
+                $append_index = $last_index;
+            }
+
+            $offset = $last_index;
+        }
+
+        $sb[] = $this->substring($css, $append_index);
+
+        return implode('', $sb);
+    }
+
+    /**
+     * Utility method to compress hex color values of the form #AABBCC to #ABC or short color name.
+     *
+     * DOES NOT compress CSS ID selectors which match the above pattern (which would break things).
+     * e.g. #AddressForm { ... }
+     *
+     * DOES NOT compress IE filters, which have hex color values (which would break things).
+     * e.g. filter: chroma(color="#FFFFFF");
+     *
+     * DOES NOT compress invalid hex values.
+     * e.g. background-color: #aabbccdd
+     *
+     * @param string $css
+     * @return string
+     */
+    private function compress_hex_colors($css)
+    {
+        // Look for hex colors inside { ... } (to avoid IDs) and which don't have a =, or a " in front of them (to avoid filters)
+        $pattern = '/(\=\s*?["\']?)?#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])(\}|[^0-9a-f{][^{]*?\})/iS';
+        $_index = $index = $last_index = $offset = 0;
+        $sb = array();
+        // See: http://ajaxmin.codeplex.com/wikipage?title=CSS%20Colors
+        $short_safe = array(
+            '#808080' => 'gray',
+            '#008000' => 'green',
+            '#800000' => 'maroon',
+            '#000080' => 'navy',
+            '#808000' => 'olive',
+            '#800080' => 'purple',
+            '#c0c0c0' => 'silver',
+            '#008080' => 'teal',
+            '#f00' => 'red'
+        );
+
+        while (preg_match($pattern, $css, $m, 0, $offset)) {
+            $index = $this->index_of($css, $m[0], $offset);
+            $last_index = $index + strlen($m[0]);
+            $is_filter = (bool) $m[1];
+
+            $sb[] = $this->substring($css, $_index, $index);
+
+            if ($is_filter) {
+                // Restore, maintain case, otherwise filter will break
+                $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
+            } else {
+                if (strtolower($m[2]) == strtolower($m[3]) &&
+                    strtolower($m[4]) == strtolower($m[5]) &&
+                    strtolower($m[6]) == strtolower($m[7])) {
+                    // Compress.
+                    $hex = '#' . strtolower($m[3] . $m[5] . $m[7]);
+                } else {
+                    // Non compressible color, restore but lower case.
+                    $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
+                }
+                // replace Hex colors to short safe color names
+                $sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex;
+            }
+
+            $_index = $offset = $last_index - strlen($m[8]);
+        }
+
+        $sb[] = $this->substring($css, $_index);
+
+        return implode('', $sb);
+    }
+
+    /* CALLBACKS
+     * ---------------------------------------------------------------------------------------------
+     */
+
+    private function replace_string($matches)
+    {
+        $match = $matches[0];
+        $quote = substr($match, 0, 1);
+        // Must use addcslashes in PHP to avoid parsing of backslashes
+        $match = addcslashes($this->str_slice($match, 1, -1), '\\');
+
+        // maybe the string contains a comment-like substring?
+        // one, maybe more? put'em back then
+        if (($pos = $this->index_of($match, self::COMMENT)) >= 0) {
+            for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
+                $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1);
+            }
+        }
+
+        // minify alpha opacity in filter strings
+        $match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match);
+
+        $this->preserved_tokens[] = $match;
+        return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote;
+    }
+
+    private function replace_colon($matches)
+    {
+        return preg_replace('/\:/', self::CLASSCOLON, $matches[0]);
+    }
+
+    private function replace_calc($matches)
+    {
+        $this->preserved_tokens[] = preg_replace('/\s?([\*\/\(\),])\s?/', '$1', $matches[0]);
+        return self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+    }
+
+    private function rgb_to_hex($matches)
+    {
+        // Support for percentage values rgb(100%, 0%, 45%);
+        if ($this->index_of($matches[1], '%') >= 0){
+            $rgbcolors = explode(',', str_replace('%', '', $matches[1]));
+            for ($i = 0; $i < count($rgbcolors); $i++) {
+                $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
+            }
+        } else {
+            $rgbcolors = explode(',', $matches[1]);
+        }
+
+        // Values outside the sRGB color space should be clipped (0-255)
+        for ($i = 0; $i < count($rgbcolors); $i++) {
+            $rgbcolors[$i] = $this->clamp_number(intval($rgbcolors[$i], 10), 0, 255);
+            $rgbcolors[$i] = sprintf("%02x", $rgbcolors[$i]);
+        }
+
+        // Fix for issue #2528093
+        if (!preg_match('/[\s\,\);\}]/', $matches[2])){
+            $matches[2] = ' ' . $matches[2];
+        }
+
+        return '#' . implode('', $rgbcolors) . $matches[2];
+    }
+
+    private function hsl_to_hex($matches)
+    {
+        $values = explode(',', str_replace('%', '', $matches[1]));
+        $h = floatval($values[0]);
+        $s = floatval($values[1]);
+        $l = floatval($values[2]);
+
+        // Wrap and clamp, then fraction!
+        $h = ((($h % 360) + 360) % 360) / 360;
+        $s = $this->clamp_number($s, 0, 100) / 100;
+        $l = $this->clamp_number($l, 0, 100) / 100;
+
+        if ($s == 0) {
+            $r = $g = $b = $this->round_number(255 * $l);
+        } else {
+            $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
+            $v1 = (2 * $l) - $v2;
+            $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
+            $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
+            $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
+        }
+
+        return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
+    }
+
+    /* HELPERS
+     * ---------------------------------------------------------------------------------------------
+     */
+
+    private function hue_to_rgb($v1, $v2, $vh)
+    {
+        $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
+        if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
+        if ($vh * 2 < 1) return $v2;
+        if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+        return $v1;
+    }
+
+    private function round_number($n)
+    {
+        return intval(floor(floatval($n) + 0.5), 10);
+    }
+
+    private function clamp_number($n, $min, $max)
+    {
+        return min(max($n, $min), $max);
+    }
+
+    /**
+     * PHP port of Javascript's "indexOf" function for strings only
+     * Author: Tubal Martin http://blog.margenn.com
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @param int    $offset index (optional)
+     * @return int
+     */
+    private function index_of($haystack, $needle, $offset = 0)
+    {
+        $index = strpos($haystack, $needle, $offset);
+
+        return ($index !== FALSE) ? $index : -1;
+    }
+
+    /**
+     * PHP port of Javascript's "substring" function
+     * Author: Tubal Martin http://blog.margenn.com
+     * Tests: http://margenn.com/tubal/substring/
+     *
+     * @param string   $str
+     * @param int      $from index
+     * @param int|bool $to index (optional)
+     * @return string
+     */
+    private function substring($str, $from = 0, $to = FALSE)
+    {
+        if ($to !== FALSE) {
+            if ($from == $to || ($from <= 0 && $to < 0)) {
+                return '';
+            }
+
+            if ($from > $to) {
+                $from_copy = $from;
+                $from = $to;
+                $to = $from_copy;
+            }
+        }
+
+        if ($from < 0) {
+            $from = 0;
+        }
+
+        $substring = ($to === FALSE) ? substr($str, $from) : substr($str, $from, $to - $from);
+        return ($substring === FALSE) ? '' : $substring;
+    }
+
+    /**
+     * PHP port of Javascript's "slice" function for strings only
+     * Author: Tubal Martin http://blog.margenn.com
+     * Tests: http://margenn.com/tubal/str_slice/
+     *
+     * @param string   $str
+     * @param int      $start index
+     * @param int|bool $end index (optional)
+     * @return string
+     */
+    private function str_slice($str, $start = 0, $end = FALSE)
+    {
+        if ($end !== FALSE && ($start < 0 || $end <= 0)) {
+            $max = strlen($str);
+
+            if ($start < 0) {
+                if (($start = $max + $start) < 0) {
+                    return '';
+                }
+            }
+
+            if ($end < 0) {
+                if (($end = $max + $end) < 0) {
+                    return '';
+                }
+            }
+
+            if ($end <= $start) {
+                return '';
+            }
+        }
+
+        $slice = ($end === FALSE) ? substr($str, $start) : substr($str, $start, $end - $start);
+        return ($slice === FALSE) ? '' : $slice;
+    }
+
+    /**
+     * Convert strings like "64M" or "30" to int values
+     * @param mixed $size
+     * @return int
+     */
+    private function normalize_int($size)
+    {
+        if (is_string($size)) {
+            switch (substr($size, -1)) {
+                case 'M': case 'm': return $size * 1048576;
+                case 'K': case 'k': return $size * 1024;
+                case 'G': case 'g': return $size * 1073741824;
+            }
+        }
+
+        return (int) $size;
+    }
+}
\ No newline at end of file
diff --git a/application/libraries/Minify_CSS_UriRewriter.php b/application/libraries/Minify_CSS_UriRewriter.php
new file mode 100644
index 0000000000..d960e0e519
--- /dev/null
+++ b/application/libraries/Minify_CSS_UriRewriter.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * Class Minify_CSS_UriRewriter  
+ * @package Minify
+ * @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved.
+ * @license http://opensource.org/licenses/bsd-license.php  New BSD License
+ * @link http://code.google.com/p/minify/
+ */
+
+/**
+ * Rewrite file-relative URIs as root-relative in CSS files
+ *
+ * @package Minify
+ * @author Stephen Clay <steve@mrclay.org>
+ */
+class Minify_CSS_UriRewriter {
+    
+    /**
+     * rewrite() and rewriteRelative() append debugging information here
+     *
+     * @var string
+     */
+    public static $debugText = '';
+    
+    /**
+     * In CSS content, rewrite file relative URIs as root relative
+     * 
+     * @param string $css
+     * 
+     * @param string $currentDir The directory of the current CSS file.
+     * 
+     * @param string $docRoot The document root of the web site in which 
+     * the CSS file resides (default = $_SERVER['DOCUMENT_ROOT']).
+     * 
+     * @param array $symlinks (default = array()) If the CSS file is stored in 
+     * a symlink-ed directory, provide an array of link paths to
+     * target paths, where the link paths are within the document root. Because 
+     * paths need to be normalized for this to work, use "//" to substitute 
+     * the doc root in the link paths (the array keys). E.g.:
+     * <code>
+     * array('//symlink' => '/real/target/path') // unix
+     * array('//static' => 'D:\\staticStorage')  // Windows
+     * </code>
+     * 
+     * @return string
+     */
+    public static function rewrite($css, $currentDir, $docRoot = null, $symlinks = array()) 
+    {
+        self::$_docRoot = self::_realpath(
+            $docRoot ? $docRoot : $_SERVER['DOCUMENT_ROOT']
+        );
+        self::$_currentDir = self::_realpath($currentDir);
+        self::$_symlinks = array();
+        
+        // normalize symlinks
+        foreach ($symlinks as $link => $target) {
+            $link = ($link === '//')
+                ? self::$_docRoot
+                : str_replace('//', self::$_docRoot . '/', $link);
+            $link = strtr($link, '/', DIRECTORY_SEPARATOR);
+            self::$_symlinks[$link] = self::_realpath($target);
+        }
+        
+        self::$debugText .= "docRoot    : " . self::$_docRoot . "\n"
+                          . "currentDir : " . self::$_currentDir . "\n";
+        if (self::$_symlinks) {
+            self::$debugText .= "symlinks : " . var_export(self::$_symlinks, 1) . "\n";
+        }
+        self::$debugText .= "\n";
+        
+        $css = self::_trimUrls($css);
+        
+        // rewrite
+        $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
+            ,array(self::$className, '_processUriCB'), $css);
+        $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+            ,array(self::$className, '_processUriCB'), $css);
+
+        return $css;
+    }
+    
+    /**
+     * In CSS content, prepend a path to relative URIs
+     * 
+     * @param string $css
+     * 
+     * @param string $path The path to prepend.
+     * 
+     * @return string
+     */
+    public static function prepend($css, $path)
+    {
+        self::$_prependPath = $path;
+        
+        $css = self::_trimUrls($css);
+        
+        // append
+        $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
+            ,array(self::$className, '_processUriCB'), $css);
+        $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+            ,array(self::$className, '_processUriCB'), $css);
+
+        self::$_prependPath = null;
+        return $css;
+    }
+    
+    /**
+     * Get a root relative URI from a file relative URI
+     *
+     * <code>
+     * Minify_CSS_UriRewriter::rewriteRelative(
+     *       '../img/hello.gif'
+     *     , '/home/user/www/css'  // path of CSS file
+     *     , '/home/user/www'      // doc root
+     * );
+     * // returns '/img/hello.gif'
+     * 
+     * // example where static files are stored in a symlinked directory
+     * Minify_CSS_UriRewriter::rewriteRelative(
+     *       'hello.gif'
+     *     , '/var/staticFiles/theme'
+     *     , '/home/user/www'
+     *     , array('/home/user/www/static' => '/var/staticFiles')
+     * );
+     * // returns '/static/theme/hello.gif'
+     * </code>
+     * 
+     * @param string $uri file relative URI
+     * 
+     * @param string $realCurrentDir realpath of the current file's directory.
+     * 
+     * @param string $realDocRoot realpath of the site document root.
+     * 
+     * @param array $symlinks (default = array()) If the file is stored in 
+     * a symlink-ed directory, provide an array of link paths to
+     * real target paths, where the link paths "appear" to be within the document 
+     * root. E.g.:
+     * <code>
+     * array('/home/foo/www/not/real/path' => '/real/target/path') // unix
+     * array('C:\\htdocs\\not\\real' => 'D:\\real\\target\\path')  // Windows
+     * </code>
+     * 
+     * @return string
+     */
+    public static function rewriteRelative($uri, $realCurrentDir, $realDocRoot, $symlinks = array())
+    {
+        // prepend path with current dir separator (OS-independent)
+        $path = strtr($realCurrentDir, '/', DIRECTORY_SEPARATOR)  
+            . DIRECTORY_SEPARATOR . strtr($uri, '/', DIRECTORY_SEPARATOR);
+        
+        self::$debugText .= "file-relative URI  : {$uri}\n"
+                          . "path prepended     : {$path}\n";
+        
+        // "unresolve" a symlink back to doc root
+        foreach ($symlinks as $link => $target) {
+            if (0 === strpos($path, $target)) {
+                // replace $target with $link
+                $path = $link . substr($path, strlen($target));
+                
+                self::$debugText .= "symlink unresolved : {$path}\n";
+                
+                break;
+            }
+        }
+        // strip doc root
+        $path = substr($path, strlen($realDocRoot));
+        
+        self::$debugText .= "docroot stripped   : {$path}\n";
+        
+        // fix to root-relative URI
+        $uri = strtr($path, '/\\', '//');
+        $uri = self::removeDots($uri);
+      
+        self::$debugText .= "traversals removed : {$uri}\n\n";
+        
+        return $uri;
+    }
+
+    /**
+     * Remove instances of "./" and "../" where possible from a root-relative URI
+     *
+     * @param string $uri
+     *
+     * @return string
+     */
+    public static function removeDots($uri)
+    {
+        $uri = str_replace('/./', '/', $uri);
+        // inspired by patch from Oleg Cherniy
+        do {
+            $uri = preg_replace('@/[^/]+/\\.\\./@', '/', $uri, 1, $changed);
+        } while ($changed);
+        return $uri;
+    }
+    
+    /**
+     * Defines which class to call as part of callbacks, change this
+     * if you extend Minify_CSS_UriRewriter
+     *
+     * @var string
+     */
+    protected static $className = 'Minify_CSS_UriRewriter';
+
+    /**
+     * Get realpath with any trailing slash removed. If realpath() fails,
+     * just remove the trailing slash.
+     * 
+     * @param string $path
+     * 
+     * @return mixed path with no trailing slash
+     */
+    protected static function _realpath($path)
+    {
+        $realPath = realpath($path);
+        if ($realPath !== false) {
+            $path = $realPath;
+        }
+        return rtrim($path, '/\\');
+    }
+
+    /**
+     * Directory of this stylesheet
+     *
+     * @var string
+     */
+    private static $_currentDir = '';
+
+    /**
+     * DOC_ROOT
+     *
+     * @var string
+     */
+    private static $_docRoot = '';
+
+    /**
+     * directory replacements to map symlink targets back to their
+     * source (within the document root) E.g. '/var/www/symlink' => '/var/realpath'
+     *
+     * @var array
+     */
+    private static $_symlinks = array();
+
+    /**
+     * Path to prepend
+     *
+     * @var string
+     */
+    private static $_prependPath = null;
+
+    /**
+     * @param string $css
+     *
+     * @return string
+     */
+    private static function _trimUrls($css)
+    {
+        return preg_replace('/
+            url\\(      # url(
+            \\s*
+            ([^\\)]+?)  # 1 = URI (assuming does not contain ")")
+            \\s*
+            \\)         # )
+        /x', 'url($1)', $css);
+    }
+
+    /**
+     * @param array $m
+     *
+     * @return string
+     */
+    private static function _processUriCB($m)
+    {
+        // $m matched either '/@import\\s+([\'"])(.*?)[\'"]/' or '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+        $isImport = ($m[0][0] === '@');
+        // determine URI and the quote character (if any)
+        if ($isImport) {
+            $quoteChar = $m[1];
+            $uri = $m[2];
+        } else {
+            // $m[1] is either quoted or not
+            $quoteChar = ($m[1][0] === "'" || $m[1][0] === '"')
+                ? $m[1][0]
+                : '';
+            $uri = ($quoteChar === '')
+                ? $m[1]
+                : substr($m[1], 1, strlen($m[1]) - 2);
+        }
+        // analyze URI
+        if ('/' !== $uri[0]                  // root-relative
+            && false === strpos($uri, '//')  // protocol (non-data)
+            && 0 !== strpos($uri, 'data:')   // data protocol
+        ) {
+            // URI is file-relative: rewrite depending on options
+            if (self::$_prependPath === null) {
+                $uri = self::rewriteRelative($uri, self::$_currentDir, self::$_docRoot, self::$_symlinks);
+            } else {
+                $uri = self::$_prependPath . $uri;
+                if ($uri[0] === '/') {
+                    $root = '';
+                    $rootRelative = $uri;
+                    $uri = $root . self::removeDots($rootRelative);
+                } elseif (preg_match('@^((https?\:)?//([^/]+))/@', $uri, $m) && (false !== strpos($m[3], '.'))) {
+                    $root = $m[1];
+                    $rootRelative = substr($uri, strlen($root));
+                    $uri = $root . self::removeDots($rootRelative);
+                }
+            }
+        }
+        return $isImport
+            ? "@import {$quoteChar}{$uri}{$quoteChar}"
+            : "url({$quoteChar}{$uri}{$quoteChar})";
+    }
+}
diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index 93244149cf..6e5e63a6fe 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -412,6 +412,15 @@ class Requirements_Backend {
 	 * @var boolean
 	 */
 	public $combine_js_with_jsmin = true;
+	
+
+	/**
+	 * Using the CSSMin library to minify any
+	 * css file passed to {@link combine_files()}.
+	 *
+	 * @var boolean
+	 */
+	public $combine_css_with_cssmin = true;
 
 	/**
 	 * @var string By default, combined files are stored in assets/_combinedfiles.
@@ -438,6 +447,7 @@ public function __construct()
 	{
 		// Set up defaults from config file
 		$this->combine_js_with_jsmin = Kohana::config('requirements.combine_js_with_jsmin');
+		$this->combine_css_with_cssmin = Kohana::config('requirements.combine_css_with_cssmin');
 		$this->set_suffix_requirements(Kohana::config('requirements.suffix_requirements'));
 		$this->set_combined_files_enabled(Kohana::config('requirements.combined_files_enabled'));
 	}
@@ -1041,11 +1051,22 @@ private function _process_combined_files($type) {
 			$combinedData = "";
 			foreach(array_diff($fileList, $this->blocked) as $id => $file) {
 				$fileContent = file_get_contents($base . $file);
+				
 				// if we have a javascript file and jsmin is enabled, minify the content
 				if($type == 'js' && $this->combine_js_with_jsmin) {
-					//increase_time_limit_to();
 					$fileContent = JSMin::minify($fileContent);
 				}
+				
+				if($type == 'css') {
+					// Rewrite urls in css to be relative to the docroot
+					$fileContent = Minify_CSS_UriRewriter::rewrite($fileContent, pathinfo($base . $file, PATHINFO_DIRNAME), DOCROOT);
+					// compress css (if enabled)
+					if ($this->combine_css_with_cssmin)
+					{
+						$fileContent = CSSMin::go($fileContent);
+					}
+				}
+				
 				// write a header comment for each file for easier identification and debugging
 				// also the semicolon between each file is required for jQuery to be combinable properly
 				$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n" . ($type == 'js' ? ';' : '') . "\n";
diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 40c5d6febb..5e21e4bc1b 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -364,12 +364,16 @@ public function frontend_requirements()
 			Requirements::css($css);
 		}
 		
+		Requirements::combine_files("theme_".Kohana::config("settings.site_style").".css", self::$theme_css);
+		
 		// Theme JS
 		foreach(self::$theme_js as $js)
 		{
 			Requirements::js($js);
 		}
 		
+		Requirements::combine_files("theme_".Kohana::config("settings.site_style").".js", self::$theme_js);
+		
 		Requirements::ieThemedCSS("lte IE 7", "iehacks.css");
 		Requirements::ieThemedCSS("IE 7", "ie7hacks.css");
 		Requirements::ieThemedCSS("IE 6", "ie6hacks.css");

From 931c528adbedcb4be4d9707ad6222eb9a0ec409f Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Wed, 5 Dec 2012 09:10:30 +1300
Subject: [PATCH 26/30] Change view_pre_render event naming convention #958

Now using . as separator instead of -
As per feedback from @ekala this is a better match for the existing
naming convention.
---
 application/controllers/admin.php   | 2 +-
 application/controllers/main.php    | 2 +-
 application/controllers/members.php | 2 +-
 application/libraries/MY_View.php   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/controllers/admin.php b/application/controllers/admin.php
index cd5d87b1d1..e8e7ad8caa 100644
--- a/application/controllers/admin.php
+++ b/application/controllers/admin.php
@@ -158,7 +158,7 @@ public function __construct()
 		// Language switcher
 		$this->template->languages = $this->themes->languages();
 		
-		Event::add('ushahidi_filter.view_pre_render-admin_layout', array($this, '_pre_render'));
+		Event::add('ushahidi_filter.view_pre_render.admin_layout', array($this, '_pre_render'));
 	}
 
 	public function index()
diff --git a/application/controllers/main.php b/application/controllers/main.php
index 38ec589356..3cd27c5eed 100644
--- a/application/controllers/main.php
+++ b/application/controllers/main.php
@@ -136,7 +136,7 @@ public function __construct()
 		}
 		$this->template->header->header_nav->site_name = Kohana::config('settings.site_name');
 		
-		Event::add('ushahidi_filter.view_pre_render-layout', array($this, '_pre_render'));
+		Event::add('ushahidi_filter.view_pre_render.layout', array($this, '_pre_render'));
 	}
 
 	/**
diff --git a/application/controllers/members.php b/application/controllers/members.php
index c201e4def5..88826e3da9 100644
--- a/application/controllers/members.php
+++ b/application/controllers/members.php
@@ -106,7 +106,7 @@ public function __construct()
 		}
 		$this->template->header_nav->site_name = Kohana::config('settings.site_name');
 		
-		Event::add('ushahidi_filter.view_pre_render-members_layout', array($this, '_pre_render'));
+		Event::add('ushahidi_filter.view_pre_render.members_layout', array($this, '_pre_render'));
 	}
 
 	public function index()
diff --git a/application/libraries/MY_View.php b/application/libraries/MY_View.php
index 9d87d23ab0..8465712a49 100644
--- a/application/libraries/MY_View.php
+++ b/application/libraries/MY_View.php
@@ -41,8 +41,8 @@ public function render($print = FALSE, $renderer = FALSE)
 	{
 		// Run view_pre_render filter to allow plugins/themes to add extra data to a view
 		Event::run('ushahidi_filter.view_pre_render', $this->kohana_local_data);
-		// View specific hook pre render hook ie. view_pre_render-reports_main
-		Event::run('ushahidi_filter.view_pre_render-'.str_replace('/','_',$this->name), $this->kohana_local_data);
+		// View specific hook pre render hook ie. ushahidi_filter.view_pre_render.reports_main
+		Event::run('ushahidi_filter.view_pre_render.'.str_replace('/','_',$this->name), $this->kohana_local_data);
 		
 		return parent::render($print, $renderer);
 	}

From 90c664ff22576f6a5f01372247a7fd1e2649e058 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Wed, 5 Dec 2012 09:11:03 +1300
Subject: [PATCH 27/30] Minor: Fix code formatting in Themes library #958

---
 application/libraries/Themes.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Themes.php b/application/libraries/Themes.php
index 5e21e4bc1b..f2facca2ea 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -192,9 +192,12 @@ public function requirements()
 		if ($this->editor_enabled)
 		{
 			Requirements::css('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.css');
-			if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE) {
+			if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE)
+			{
 				Requirements::js(url::file_loc('ignore').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js'); // not sure what the hell to do about this
-			} else {
+			}
+			else
+			{
 				Requirements::js('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js');
 			}
 		}

From c0c6841a9c4e9f833e3ee9b242a282a74eb794a1 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Wed, 5 Dec 2012 09:11:27 +1300
Subject: [PATCH 28/30] Remove dupe copyright note in Requirements library #958

---
 application/libraries/Requirements.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index 6e5e63a6fe..15a5e1fa6c 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -2,7 +2,7 @@
 /**
  * Requirements tracker, for javascript and css.
  * 
- * Based on Requirements class from sapphire framework
+ * Based on Requirements class from sapphire framework (but heavily modified)
  * https://github.com/silverstripe/sapphire/blob/master/view/Requirements.php
  * 
  * LICENSE: This source file is subject to BSD license
@@ -24,9 +24,7 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
  * OF SUCH DAMAGE.
  * 
- * @author	   Ushahidi Team <team@ushahidi.com>
- * @package	   Ushahidi - http://source.ushahididev.com
- * @copyright  Ushahidi - http://www.ushahidi.com
+ * @package	   Ushahidi - https://github.com/ushahidi/Ushahidi_Web
  * @license	   https://github.com/silverstripe/sapphire Modified BSD License
  */
 class Requirements {

From 6ff0098f62d01f5e2a1e02f16a889b521e7bb125 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Wed, 5 Dec 2012 17:36:59 +1300
Subject: [PATCH 29/30] Add unit tests for Requirements library

---
 .../classes/libraries/Requirements_Test.php   | 320 ++++++++++++++++++
 .../phpunit/classes/libraries/Themes_Test.php |  28 ++
 tests/phpunit/data/RequirementsTest_a.css     |   1 +
 tests/phpunit/data/RequirementsTest_a.js      |   1 +
 tests/phpunit/data/RequirementsTest_b.css     |   1 +
 tests/phpunit/data/RequirementsTest_b.js      |   1 +
 tests/phpunit/data/RequirementsTest_c.css     |   1 +
 tests/phpunit/data/RequirementsTest_c.js      |   1 +
 8 files changed, 354 insertions(+)
 create mode 100644 tests/phpunit/classes/libraries/Requirements_Test.php
 create mode 100644 tests/phpunit/classes/libraries/Themes_Test.php
 create mode 100644 tests/phpunit/data/RequirementsTest_a.css
 create mode 100644 tests/phpunit/data/RequirementsTest_a.js
 create mode 100644 tests/phpunit/data/RequirementsTest_b.css
 create mode 100644 tests/phpunit/data/RequirementsTest_b.js
 create mode 100644 tests/phpunit/data/RequirementsTest_c.css
 create mode 100644 tests/phpunit/data/RequirementsTest_c.js

diff --git a/tests/phpunit/classes/libraries/Requirements_Test.php b/tests/phpunit/classes/libraries/Requirements_Test.php
new file mode 100644
index 0000000000..6d3ab14d1d
--- /dev/null
+++ b/tests/phpunit/classes/libraries/Requirements_Test.php
@@ -0,0 +1,320 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Requirements library Unit Test
+ *
+ * @author 		Ushahidi Team
+ * @package 	Ushahidi
+ * @category 	Unit Tests
+ * @copyright 	(c) 2008-2011 Ushahidi Inc <http://www.ushahidi.com>
+ * @license 	For license information, see License.txt
+ */
+class Requirements_Test extends PHPUnit_Framework_TestCase {
+	
+	public function setUp()
+	{
+		
+	}
+	
+	public function tearDown()
+	{
+		
+	}
+	
+	function testExternalUrls() {
+		$backend = Requirements::backend();
+		$backend->set_combined_files_enabled(true);
+
+		$backend->js('http://www.mydomain.com/test.js');
+		$backend->js('https://www.mysecuredomain.com/test2.js');
+		$backend->css('http://www.mydomain.com/test.css');
+		$backend->css('https://www.mysecuredomain.com/test2.css');
+		
+		$html = $backend->render();
+		
+		$this->assertContains(
+			'http://www.mydomain.com/test.js',
+			$html,
+			'Load external javascript URL'
+		);
+		$this->assertContains(
+			'https://www.mysecuredomain.com/test2.js',
+			$html,
+			'Load external secure javascript URL'
+		);
+		$this->assertContains(
+			'http://www.mydomain.com/test.css', 
+			$html,
+			'Load external CSS URL'
+		);
+		$this->assertContains(
+			'https://www.mysecuredomain.com/test2.css', 
+			$html,
+			'Load external secure CSS URL'
+		);
+		
+		// This should replace test.css above
+		// @todo move to seperate test
+		$backend->css('https://www.anything.com/test.css');
+		$html = $backend->render();
+		$this->assertContains(
+			'https://www.anything.com/test.css', 
+			$html,
+			'Load external CSS URL'
+		);
+		$this->assertNotContains(
+			'https://www.mydomain.com/test.css', 
+			$html,
+			'Load external CSS URL'
+		);
+	}
+
+	protected function setupCombinedRequirements($backend) {
+		$backend->clear();
+		//$backend->setCombinedFilesFolder('assets');
+
+		// clearing all previously generated requirements (just in case)
+		$backend->clear_combined_files();
+		$backend->delete_combined_files('RequirementsTest_bc.js');
+
+		// require files normally (e.g. called from a FormField instance)
+		$backend->js('tests/phpunit/data/RequirementsTest_a.js');
+		$backend->js('tests/phpunit/data/RequirementsTest_b.js');
+		$backend->js('tests/phpunit/data/RequirementsTest_c.js');
+
+		// require two of those files as combined includes
+		$backend->combine_files(
+			'RequirementsTest_bc.js',
+			array(
+				'tests/phpunit/data/RequirementsTest_b.js',
+				'tests/phpunit/data/RequirementsTest_c.js'
+			)
+		);
+	}
+	
+	protected function setupCombinedNonrequiredRequirements($backend) {
+			$backend->clear();
+			//$backend->setCombinedFilesFolder('assets');
+	
+			// clearing all previously generated requirements (just in case)
+			$backend->clear_combined_files();
+			$backend->delete_combined_files('RequirementsTest_bc.js');
+	
+			// require files as combined includes
+			$backend->combine_files(
+				'RequirementsTest_bc.js',
+				array(
+					'data/forms/RequirementsTest_b.js',
+					'data/forms/RequirementsTest_c.js'
+				)
+			);
+		}
+
+	function testCombinedJavascript() {
+		$backend = new Requirements_Backend;
+		$backend->set_combined_files_enabled(TRUE);
+		//$backend->setCombinedFilesFolder('/media/uploads');
+
+		$this->setupCombinedRequirements($backend);
+		
+		$combinedFilePath = DOCROOT . 'media/uploads/' . 'RequirementsTest_bc.js';
+
+		$html = $backend->render();
+
+		/* COMBINED JAVASCRIPT FILE IS INCLUDED IN HTML HEADER */
+		$this->assertContains('media/uploads/RequirementsTest_bc.js', $html, 'combined javascript file is included in html header');
+		
+		/* COMBINED JAVASCRIPT FILE EXISTS */
+		$this->assertFileExists($combinedFilePath, 'combined javascript file exists');
+		
+		/* COMBINED JAVASCRIPT HAS CORRECT CONTENT */
+		$combinedFileContents = @file_get_contents($combinedFilePath);
+		$this->assertContains("alert('b')", $combinedFileContents, 'combined javascript has correct content');
+		$this->assertContains("alert('c')", $combinedFileContents, 'combined javascript has correct content');
+		
+		/* COMBINED FILES ARE NOT INCLUDED TWICE */
+		$this->assertNotContains('RequirementsTest_b.js', $html, 'combined files are not included twice');
+		$this->assertNotContains('RequirementsTest_c.js', $html, 'combined files are not included twice');
+		
+		/* NORMAL REQUIREMENTS ARE STILL INCLUDED */
+		$this->assertContains('RequirementsTest_a.js', $html, 'normal requirements are still included');
+
+		$backend->delete_combined_files('RequirementsTest_bc.js');
+		
+		// Then do it again, this time not requiring the files beforehand
+		$backend = new Requirements_Backend;
+		$backend->set_combined_files_enabled(true);
+		$backend->setCombinedFilesFolder('assets');
+
+		$this->setupCombinedNonrequiredRequirements($backend);
+		
+		$combinedFilePath = DOCROOT . 'media/uploads/' . 'RequirementsTest_bc.js';
+
+		$html = $backend->render();
+
+		/* COMBINED JAVASCRIPT FILE IS NOT INCLUDED IN HTML HEADER */
+		$this->assertNotContains('media/uploads/RequirementsTest_bc.js', $html, 'combined javascript file is included in html header');
+		
+		/* COMBINED JAVASCRIPT FILE EXISTS */
+		clearstatcache(); // needed to get accurate file_exists() results
+		$this->assertFileNotExists($combinedFilePath, 'combined javascript file exists');
+		
+		/* COMBINED FILES ARE NOT INCLUDED TWICE */
+		$this->assertNotContains('RequirementsTest_b.js', $html, 'combined files are not included twice');
+		$this->assertNotContains('RequirementsTest_c.js', $html, 'combined files are not included twice');
+
+		$backend->delete_combined_files('RequirementsTest_bc.js');
+	}
+	
+	function testBlockedCombinedJavascript() {
+		$backend = new Requirements_Backend;
+		$backend->set_combined_files_enabled(true);
+		$backend->setCombinedFilesFolder('assets');
+		$combinedFilePath = DOCROOT . '/media/uploads/' . 'RequirementsTest_bc.js';
+
+		/* BLOCKED COMBINED FILES ARE NOT INCLUDED */
+		$this->setupCombinedRequirements($backend);
+		$backend->block('RequirementsTest_bc.js');
+		$backend->delete_combined_files('RequirementsTest_bc.js');
+
+		clearstatcache(); // needed to get accurate file_exists() results
+		$html = $backend->render();
+
+		$this->assertNotContains('RequirementsTest_bc.js', $html, 'blocked combined files are not included ');
+		$backend->unblock('RequirementsTest_bc.js');
+
+		/* BLOCKED UNCOMBINED FILES ARE NOT INCLUDED */
+		$this->setupCombinedRequirements($backend);
+		$backend->block('tests/phpunit/data/RequirementsTest_b.js');
+		$backend->delete_combined_files('RequirementsTest_bc.js');
+		clearstatcache(); // needed to get accurate file_exists() results
+		$html = $backend->render();
+		$combinedFileContents = @file_get_contents($combinedFilePath);
+		$this->assertNotContains("alert('b')", (string)$combinedFileContents, 'blocked uncombined files are not included');
+		$backend->unblock('RequirementsTest_b.js');
+		
+		/* A SINGLE FILE CAN'T BE INCLUDED IN TWO COMBINED FILES */
+		$this->setupCombinedRequirements($backend);
+		clearstatcache(); // needed to get accurate file_exists() results
+
+		// This throws a notice-level error, so we prefix with @
+		@$backend->combine_files(
+			'RequirementsTest_ac.js',
+			array(
+				'tests/phpunit/data/RequirementsTest_a.js',
+				'tests/phpunit/data/RequirementsTest_c.js'
+			)
+		);
+
+		$combinedFiles = $backend->get_combine_files();
+
+		$this->assertEquals(
+			array_keys($combinedFiles['js']),
+			array('RequirementsTest_bc.js'),
+			"A single file can't be included in two combined files"
+		);
+		
+		$backend->delete_combined_files('RequirementsTest_bc.js');
+	}
+	
+	function testArgsInUrls() {
+		$backend = new Requirements_Backend;
+		$backend->set_combined_files_enabled(TRUE);
+		$backend->set_suffix_requirements(TRUE);
+
+		$backend->js('tests/phpunit/data/RequirementsTest_a.js?test=1&test=2&test=3');
+		$backend->css('tests/phpunit/data/RequirementsTest_a.css?test=1&test=2&test=3');
+		$backend->delete_combined_files('RequirementsTest_bc.js');
+
+		$html = $backend->render();
+
+		/* Javascript has correct path */
+		$this->assertRegexp('#src=".*\/RequirementsTest_a\.js\?m=\d\d+&test=1&test=2&test=3#', $html, 'javascript has correct path and mtime suffix');
+
+		/* CSS has correct path */
+		$this->assertRegexp('#href=".*\/RequirementsTest_a\.css\?m=\d\d+&test=1&test=2&test=3#', $html, 'css has correct path and mtime suffix');
+		
+		// Testing again without mtime suffix
+		$backend->set_suffix_requirements(FALSE);
+
+		$html = $backend->render();
+
+		/* Javascript has correct path */
+		$this->assertRegexp('#src=".*\/RequirementsTest_a\.js\?test=1&test=2&test=3#', $html, 'javascript has correct path');
+
+		/* CSS has correct path */
+		$this->assertRegexp('#href=".*\/RequirementsTest_a\.css\?test=1&test=2&test=3#', $html, 'css has correct path');
+	}
+	
+	function testRequirementsBackend() {
+		$backend = new Requirements_Backend();
+		$backend->js('tests/phpunit/data/a.js');
+		
+		$this->assertCount(1, $backend->get_js(), "There should be only 1 file included in required javascript.");
+		$this->assertContains('tests/phpunit/data/a.js', $backend->get_js(), "/tests/phpunit/data/a.js should be included in required javascript.");
+		
+		$backend->js('tests/phpunit/data/b.js');
+		$this->assertCount(2, $backend->get_js(), "There should be 2 files included in required javascript.");
+		
+		$backend->block('tests/phpunit/data/a.js');
+		$this->assertCount(1, $backend->get_js(), "There should be only 1 file included in required javascript.");
+		$this->assertNotContains('tests/phpunit/data/a.js', $backend->get_js(), "/tests/phpunit/data/a.js should not be included in required javascript after it has been blocked.");
+		$this->assertContains('tests/phpunit/data/b.js', $backend->get_js(), "/tests/phpunit/data/b.js should be included in required javascript.");
+		
+		$backend->css('tests/phpunit/data/a.css');
+		$this->assertCount(1, $backend->get_css(), "There should be only 1 file included in required css.");
+		$this->assertArrayHasKey('a.css', $backend->get_css(), "/tests/phpunit/data/a.css should be in required css.");
+		$this->assertContains(array('file' => 'tests/phpunit/data/a.css', 'media' => null), $backend->get_css(), "/tests/phpunit/data/a.css should be in required css.");
+		
+		$backend->block('tests/phpunit/data/a.css');
+		$this->assertCount(0, $backend->get_css(), "There should be nothing in required css after file has been blocked.");
+		
+		// Test unblock_all()
+		$backend->unblock_all();
+		$this->assertCount(2, $backend->get_js(), "There should be only 2 files included in required css.");
+		$this->assertCount(1, $backend->get_css(), "There should be only 1 file included in required javascript.");
+		
+		// Testing clear()
+		$backend->js('tests/phpunit/data/c.css');
+		$backend->clear();
+		$this->assertCount(0, $backend->get_css(), "There should be nothing in required css after requirements cleared.");
+		$this->assertCount(0, $backend->get_js(), "There should be nothing in required js after requirements cleared.");
+		
+		// Testing js block by id
+		$backend->js('tests/phpunit/data/a.js');
+		$backend->block('a.js');
+		$this->assertCount(0, $backend->get_js(), "There should be nothing in required js after file has be blocked.");
+		
+		// Testing css block by id
+		$backend->css('tests/phpunit/data/a.css');
+		$backend->block('a.css');
+		$this->assertCount(0, $backend->get_css(), "There should be nothing in required css after file has been blocked.");
+		
+		// Testing unblock
+		$backend->unblock('a.js');
+		$this->assertCount(1, $backend->get_js(), "There should be only 1 file included in required javascript.");
+	}
+	
+	function testBlockedInRender() {
+		$backend = new Requirements_Backend();
+		$backend->js('tests/phpunit/data/RequirementsTest_a.js');
+		$backend->js('tests/phpunit/data/RequirementsTest_a.css');
+		$backend->js('tests/phpunit/data/RequirementsTest_b.js');
+		$backend->js('tests/phpunit/data/RequirementsTest_b.css');
+		$backend->js('tests/phpunit/data/RequirementsTest_c.js');
+		$backend->js('tests/phpunit/data/RequirementsTest_c.css');
+		
+		$backend->block('tests/phpunit/data/RequirementsTest_a.js');
+		$backend->block('tests/phpunit/data/RequirementsTest_a.css');
+		$backend->block('RequirementsTest_b.js');
+		$backend->block('RequirementsTest_b.css');
+		
+		$html = $backend->render();
+		$this->assertNotContains('tests/phpunit/data/RequirementsTest_a.js', $html, 'RequirementsTest_a.js was blocked and should not appear in rendered HTML');
+		$this->assertNotContains('tests/phpunit/data/RequirementsTest_a.css', $html, 'RequirementsTest_a.css was blocked and should not appear in rendered HTML');
+		$this->assertNotContains('tests/phpunit/data/RequirementsTest_b.js', $html, 'RequirementsTest_b.js was blocked and should not appear in rendered HTML');
+		$this->assertNotContains('tests/phpunit/data/RequirementsTest_b.css', $html, 'RequirementsTest_b.css was blocked and should not appear in rendered HTML');
+		$this->assertContains('tests/phpunit/data/RequirementsTest_c.js', $html, 'RequirementsTest_c.js should appear in rendered HTML');
+		$this->assertContains('tests/phpunit/data/RequirementsTest_c.css', $html, 'RequirementsTest_c.css should appear in rendered HTML');
+	}
+}
+
diff --git a/tests/phpunit/classes/libraries/Themes_Test.php b/tests/phpunit/classes/libraries/Themes_Test.php
new file mode 100644
index 0000000000..904954b476
--- /dev/null
+++ b/tests/phpunit/classes/libraries/Themes_Test.php
@@ -0,0 +1,28 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Themes library Unit Test
+ *
+ * @author 		Ushahidi Team
+ * @package 	Ushahidi
+ * @category 	Unit Tests
+ * @copyright 	(c) 2008-2011 Ushahidi Inc <http://www.ushahidi.com>
+ * @license 	For license information, see License.txt
+ */
+class Themes_Test extends PHPUnit_Framework_TestCase {
+	
+	public function setUp()
+	{
+		
+	}
+	
+	public function tearDown()
+	{
+		
+	}
+	
+	public function testSomething()
+	{
+	}
+	
+}
+	
\ No newline at end of file
diff --git a/tests/phpunit/data/RequirementsTest_a.css b/tests/phpunit/data/RequirementsTest_a.css
new file mode 100644
index 0000000000..730bd9eb35
--- /dev/null
+++ b/tests/phpunit/data/RequirementsTest_a.css
@@ -0,0 +1 @@
+.a {color: #f00;}
\ No newline at end of file
diff --git a/tests/phpunit/data/RequirementsTest_a.js b/tests/phpunit/data/RequirementsTest_a.js
new file mode 100644
index 0000000000..829a652433
--- /dev/null
+++ b/tests/phpunit/data/RequirementsTest_a.js
@@ -0,0 +1 @@
+alert('a');
\ No newline at end of file
diff --git a/tests/phpunit/data/RequirementsTest_b.css b/tests/phpunit/data/RequirementsTest_b.css
new file mode 100644
index 0000000000..e11f7eebfc
--- /dev/null
+++ b/tests/phpunit/data/RequirementsTest_b.css
@@ -0,0 +1 @@
+.b {color: #0ff;}
\ No newline at end of file
diff --git a/tests/phpunit/data/RequirementsTest_b.js b/tests/phpunit/data/RequirementsTest_b.js
new file mode 100644
index 0000000000..3d8670ca8c
--- /dev/null
+++ b/tests/phpunit/data/RequirementsTest_b.js
@@ -0,0 +1 @@
+alert('b');
\ No newline at end of file
diff --git a/tests/phpunit/data/RequirementsTest_c.css b/tests/phpunit/data/RequirementsTest_c.css
new file mode 100644
index 0000000000..ae49dd2024
--- /dev/null
+++ b/tests/phpunit/data/RequirementsTest_c.css
@@ -0,0 +1 @@
+.c {color: #0ff;}
\ No newline at end of file
diff --git a/tests/phpunit/data/RequirementsTest_c.js b/tests/phpunit/data/RequirementsTest_c.js
new file mode 100644
index 0000000000..1e0f7b3ceb
--- /dev/null
+++ b/tests/phpunit/data/RequirementsTest_c.js
@@ -0,0 +1 @@
+alert('c');
\ No newline at end of file

From a3e6b4d50f700394587fec12612a11914734621a Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Wed, 5 Dec 2012 17:38:32 +1300
Subject: [PATCH 30/30] Update requirements library to fix issues found by unit
 testing

* fix block() to handle IDs and full filenames
* fix path_for_file() to handle query strings w/o mtime
* fix delete_combined_files()
---
 application/libraries/Requirements.php | 37 +++++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/application/libraries/Requirements.php b/application/libraries/Requirements.php
index 15a5e1fa6c..82a9bc1ff1 100644
--- a/application/libraries/Requirements.php
+++ b/application/libraries/Requirements.php
@@ -523,7 +523,9 @@ public function js($file, $uniquenessID = null) {
 	 * @return array
 	 */
 	public function get_js() {
-		return array_keys(array_diff_key($this->js,$this->blocked));
+		$js = array_diff_key($this->js,$this->blocked); // removed blocked js by id
+		$js = array_diff($js, $this->blocked); // remove blocked js by filename
+		return $js;
 	}
 	
 	/**
@@ -589,7 +591,14 @@ function css($file, $uniquenessID = null, $media = null) {
 	}
 	
 	function get_css() {
-		return array_diff_key($this->css, $this->blocked);
+		$css = array_diff_key($this->css,$this->blocked); // removed blocked css by id
+		// Remove blocked css by filename
+		foreach($css as $id => $params)
+		{
+			if (in_array($params['file'], $this->blocked)) unset($css[$id]);
+		}
+		
+		return $css;
 	}
 	
 	/**
@@ -703,7 +712,7 @@ private function renderJS()
 			// Combine files - updates $this->js
 			$this->process_combined_files('js');
 		
-			foreach(array_diff_key($this->js,$this->blocked) as $id => $file) {
+			foreach($this->get_js() as $id => $file) {
 				$path = $this->path_for_file($file, 'js');
 				if($path) {
 					//$jsRequirements .= html::script($path, TRUE);
@@ -757,7 +766,7 @@ private function renderCSS()
 			// Combine files - updates $this->css 
 			$this->process_combined_files('css');
 			
-			foreach(array_diff_key($this->css,$this->blocked) as $id => $params) {
+			foreach($this->get_css() as $id => $params) {
 				$file = $params['file'];
 				$path = $this->path_for_file($file, 'css');
 				if($path) {
@@ -788,8 +797,14 @@ protected function path_for_file($fileOrUrl, $type) {
 		if(preg_match('/^http[s]?/', $fileOrUrl)) {
 			return $fileOrUrl;
 		} else {
+			// Split query from filename
+			$suffix = '';
+			if(strpos($fileOrUrl, '?') !== false) {
+				$suffix = substr($fileOrUrl, strpos($fileOrUrl, '?')+1);
+				$fileOrUrl = substr($fileOrUrl, 0, strpos($fileOrUrl, '?'));
+			}
+			
 			if (file_exists(DOCROOT . $fileOrUrl)) {
-
 				// Check for RTL replacements
 				if ($type == 'css' AND ush_locale::is_rtl_language())
 				{
@@ -803,14 +818,10 @@ protected function path_for_file($fileOrUrl, $type) {
 				// Get url prefix, either site base url or CDN url
 				$prefix = url::file_loc($type);
 				
-				$mtimesuffix = "";
-				$suffix = '';
-				if(strpos($fileOrUrl, '?') !== false) {
-					$suffix = '&' . substr($fileOrUrl, strpos($fileOrUrl, '?')+1);
-					$fileOrUrl = substr($fileOrUrl, 0, strpos($fileOrUrl, '?'));
-				}
+				$mtimesuffix = "?";
 				if($this->suffix_requirements) {
-					$mtimesuffix = "?m=" . filemtime(DOCROOT . $fileOrUrl);
+					$mtimesuffix .= "m=" . filemtime(DOCROOT . $fileOrUrl);
+					$suffix = '&'.$suffix;
 				}
 				return "{$prefix}{$fileOrUrl}{$mtimesuffix}{$suffix}";
 			}
@@ -914,7 +925,7 @@ function get_combine_files() {
 	 */
 	function delete_combined_files($combinedFileName = null) {
 		$combinedFiles = ($combinedFileName) ? array($combinedFileName => null) : array_merge($this->combine_files['css'], $this->combine_files['js']);
-		$combinedFolder = ($this->getCombinedFilesFolder()) ? (DOCROOT . $this->combinedFilesFolder) : DOCROOT . Kohana::config('upload.directory', FALSE);
+		$combinedFolder = DOCROOT . $this->getCombinedFilesFolder();
 		foreach($combinedFiles as $combinedFile => $sourceItems) {
 			$filePath = $combinedFolder . '/' . $combinedFile;
 			if(file_exists($filePath)) {