In-Portal Issue Tracker

Index: admin_templates/incs/header.tpl
===================================================================
--- admin_templates/incs/header.tpl	(revision 15165)
+++ admin_templates/incs/header.tpl	(working copy)
@@ -22,7 +22,8 @@
 <link rel="stylesheet" href="<inp2:m_Compress files='
 	js/jquery/thickbox/thickbox.css|
 	js/calendar/calendar-blue.css|
-	$skin_css
+	$skin_css|
+	{module_path}/img/toolbar/toolbar-sprite.css
 '/>" type="text/css" media="screen" />
 
 <script type="text/javascript" src="js/jquery/jquery.pack.js"></script>
Index: admin_templates/js/toolbar.js
===================================================================
--- admin_templates/js/toolbar.js	(revision 15165)
+++ admin_templates/js/toolbar.js	(working copy)
@@ -55,11 +55,13 @@
 	}
 }
 
-ToolBarButton.prototype.IconsPath = function()
+ToolBarButton.prototype.IconsPath = function($module_path)
 {
-	var $module_path = this.Module;
+	if ( $module_path === undefined ) {
+		$module_path = this.Module;
+	}
 
-	if (this.Module != 'core') {
+	if ( $module_path != 'core' ) {
 		$module_path = 'modules/' + $module_path;
 	}
 
@@ -67,17 +69,30 @@
 }
 
 ToolBarButton.prototype.GetHTML = function() {
-	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
-	var o = '<div class="toolbar-button" id="'+this.GetToolID('div')+'" '+add_style+'>'
-	o += '<img id="' + this.GetToolID() + '" width="'+this.ToolBar.IconSize.w+'" height="'+this.ToolBar.IconSize.h+'" src="' + this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif" title="' + this.Alt + '&nbsp;">';
-	if (this.ToolBar.UseLabels) o += '<br/>'+this.Label;
+	var add_style = this.ToolBar.ButtonStyle ? 'style="' + this.ToolBar.ButtonStyle + '"' : '',
+		o = '<div class="toolbar-button" id="' + this.GetToolID('div') + '" ' + add_style + '>';
+
+	o += '<img class="' + this.Module + '-toolbar-sprite" id="' + this.GetToolID() + '" width="' + this.ToolBar.IconSize.w + '" height="' + this.ToolBar.IconSize.h + '" src="' + this.IconsPath('core') + '../spacer.gif" title="' + this.Alt + '&nbsp;">';
+
+	if ( this.ToolBar.UseLabels ) {
+		o += '<br/>' + this.Label;
+	}
+
 	o += '</div>'
+
 	return o;
 }
 
 ToolBarButton.prototype.GetToolID = function(item) {
-	if (!item) item = 'tool'
-	return this.Prefix == '' ? item+'_' + this.Title : item+'_['+this.Prefix+'][' + this.Title+']'
+	if ( item === undefined ) {
+		item = 'tool';
+	}
+
+	if ( this.Prefix == '' ) {
+		return item == 'tool' ? this.Module + '-tb-' + this.Title : item + '_' + this.Title;
+	}
+
+	return item + '_[' + this.Prefix + '][' + this.Title + ']'
 }
 
 ToolBarButton.prototype.Init = function() {
@@ -88,11 +103,6 @@
 	this.Container.btn =  this;
 	img.btn = this;
 
-	this.MouseOverImg = new Image();
-	this.MouseOverImg.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '_f2.gif';
-	this.MouseOutImg = new Image();
-	this.MouseOutImg.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif';
-
 	this.SetOnMouseOver();
 	this.SetOnMouseOut();
 	this.SetOnClick();
@@ -132,14 +142,14 @@
 
 ToolBarButton.prototype.SetOnMouseOver = function() {
 	this.Container.onmouseover = function() {
-		this.btn.imgObject.src = this.btn.MouseOverImg.src;
+		$(this.btn.imgObject).addClass('hover');
 		this.className = 'toolbar-button-over';
 	};
 }
 
 ToolBarButton.prototype.SetOnMouseOut = function() {
 	this.Container.onmouseout = function() {
-		this.btn.imgObject.src = this.btn.MouseOutImg.src;
+		$(this.btn.imgObject).removeClass('hover');
 		this.className = 'toolbar-button';
 	};
 }
@@ -197,11 +207,7 @@
 ToolBarButton.prototype.Disable = function() {
 	if ( !this.Enabled ) return;
 
-	if (typeof(this.DisabledImg) == 'undefined') {
-		this.DisabledImg = new Image();
-		this.DisabledImg.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '_f3.gif';
-	}
-	this.imgObject.src = this.DisabledImg.src;
+	$(this.imgObject).addClass('disabled');
 	this.Container.onmouseover = null;
 	this.Container.onmouseout = null;
 	this.Container.onclick = null;
@@ -212,7 +218,7 @@
 
 ToolBarButton.prototype.Enable = function() {
 	if (this.Enabled) return;
-	this.imgObject.src = this.MouseOutImg.src;
+	$(this.imgObject).removeClass('hover disabled');
 	this.SetOnMouseOver();
 	this.SetOnMouseOut();
 	this.SetOnClick();
@@ -241,16 +247,14 @@
 ToolBarSeparator.prototype = new ToolBarButton;
 
 ToolBarSeparator.prototype.GetHTML = function() {
-	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
+	var add_style = this.ToolBar.ButtonStyle ? 'style="' + this.ToolBar.ButtonStyle + '"' : '';
 	var padding = this.ToolBar.UseLabels ? '12px' : '2px'
-	return '<div id="'+this.GetToolID('div')+'" class="toolbar-button" style="padding-top: '+padding+'; height: 32px;" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
 
-	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
-	return '<div id="'+this.GetToolID('div')+'" class="toolbar-button" style="border: 1px solid black; height: 100%;" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
+	return '<div id="' + this.GetToolID('div') + '" class="toolbar-button" style="padding-top: ' + padding + '; height: 32px;" ' + add_style + '><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
 }
 
 ToolBarSeparator.prototype.Init = function() {
-	img = document.getElementById(this.ToolBar.IconPrefix + this.Title);
+	img = document.getElementById(this.Module + '-tb-' + this.Title);
 	this.Container = document.getElementById(this.GetToolID('div')) ? document.getElementById(this.GetToolID('div')) : false;
 	this.imgObject = img;
 	img.btn = this;
Index: kernel/utility/debugger.php
===================================================================
--- kernel/utility/debugger.php	(revision 15252)
+++ kernel/utility/debugger.php	(working copy)
@@ -1549,8 +1549,8 @@
 				// otherwise it has no effect
 			?>
 					<div style="display: none" x='nothing'><script></script></div><html><body></body></html>
+					<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css" type="text/css" media="screen" />
 					<script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js?v3"></script>
-					<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css" type="text/css" media="screen" />
 
 					<script type="text/javascript">
 						var $Debugger = new Debugger(<?php echo json_encode($debugger_params); ?>);
Index: units/helpers/minifiers/minify_helper.php
===================================================================
--- units/helpers/minifiers/minify_helper.php	(revision 15165)
+++ units/helpers/minifiers/minify_helper.php	(working copy)
@@ -91,6 +91,10 @@
 				$path_length = strlen(FULL_PATH) + 1;
 
 				foreach ($files as $file) {
+					if ( !file_exists($file) ) {
+						continue;
+					}
+
 					// add filename before for easier debugging
 					if ( $this->debugMode ) {
 						$string .= '/* === File: ' . substr($file, $path_length) . ' === */' . "\n";
@@ -139,7 +143,9 @@
 			$ret = 0;
 
 			foreach ($files as $file) {
-				$ret = max($ret, filemtime($file));
+				if ( file_exists($file) ) {
+					$ret = max($ret, filemtime($file));
+				}
 			}
 
 			return $ret;
@@ -266,14 +272,42 @@
 
 				if ( preg_match($reg_exp, $template, $regs) ) {
 					// full url (from current domain) to a file
-					$path = FULL_PATH . '/' . $regs[1];
+					$ret[] = FULL_PATH . '/' . $regs[1];
 				}
+				elseif ( strpos($template, '{module_path}') !== false ) {
+					$ret = array_merge($ret, $this->_moduleInclude($template));
+				}
 				else {
-					list ($path, $module_filename) = $this->Application->TemplatesCache->GetTemplatePaths($template);
-					$path .= DIRECTORY_SEPARATOR . $module_filename;
+					$ret[] = $this->Application->TemplatesCache->GetRealFilename($template);
 				}
+			}
 
-				$ret[] = $path;
+			return $ret;
+		}
+
+		/**
+		 *
+		 * @param string $template
+		 * @return Array
+		 * @access protected
+		 */
+		protected function _moduleInclude($template)
+		{
+			$ret = $included = Array ();
+
+			foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
+				if ( $module_name == 'In-Portal' ) {
+					continue;
+				}
+
+				$module_prefix = $this->Application->isAdmin ? mb_strtolower($module_name) . '/' : $module_data['TemplatePath'];
+
+				if ( in_array($module_prefix, $included) ) {
+					continue;
+				}
+
+				$ret[] = $this->Application->TemplatesCache->GetRealFilename(str_replace('{module_path}', $module_prefix, $template));
+				$included[] = $module_prefix;
 			}
 
 			return $ret;