' - o += '

'; - if (this.ToolBar.UseLabels) o += '
'+this.Label; + var add_style = this.ToolBar.ButtonStyle ? 'style="' + this.ToolBar.ButtonStyle + '"' : '', + o = '' + 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 ''; - var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : ''; - return ''; + return ''; } 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: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_next_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_rebuild_cache.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_a_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_import_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_view_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/units/helpers/minifiers/minify_helper.php =================================================================== diff -u -N -r15137 -r15284 --- branches/5.2.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 15284) @@ -1,6 +1,6 @@ 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; Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_b.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_process.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_export_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_history_f2.gif =================================================================== diff -u -N -r14856 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.css =================================================================== diff -u -N --- branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.css (revision 0) +++ branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.css (revision 15284) @@ -0,0 +1,136 @@ +.core-toolbar-sprite { + background: url("@templates_base@/img/toolbar/toolbar-sprite.png") repeat-x scroll 0 0 transparent; + border: 0 none; + cursor: pointer; + padding: 0; +} +#core-tb-approve { background-position: -0px -0px; } +#core-tb-approve.hover { background-position: -32px -0px; } +#core-tb-approve.disabled { background-position: -64px -0px; } +#core-tb-archive { background-position: -0px -32px; } +#core-tb-archive.hover { background-position: -32px -32px; } +#core-tb-archive.disabled { background-position: -64px -32px; } +#core-tb-cancel { background-position: -0px -64px; } +#core-tb-cancel.hover { background-position: -32px -64px; } +#core-tb-cancel.disabled { background-position: -64px -64px; } +#core-tb-clear_selected { background-position: -0px -96px; } +#core-tb-clear_selected.hover { background-position: -32px -96px; } +#core-tb-clear_selected.disabled { background-position: -64px -96px; } +#core-tb-clone, #core-tb-copy { background-position: -0px -128px; } +#core-tb-clone.hover, #core-tb-copy.hover { background-position: -32px -128px; } +#core-tb-clone.disabled, #core-tb-copy.disabled { background-position: -64px -128px; } +#core-tb-cut { background-position: -0px -160px; } +#core-tb-cut.hover { background-position: -32px -160px; } +#core-tb-cut.disabled { background-position: -64px -160px; } +#core-tb-decline, #core-tb-deny { background-position: -0px -192px; } +#core-tb-decline.hover, #core-tb-deny.hover { background-position: -32px -192px; } +#core-tb-decline.disabled, #core-tb-deny.disabled { background-position: -64px -192px; } +#core-tb-delete { background-position: -0px -224px; } +#core-tb-delete.hover { background-position: -32px -224px; } +#core-tb-delete.disabled { background-position: -64px -224px; } +#core-tb-e-mail { background-position: -0px -256px; } +#core-tb-e-mail.hover { background-position: -32px -256px; } +#core-tb-e-mail.disabled { background-position: -64px -256px; } +#core-tb-edit { background-position: -0px -288px; } +#core-tb-edit.hover { background-position: -32px -288px; } +#core-tb-edit.disabled { background-position: -64px -288px; } +#core-tb-editcat { background-position: -0px -320px; } +#core-tb-editcat.hover { background-position: -32px -320px; } +#core-tb-editcat.disabled { background-position: -64px -320px; } +#core-tb-export { background-position: -0px -352px; } +#core-tb-export.hover { background-position: -32px -352px; } +#core-tb-export.disabled { background-position: -64px -352px; } +#core-tb-frontend_mail { background-position: -0px -384px; } +#core-tb-frontend_mail.hover { background-position: -32px -384px; } +#core-tb-frontend_mail.disabled { background-position: -64px -384px; } +#core-tb-history { background-position: -0px -416px; } +#core-tb-history.hover { background-position: -32px -416px; } +#core-tb-history.disabled { background-position: -64px -416px; } +#core-tb-homecat { background-position: -0px -448px; } +#core-tb-homecat.hover { background-position: -32px -448px; } +#core-tb-homecat.disabled { background-position: -64px -448px; } +#core-tb-import { background-position: -0px -480px; } +#core-tb-import.hover { background-position: -32px -480px; } +#core-tb-import.disabled { background-position: -64px -480px; } +#core-tb-move_down { background-position: -0px -512px; } +#core-tb-move_down.hover { background-position: -32px -512px; } +#core-tb-move_down.disabled { background-position: -64px -512px; } +#core-tb-move_up { background-position: -0px -544px; } +#core-tb-move_up.hover { background-position: -32px -544px; } +#core-tb-move_up.disabled { background-position: -64px -544px; } +#core-tb-new_cat { background-position: -0px -576px; } +#core-tb-new_cat.hover { background-position: -32px -576px; } +#core-tb-new_cat.disabled { background-position: -64px -576px; } +#core-tb-new_item { background-position: -0px -608px; } +#core-tb-new_item.hover { background-position: -32px -608px; } +#core-tb-new_item.disabled { background-position: -64px -608px; } +#core-tb-next { background-position: -0px -640px; } +#core-tb-next.hover { background-position: -32px -640px; } +#core-tb-next.disabled { background-position: -64px -640px; } +#core-tb-paste { background-position: -0px -672px; } +#core-tb-paste.hover { background-position: -32px -672px; } +#core-tb-paste.disabled { background-position: -64px -672px; } +#core-tb-prev { background-position: -0px -704px; } +#core-tb-prev.hover { background-position: -32px -704px; } +#core-tb-prev.disabled { background-position: -64px -704px; } +#core-tb-preview { background-position: -0px -736px; } +#core-tb-preview.hover { background-position: -32px -736px; } +#core-tb-preview.disabled { background-position: -64px -736px; } +#core-tb-print { background-position: -0px -768px; } +#core-tb-print.hover { background-position: -32px -768px; } +#core-tb-print.disabled { background-position: -64px -768px; } +#core-tb-process, #core-tb-reply { background-position: -0px -800px; } +#core-tb-process.hover, #core-tb-reply.hover { background-position: -32px -800px; } +#core-tb-process.disabled, #core-tb-reply.disabled { background-position: -64px -800px; } +#core-tb-query_database { background-position: -0px -832px; } +#core-tb-query_database.hover { background-position: -32px -832px; } +#core-tb-query_database.disabled { background-position: -64px -832px; } +#core-tb-rebuild_cache { background-position: -0px -864px; } +#core-tb-rebuild_cache.hover { background-position: -32px -864px; } +#core-tb-refresh { background-position: -0px -896px; } +#core-tb-refresh.hover { background-position: -32px -896px; } +#core-tb-refresh.disabled { background-position: -64px -896px; } +#core-tb-resend, #core-tb-usertogroup { background-position: -0px -928px; } +#core-tb-resend.hover, #core-tb-usertogroup.hover { background-position: -32px -928px; } +#core-tb-resend.disabled, #core-tb-usertogroup.disabled { background-position: -64px -928px; } +#core-tb-reset_edit { background-position: -0px -960px; } +#core-tb-reset_edit.hover { background-position: -32px -960px; } +#core-tb-reset_edit.disabled { background-position: -64px -960px; } +#core-tb-reset { background-position: -0px -992px; } +#core-tb-reset.hover { background-position: -32px -992px; } +#core-tb-reset.disabled { background-position: -64px -992px; } +#core-tb-reset_to_base { background-position: -0px -1024px; } +#core-tb-reset_to_base.hover { background-position: -32px -1024px; } +#core-tb-reset_to_base.disabled { background-position: -64px -1024px; } +#core-tb-reset_to_user { background-position: -0px -1056px; } +#core-tb-reset_to_user.hover { background-position: -32px -1056px; } +#core-tb-search { background-position: -0px -1088px; } +#core-tb-search.hover { background-position: -32px -1088px; } +#core-tb-search.disabled { background-position: -64px -1088px; } +#core-tb-search_reset_alt { background-position: -0px -1120px; } +#core-tb-search_reset_alt.hover { background-position: -32px -1120px; } +#core-tb-search_reset_alt.disabled { background-position: -64px -1120px; } +#core-tb-search_reset { background-position: -0px -1152px; } +#core-tb-search_reset.hover { background-position: -32px -1152px; } +#core-tb-search_reset.disabled { background-position: -64px -1152px; } +#core-tb-select { background-position: -0px -1184px; } +#core-tb-select.hover { background-position: -32px -1184px; } +#core-tb-select.disabled { background-position: -64px -1184px; } +#core-tb-select_user { background-position: -0px -1216px; } +#core-tb-select_user.hover { background-position: -32px -1216px; } +#core-tb-select_user.disabled { background-position: -64px -1216px; } +#core-tb-setprimary { background-position: -0px -1248px; } +#core-tb-setprimary.hover { background-position: -32px -1248px; } +#core-tb-setprimary.disabled { background-position: -64px -1248px; } +#core-tb-tools { background-position: -0px -1280px; } +#core-tb-tools.hover { background-position: -32px -1280px; } +#core-tb-tools.disabled { background-position: -64px -1280px; } +#core-tb-upcat { background-position: -0px -1312px; } +#core-tb-upcat.hover { background-position: -32px -1312px; } +#core-tb-upcat.disabled { background-position: -64px -1312px; } +#core-tb-usertogroup2 { background-position: -0px -1344px; } +#core-tb-usertogroup2.hover { background-position: -32px -1344px; } +#core-tb-usertogroup2.disabled { background-position: -64px -1344px; } +#core-tb-view { background-position: -0px -1376px; } +#core-tb-view.hover { background-position: -32px -1376px; } +#core-tb-view.disabled { background-position: -64px -1376px; } \ No newline at end of file Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_view.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_export.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_user.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/toolbar-sprite.png =================================================================== diff -u -N Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_e-mail_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clear_selected_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_down_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_process_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_print_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_preview_f2.gif =================================================================== diff -u -N -r14856 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_frontend_mail_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_base_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_setprimary_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_tools_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_next.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_next_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_decline_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_refresh.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_upcat.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_edit_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_view_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_import_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reply.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_a.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/incs/header.tpl =================================================================== diff -u -N -r14685 -r15284 --- branches/5.2.x/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 14685) +++ branches/5.2.x/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 15284) @@ -22,7 +22,8 @@ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cancel_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_rebuild_cache_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_edit_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_usertogroup2_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_query_database.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_cat_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_export_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_history_f3.gif =================================================================== diff -u -N -r14856 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_search_reset_alt_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_import.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_editcat.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_cut_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_archive_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_resend_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_reset_to_user_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_clone_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_history.gif =================================================================== diff -u -N -r14856 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_copy_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_homecat_f2.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_prev_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_new_item_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_paste_f2.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_deny_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_delete_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_select_user_f3.gif =================================================================== diff -u -N -r13840 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_approve_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_move_up_f3.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/admin_templates/img/toolbar/tool_print.gif =================================================================== diff -u -N -r14244 -r15284 Binary files differ Index: branches/5.2.x/core/kernel/utility/debugger.php =================================================================== diff -u -N -r15252 -r15284 --- branches/5.2.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 15252) +++ branches/5.2.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 15284) @@ -1,6 +1,6 @@ - +