+ * array('//symlink' => '/real/target/path') // unix
+ * array('//static' => 'D:\\staticStorage') // Windows
+ *
+ *
+ * @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
+ *
+ *
+ * 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'
+ *
+ *
+ * @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.:
+ *
+ * array('/home/foo/www/not/real/path' => '/real/target/path') // unix
+ * array('C:\\htdocs\\not\\real' => 'D:\\real\\target\\path') // Windows
+ *
+ *
+ * @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
new file mode 100644
index 0000000000..82a9bc1ff1
--- /dev/null
+++ b/application/libraries/Requirements.php
@@ -0,0 +1,1177 @@
+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, $uniquenessID = null) {
+ self::backend()->js($file, $uniquenessID);
+ }
+
+ /**
+ * 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) {
+ 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 \n";
+ }
+ }
+
+ 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 {
+ // 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())
+ {
+ $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);
+
+ $mtimesuffix = "?";
+ if($this->suffix_requirements) {
+ $mtimesuffix .= "m=" . filemtime(DOCROOT . $fileOrUrl);
+ $suffix = '&'.$suffix;
+ }
+ return "{$prefix}{$fileOrUrl}{$mtimesuffix}{$suffix}";
+ }
+ }
+ Kohana::log('alert', "Requirements: 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 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:
+ *
+ * Requirements::combine_files(
+ * 'foobar.js',
+ * array(
+ * 'mysite/javascript/foo.js',
+ * 'mysite/javascript/bar.js',
+ * 'baz.min' => 'mysite/javascript/baz.min',
+ * )
+ * );
+ *
+ *
+ * Example for combined CSS:
+ *
+ * Requirements::combine_files(
+ * 'foobar.css',
+ * array(
+ * 'mysite/javascript/foo.css',
+ * 'mysite/javascript/bar.css',
+ * )
+ * );
+ *
+ *
+ * @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 = DOCROOT . $this->getCombinedFilesFolder();
+ 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;
+
+ // 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));
+ }
+
+ // 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) {
+ $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";
+ }
+
+ $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) {
+ foreach($this->customJS as $script) {
+ $requirements .= "$script\n";
+ }
+ }
+
+ return $requirements;
+ }
+
+ /**
+ * @see Requirements::themedCSS()
+ */
+ public function themedCSS($name, $module = null, $media = null) {
+ $this->css($this->themedCSSPath($name, $module), $name, $media);
+ return;
+ }
+
+ /**
+ * @see Requirements::ieCSS()
+ */
+ public function ieCSS($version, $name, $media = null) {
+ $this->customHeadTags("",'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 (Themes::loaded_themes() as $theme)
+ {
+ $path = THEMEPATH . "$theme/css/$name.css";
+ if (file_exists($path)) {
+ return "themes/$theme/css/$name.css";
+ }
+ }
+
+ // Try to include from fall back module
+ if ($module AND file_exists(DOCROOT . "$module/css/$name.css")) {
+ return "$module/css/$name.css";
+ }
+
+ // Try to include from global media
+ if (file_exists(DOCROOT . "media/css/$name.css")) {
+ return "media/css/$name.css";
+ }
+ }
+
+ 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/application/libraries/Themes.php b/application/libraries/Themes.php
index 11ca87666c..f2facca2ea 100644
--- a/application/libraries/Themes.php
+++ b/application/libraries/Themes.php
@@ -16,16 +16,27 @@
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;
public $photoslider_enabled = false;
public $colorpicker_enabled = false;
+ public $datepicker_enabled = false;
public $editor_enabled = false;
- public $site_style = 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;
public $css_url = null;
@@ -38,10 +49,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,13 +57,27 @@ public function __construct()
*/
public function header_block()
{
- $content = Kohana::config("globalcode.head").
- $this->_header_css().
- $this->_header_feeds().
- $this->_header_js();
-
+ $content = '';
+ // For backward compatibility render Requirements here rather than in the view
+ 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)
+ {
+ Event::run('ushahidi_filter.admin_header_block', $content);
+ }
+ elseif ($this->frontend)
+ {
Event::run('ushahidi_filter.header_block', $content);
+ }
return $content;
}
@@ -67,171 +88,298 @@ public function header_block()
*/
public function admin_header_block()
{
- $content = Kohana::config("globalcode.head");
-
- // Filter::admin_header_block - Modify Admin Header Block
- Event::run('ushahidi_filter.admin_header_block', $content);
-
- return $content;
+ $this->header_block();
}
/**
- * Css Items
+ * CSS/JS requirements
*/
- private function _header_css()
+ public function requirements()
{
- $core_css = "";
- $core_css .= html::stylesheet($this->css_url."media/css/jquery-ui-themeroller", "", TRUE);
+ Requirements::customHeadTags(Kohana::config("globalcode.head"),'globalcode-head');
+
+ 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.js");
+ Requirements::js("media/js/jquery.timeago.js");
+
+ Requirements::css("media/css/jquery-ui-themeroller.css");
+
+ Requirements::js('media/js/global.js');
+ Requirements::css('media/css/global.css');
- foreach (Kohana::config("settings.site_style_css") as $theme_css)
+ if ($this->map_enabled)
{
- $core_css .= html::stylesheet($theme_css,"",TRUE);
+ 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.css");
+ }
+
+ if ($this->hovertip_enabled)
+ {
+ 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)
+ $('.tooltip[title]').hovertip();
+ });",
+ 'tooltip-js'
+ );
+ }
+
+ if ($this->slider_enabled)
+ {
+ Requirements::js('media/js/selectToUISlider.jQuery.js');
}
- $core_css .= "";
- $core_css .= "";
- $core_css .= "";
-
- if ($this->map_enabled)
+ if ($this->timeline_enabled)
{
- $core_css .= html::stylesheet($this->css_url."media/css/openlayers","",TRUE);
+ 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)
{
- $core_css .= html::stylesheet($this->css_url."media/css/jquery.treeview","",TRUE);
+ Requirements::css("media/css/jquery.treeview.css");
+ Requirements::js("media/js/jquery.treeview.js");
}
-
- if ($this->photoslider_enabled)
+
+ // Load ProtoChart
+ if ($this->protochart_enabled)
{
- $core_css .= html::stylesheet($this->css_url."media/css/picbox/picbox","",TRUE);
+ Requirements::customJS("jQuery.noConflict()", 'jquery-noconflict');
+ Requirements::js('media/js/protochart/prototype.js');
+ Requirements::customHeadTags(
+ '',
+ 'ie-excanvas-compressed');
+ Requirements::js('media/js/protochart/ProtoChart.js');
}
-
- if ($this->colorpicker_enabled)
+
+ // Load Raphael
+ if ($this->raphael_enabled)
{
- $core_css .= html::stylesheet($this->css_url."media/css/colorpicker","",TRUE);
+ // The only reason we include prototype is to keep the div element naming convention consistent
+ //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.js');
}
- if ($this->site_style AND $this->site_style != "default")
+ if ($this->validator_enabled)
{
- $core_css .= html::stylesheet($this->css_url."themes/".$site_style."/style.css");
+ Requirements::js("media/js/jquery.validate.min.js");
}
- $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;
+ if ($this->photoslider_enabled)
+ {
+ Requirements::css("media/css/picbox/picbox.css");
+ Requirements::js("media/js/picbox.js");
}
- /**
- * Javascript Files and Inline JS
- */
- private function _header_js()
- {
- $core_js = "";
- if ($this->map_enabled)
+ if ($this->colorpicker_enabled)
{
- $core_js .= html::script($this->js_url."media/js/OpenLayers", TRUE);
- $core_js .= "";
- $core_js .= html::script($this->js_url."media/js/ushahidi", TRUE);
+ Requirements::css("media/css/colorpicker.css");
+ Requirements::js("media/js/colorpicker.js");
}
- $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);
-
- if ($this->map_enabled)
+ // Load jwysiwyg
+ if ($this->editor_enabled)
{
-
- $core_js .= $this->api_url;
-
- if ($this->main_page || $this->this_page == "alerts")
+ Requirements::css('media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.css');
+ if (Kohana::config("cdn.cdn_ignore_jwysiwyg") == TRUE)
{
- $core_js .= html::script($this->js_url."media/js/selectToUISlider.jQuery", TRUE);
+ Requirements::js(url::file_loc('ignore').'media/js/jwysiwyg/jwysiwyg/jquery.wysiwyg.js'); // not sure what the hell to do about this
}
-
- if ($this->main_page)
+ else
{
- // Notes: E.Kala '+aM.join("")+"
'];var aJ=m();for(var aD=0;aD');for(var aE=0;aEaC.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('
")}aG.push("");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'+aH.label+"
")}aG.push("'+aL.replace('style="','style="position:absolute;'+aI+";")+"
").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('| =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(): -" ":K?''+u.getDate()+"":'=q.getTime()&&u.getTime()<=z.getTime()?" ui-state-active":"")+'" href="#">'+u.getDate()+"")+" | ";u.setDate(u.getDate()+1);u=this._daylightSavingAdjust(u)}C+=N+""}j++;if(j>11){j=0;s++}C+="
| '+this._get(a,"weekHeader")+" | ":"";for(var S=0;S<7;S++){var T=(S+y)%7;R+="'+this._get(a,"calculateWeek")(Y)+" | ":"";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"+(bb&&!G?" ":bc?''+Y.getDate()+"":''+Y.getDate()+"")+" | ",Y.setDate(Y.getDate()+1),Y=this._daylightSavingAdjust(Y)}Q+=_+""}n++,n>11&&(n=0,o++),Q+="
|---|
',m="";if(f||!i)m+=''+g[b]+"";else{var n=d&&d.getFullYear()==c,o=e&&e.getFullYear()==c;m+='"}k||(l+=m+(f||!i||!j?" ":""));if(!a.yearshtml){a.yearshtml="";if(f||!j)l+=''+c+"";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+='",l+=a.yearshtml,a.yearshtml=null}}return l+=this._get(a,"yearSuffix"),k&&(l+=(f||!i||!j?" ":"")+m),l+="
",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
+