Index: branches/RC/core/units/general/cat_tag_processor.php =================================================================== diff -u -r11093 -r11149 --- branches/RC/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 11093) +++ branches/RC/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 11149) @@ -149,9 +149,12 @@ $params['prefix'] .= $prefix_append; } + $default_grid = array_key_exists('default_grid', $params) ? $params['default_grid'] : 'Default'; + $radio_grid = array_key_exists('radio_grid', $params) ? $params['radio_grid'] : 'Radio'; + $params['cat_prefix'] = trim('c.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.'); $params['tab_mode'] = $tab_params['mode']; - $params['grid_name'] = ($tab_params['mode'] == 'multi') ? $params['default_grid'] : $params['radio_grid']; + $params['grid_name'] = ($tab_params['mode'] == 'multi') ? $default_grid : $radio_grid; $params['tab_dependant'] = $tab_params['dependant']; $params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name Index: branches/RC/core/admin_templates/img/icons/icon46_list_usergroups.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_user_group_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_email_log.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_advanced_view.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_catalog.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_reviews.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_users_settings.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_tools.gif =================================================================== diff -u Binary files differ Index: branches/RC/kernel/admin_templates/img/toolbar/tool_merge_links_f2.gif =================================================================== diff -u -r8929 -r11149 Binary files differ Index: branches/RC/kernel/admin_templates/img/toolbar/tool_merge_links_f3.gif =================================================================== diff -u -r8929 -r11149 Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_summary_logs.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_community.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_settings_email.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_banlist.gif =================================================================== diff -u Binary files differ Index: branches/RC/kernel/admin_templates/img/toolbar/tool_merge_links.gif =================================================================== diff -u -r8929 -r11149 Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_style.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_community.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_visits.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_server_info.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_tool_import.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_banlist.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_user_group.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_group_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/kernel/processors/main_processor.php =================================================================== diff -u -r10995 -r11149 --- branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 10995) +++ branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 11149) @@ -651,12 +651,12 @@ $module_key = mb_strtolower($module_name); if ($module_name == 'In-Portal') { - $module_prefix = $this->Application->IsAdmin() ? 'in-portal/' : $module_data['TemplatePath']; + // don't process In-Portal templates + continue; } - else { - $module_prefix = $this->Application->IsAdmin() ? $module_key.'/' : rtrim($module_data['TemplatePath'], '/').'/'; - } + $module_prefix = $this->Application->IsAdmin() ? $module_key.'/' : rtrim($module_data['TemplatePath'], '/').'/'; + $block_params['t'] = $module_prefix.$this->SelectParam($params, $module_key.'_template,'.$module_key.'_t,template,t'); if ($block_params['t'] == $current_template || in_array($module_data['Var'], $skip_prefixes)) continue; @@ -1172,7 +1172,7 @@ $db->Query($sql); } } - + function Timestamp($params) { $format = isset($params['format']) ? $params['format'] : 'd.m.Y H:i:s'; Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_group_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_rebuild_cache.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_users_settings.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_settings_email.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_struct.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_help.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_settings_search.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_copy.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_users.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_visits.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_usergroups.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_settings_custom.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_file_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_settings_search.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_file_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_users.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_tool_restore.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_tool_backup.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_summary_logs.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_cat_settings.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_search_log.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_catalog.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_reviews.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_tools.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_rebuild_cache_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_navigate.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_group.gif =================================================================== diff -u Binary files differ Index: branches/RC/kernel/admin_templates/img/toolbar/tool_new_paymenttype.gif =================================================================== diff -u -r8929 -r11149 Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_email_log.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_advanced_view.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_users_settings.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_editcat.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_tool_restore.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_community.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_file.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_server_info.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_new_related_search_f2.gif =================================================================== diff -u -r9334 -r11149 Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_new_file_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_email_log.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_settings_email.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_tool_import.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_banlist.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_advanced_view.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_cat_settings.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_search_log.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_editcat_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_paste.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_editcat_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_style.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_copy_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_copy_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_visits.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_cut_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_cut_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_style.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r11111 -r11149 --- branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 11111) +++ branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 11149) @@ -406,8 +406,13 @@ foreach ($this->Application->ModuleInfo as $module_name => $module_info) { $prefix = $module_info['Var']; - if (in_array($prefix, $skip_prefixes) || !$this->Application->prefixRegistred($prefix) || !$this->Application->getUnitOption($prefix, 'CatalogItem')) continue; - if ($prefix == 'm' && $replace_main) $prefix = 'c'; + if (in_array($prefix, $skip_prefixes) || !$this->Application->prefixRegistred($prefix) || !$this->Application->getUnitOption($prefix, 'CatalogItem')) { + continue; + } + if ($prefix == 'm' && $replace_main) { + $prefix = 'c'; + } + $label = $this->Application->getUnitOption($prefix, $params['title_property']); $block_params['title'] = $label; $block_params['prefix'] = $prefix; Index: branches/RC/core/admin_templates/img/icons/icon46_struct.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_settings_search.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_users.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_paste_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_tool_backup.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_paste_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_new_file.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_new_related_search.gif =================================================================== diff -u -r9334 -r11149 Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_usergroups.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_settings_custom.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_summary_logs.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_struct.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_list_settings_custom.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_cat_settings.gif =================================================================== diff -u Binary files differ Index: branches/RC/kernel/admin_templates/img/toolbar/tool_new_paymenttype_f2.gif =================================================================== diff -u -r8929 -r11149 Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_search_log.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_catalog.gif =================================================================== diff -u Binary files differ Index: branches/RC/kernel/admin_templates/img/toolbar/tool_new_paymenttype_f3.gif =================================================================== diff -u -r8929 -r11149 Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_clear_selected_f2.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon24_tools.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_clear_selected_f3.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_reviews.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/icons/icon46_navigate.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_clear_selected.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_cut.gif =================================================================== diff -u Binary files differ Index: branches/RC/core/admin_templates/img/toolbar/tool_primary_user_group_f2.gif =================================================================== diff -u Binary files differ