Index: branches/RC/core/admin_templates/users/user_selector.tpl =================================================================== diff -u -N -r11623 -r11902 --- branches/RC/core/admin_templates/users/user_selector.tpl (.../user_selector.tpl) (revision 11623) +++ branches/RC/core/admin_templates/users/user_selector.tpl (.../user_selector.tpl) (revision 11902) @@ -36,6 +36,13 @@ + + + + + \ No newline at end of file Index: branches/RC/core/admin_templates/users/admin_edit_group.tpl =================================================================== diff -u -N -r11623 -r11902 --- branches/RC/core/admin_templates/users/admin_edit_group.tpl (.../admin_edit_group.tpl) (revision 11623) +++ branches/RC/core/admin_templates/users/admin_edit_group.tpl (.../admin_edit_group.tpl) (revision 11902) @@ -30,7 +30,7 @@
- + Index: branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl =================================================================== diff -u -N -r11698 -r11902 --- branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 11698) +++ branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 11902) @@ -64,7 +64,7 @@
- + " value="1"> Index: branches/RC/core/units/users/users_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 11892) +++ branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 11902) @@ -1,6 +1,6 @@ 6, // used for custom fields only (on user's case) 'StatisticsInfo' => Array( - 'pending' => Array( - 'icon' => 'icon16_user_pending.gif', - 'label' => 'la_Text_Users', - 'js_url' => '#url#', - 'url' => Array('t' => 'users/users_list', 'pass' => 'm,u', 'u_event' => 'OnSetFilterPattern', 'u_filters' => 'show_active=0,show_pending=1,show_disabled=0'), - 'status' => STATUS_PENDING, - ), - ), + 'pending' => Array( + 'icon' => 'icon16_user_pending.gif', + 'label' => 'la_Text_Users', + 'js_url' => '#url#', + 'url' => Array('t' => 'users/users_list', 'pass' => 'm,u', 'u_event' => 'OnSetFilterPattern', 'u_filters' => 'show_active=0,show_pending=1,show_disabled=0'), + 'status' => STATUS_PENDING, + ), + ), 'TitlePresets' => Array ( 'default' => Array ( @@ -130,25 +130,59 @@ 'users_list' => Array ( 'prefixes' => Array ('u_List'), 'format' => "!la_title_Users!", - 'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view'), + 'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view', 'dbl-click'), ), - 'users_edit' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#"), - 'user_edit_images' => Array ('prefixes' => Array ('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images!"), - 'user_edit_groups' => Array ('prefixes' => Array ('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups!"), - 'user_edit_items' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Items!"), - 'user_edit_custom' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"), + 'users_edit' => Array ( + 'prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#", + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ), + 'user_edit_images' => Array ( + 'prefixes' => Array ('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), + ), - 'admin_list' => Array ('prefixes' => Array ('u.admins_List'), 'format' => "!la_title_Administrators!"), - 'admins_edit' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#"), - 'regular_users_list' => Array ('prefixes' => Array ('u.regular_List'), 'format' => "!la_title_Users!"), - 'root_edit' => Array ('prefixes' => Array ('u'), 'format' => "!la_title_Editing_User! 'root'"), + 'user_edit_groups' => Array ( + 'prefixes' => Array ('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'edit', 'delete', 'primary_group', 'view', 'dbl-click'), + ), + 'user_edit_items' => Array ( + 'prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Items!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'edit', 'delete', 'view', 'dbl-click'), + ), + + 'user_edit_custom' => Array ( + 'prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), + ), + + 'admin_list' => Array ( + 'prefixes' => Array ('u.admins_List'), 'format' => "!la_title_Administrators!", + 'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'clone', 'refresh', 'view', 'dbl-click'), + ), + + 'admins_edit' => Array ( + 'prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#", + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ), + + 'regular_users_list' => Array ( + 'prefixes' => Array ('u.regular_List'), 'format' => "!la_title_Users!", + 'toolbar_buttons' => Array (), + ), + + 'root_edit' => Array ( + 'prefixes' => Array ('u'), 'format' => "!la_title_Editing_User! 'root'", + 'toolbar_buttons' => Array ('select', 'cancel'), + ), + 'user_edit_group' => Array ( 'prefixes' => Array ('u', 'u-ug'), 'edit_status_labels' => Array ('u-ug' => '!la_title_EditingMembership!'), 'format' => "#u_status# '#u_titlefield#' - #u-ug_status# '#u-ug_titlefield#'", + 'toolbar_buttons' => Array ('select', 'cancel'), ), 'user_image_edit' => Array ( @@ -157,10 +191,18 @@ 'edit_status_labels' => Array ('u-img' => '!la_title_Editing_Image!'), 'new_titlefield' => Array ('u-img' => '!la_title_New_Image!'), 'format' => "#u_status# '#u_titlefield#' - #u-img_status# '#u-img_titlefield#'", + 'toolbar_buttons' => Array ('select', 'cancel'), ), - 'user_select' => Array ('prefixes' => Array ('u_List'), 'format' => "!la_title_Users! - !la_title_SelectUser!"), - 'group_user_select' => Array ('prefixes' => Array ('u.group_List'), 'format' => "!la_title_Users! - !la_title_SelectUser!"), + 'user_select' => Array ( + 'prefixes' => Array ('u_List'), 'format' => "!la_title_Users! - !la_title_SelectUser!", + 'toolbar_buttons' => Array ('select', 'cancel', 'dbl-click'), + ), + + 'group_user_select' => Array ( + 'prefixes' => Array ('u.group_List'), 'format' => "!la_title_Users! - !la_title_SelectUser!", + 'toolbar_buttons' => Array ('select', 'cancel', 'view', 'dbl-click'), + ), 'tree_users' => Array('format' => '!la_section_overview!'), ), Index: branches/RC/core/admin_templates/stylesheets/style_editor.tpl =================================================================== diff -u -N -r11698 -r11902 --- branches/RC/core/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 11698) +++ branches/RC/core/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 11902) @@ -93,7 +93,7 @@
- + @@ -102,32 +102,32 @@ - + - + - + - + - + Index: branches/RC/core/units/logs/session_logs/session_logs_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 11892) +++ branches/RC/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 11902) @@ -1,6 +1,6 @@ TABLE_PREFIX.'SessionLogs', 'TitlePresets' => Array ( - 'session_log_list' => Array ('prefixes' => Array('session-log_List'), 'format' => '!la_tab_SessionLogs!',), + 'session_log_list' => Array ('prefixes' => Array('session-log_List'), 'format' => '!la_tab_SessionLogs!', + 'toolbar_buttons' => Array ('view', 'dbl-click'), + ), ), 'PermSection' => Array('main' => 'in-portal:session_logs'), Index: branches/RC/core/admin_templates/themes/file_edit.tpl =================================================================== diff -u -N -r11661 -r11902 --- branches/RC/core/admin_templates/themes/file_edit.tpl (.../file_edit.tpl) (revision 11661) +++ branches/RC/core/admin_templates/themes/file_edit.tpl (.../file_edit.tpl) (revision 11902) @@ -39,7 +39,7 @@
- + Index: branches/RC/core/units/stylesheets/stylesheets_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 11892) +++ branches/RC/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 11902) @@ -1,6 +1,6 @@ 'Name', 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('css'=>'!la_title_Adding_Stylesheet!'), - 'edit_status_labels' => Array('css'=>'!la_title_Editing_Stylesheet!'), - 'new_titlefield' => Array('css'=>'!la_title_New_Stylesheet!'), - ), + 'default' => Array( + 'new_status_labels' => Array('css'=>'!la_title_Adding_Stylesheet!'), + 'edit_status_labels' => Array('css'=>'!la_title_Editing_Stylesheet!'), + 'new_titlefield' => Array('css'=>'!la_title_New_Stylesheet!'), + ), - 'styles_list' => Array('prefixes' => Array('css_List'), 'format' => "!la_title_Stylesheets!"), + 'styles_list' => Array( + 'prefixes' => Array('css_List'), 'format' => "!la_title_Stylesheets!", + 'toolbar_buttons' => Array('new_style', 'edit', 'delete', 'approve', 'decline', 'clone', 'view', 'dbl-click'), + ), - 'stylesheets_edit' => Array('prefixes' => Array('css'), 'format' => "#css_status# '#css_titlefield#' - !la_title_General!"), + 'stylesheets_edit' => Array( + 'prefixes' => Array('css'), 'format' => "#css_status# '#css_titlefield#' - !la_title_General!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), + ), - 'base_styles' => Array('prefixes' => Array('css','selectors.base_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BaseStyles!"), + 'base_styles' => Array( + 'prefixes' => Array('css', 'selectors.base_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BaseStyles!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_selector', 'edit', 'delete', 'clone', 'view', 'dbl-click'), + ), - 'block_styles' => Array('prefixes' => Array('css','selectors.block_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BlockStyles!"), + 'block_styles' => Array( + 'prefixes' => Array('css', 'selectors.block_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BlockStyles!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_selector', 'edit', 'delete', 'clone', 'reset_to_base', 'view', 'dbl-click'), + ), - 'base_style_edit' => Array( 'prefixes' => Array('css','selectors'), - 'new_status_labels' => Array('selectors'=>'!la_title_Adding_BaseStyle!'), - 'edit_status_labels' => Array('selectors'=>'!la_title_Editing_BaseStyle!'), - 'new_titlefield' => Array('selectors'=>'!la_title_New_BaseStyle!'), - 'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"), + 'base_style_edit' => Array( + 'prefixes' => Array('css', 'selectors',), + 'new_status_labels' => Array('selectors' => '!la_title_Adding_BaseStyle!'), + 'edit_status_labels' => Array('selectors' => '!la_title_Editing_BaseStyle!'), + 'new_titlefield' => Array('selectors'=>'!la_title_New_BaseStyle!'), + 'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'", + 'toolbar_buttons' => Array('select', 'cancel'), + ), - 'block_style_edit' => Array( 'prefixes' => Array('css','selectors'), - 'new_status_labels' => Array('selectors'=>'!la_title_Adding_BlockStyle!'), - 'edit_status_labels' => Array('selectors'=>'!la_title_Editing_BlockStyle!'), - 'new_titlefield' => Array('selectors'=>'!la_title_New_BlockStyle!'), - 'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"), + 'block_style_edit' => Array( + 'prefixes' => Array('css', 'selectors'), + 'new_status_labels' => Array('selectors'=>'!la_title_Adding_BlockStyle!'), + 'edit_status_labels' => Array('selectors'=>'!la_title_Editing_BlockStyle!'), + 'new_titlefield' => Array('selectors'=>'!la_title_New_BlockStyle!'), + 'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'", + 'toolbar_buttons' => Array('select', 'cancel', 'reset_to_base'), + ), - 'style_edit' => Array('prefixes' => Array('selectors'), 'format' => "!la_title_EditingStyle! '#selectors_titlefield#'"), - ), + 'style_edit' => Array( + 'prefixes' => Array('selectors'), 'format' => "!la_title_EditingStyle! '#selectors_titlefield#'", + 'toolbar_buttons' => Array('select', 'cancel', 'reset_to_base'), + ), + ), 'EditTabPresets' => Array ( 'Default' => Array ( @@ -82,7 +104,7 @@ 'PermSection' => Array('main' => 'in-portal:configure_styles'), - /*'Sections' => Array ( + 'Sections' => Array ( 'in-portal:configure_styles' => Array ( 'parent' => 'in-portal:website_setting_folder', 'icon' => 'style', @@ -92,34 +114,38 @@ 'priority' => 10, 'type' => stTREE, ), - ),*/ + ), 'TableName' => TABLE_PREFIX.'Stylesheets', 'SubItems' => Array('selectorsbase', 'selectorsblock'), - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER), - ), + 'FilterMenu' => Array( + 'Groups' => Array( + Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER), + ), - 'Filters' => Array( - 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ), - 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ), - ) - ), + 'Filters' => Array( + 0 => Array('label' => 'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1'), + 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0'), + ), + ), - 'AutoDelete' => true, - 'AutoClone' => true, + 'AutoDelete' => true, - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', - ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', - ), + 'AutoClone' => true, + + 'ListSQLs' => Array( + '' => 'SELECT * FROM %s', ), // key - special, value - list select sql + + 'ItemSQLs' => Array( + '' => 'SELECT * FROM %s', ), + 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('Name' => 'asc'), - ) - ), + '' => Array( + 'Sorting' => Array('Name' => 'asc'), + ), + ), + 'Fields' => Array( 'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), @@ -132,17 +158,16 @@ 'VirtualFields' => Array(), 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif',0=>'icon16_style_disabled.gif',1=>'icon16_style.gif'), - 'Fields' => Array( - 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'first_chars' => 100, 'filter_block' => 'grid_like_filter'), - 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), - 'LastCompiled' => Array('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'), - ), + 'Default' => Array( + 'Icons' => Array('default' => 'icon16_custom.gif', 0 =>'icon16_style_disabled.gif', 1 =>'icon16_style.gif'), + 'Fields' => Array( + 'Name' => Array('title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), + 'Description' => Array('title'=>'la_col_Description', 'first_chars' => 100, 'filter_block' => 'grid_like_filter'), + 'Enabled' => Array('title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), + 'LastCompiled' => Array('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'), + ), + ), + ), + ); - ), - ), - ); - ?> \ No newline at end of file Index: branches/RC/core/admin_templates/popups/translator.tpl =================================================================== diff -u -N -r11623 -r11902 --- branches/RC/core/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 11623) +++ branches/RC/core/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 11902) @@ -33,7 +33,7 @@
- + Index: branches/RC/core/admin_templates/categories/relations_edit.tpl =================================================================== diff -u -N -r11724 -r11902 --- branches/RC/core/admin_templates/categories/relations_edit.tpl (.../relations_edit.tpl) (revision 11724) +++ branches/RC/core/admin_templates/categories/relations_edit.tpl (.../relations_edit.tpl) (revision 11902) @@ -47,7 +47,7 @@
- + Index: branches/RC/core/admin_templates/incs/menu_blocks.tpl =================================================================== diff -u -N -r11412 -r11902 --- branches/RC/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 11412) +++ branches/RC/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 11902) @@ -84,8 +84,10 @@ $Menus[''+'_view_menu'].addItem(rs('.columns'),'','javascript:openSelector("", "")'); + Index: branches/RC/core/admin_templates/reviews/review_direct_edit.tpl =================================================================== diff -u -N -r11668 -r11902 --- branches/RC/core/admin_templates/reviews/review_direct_edit.tpl (.../review_direct_edit.tpl) (revision 11668) +++ branches/RC/core/admin_templates/reviews/review_direct_edit.tpl (.../review_direct_edit.tpl) (revision 11902) @@ -33,13 +33,13 @@
- + - + Index: branches/RC/core/units/mailing_lists/mailing_lists_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 11892) +++ branches/RC/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array ('mailing-list' => '!la_title_ViewingMailingList!'), ), - 'mailing_list_list' => Array ('prefixes' => Array ('mailing-list_List'), 'format' => "!la_title_MailingLists!"), - 'mailing_list_edit' => Array ('prefixes' => Array ('mailing-list'), 'format' => "#mailing-list_status#"), + 'mailing_list_list' => Array ( + 'prefixes' => Array ('mailing-list_List'), 'format' => "!la_title_MailingLists!", + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'primary_theme', 'clone', 'view', 'dbl-click'), + ), + + 'mailing_list_edit' => Array ( + 'prefixes' => Array ('mailing-list'), 'format' => "#mailing-list_status#", + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ), ), 'PermSection' => Array('main' => 'in-portal:mailing_lists'), Index: branches/RC/core/units/groups/groups_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/groups/groups_config.php (.../groups_config.php) (revision 11892) +++ branches/RC/core/units/groups/groups_config.php (.../groups_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array('g' => ''), ), - 'group_list' => Array ('prefixes' => Array ('g.total_List'), 'format' => "!la_title_Groups!"), - 'groups_edit' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!"), - 'groups_edit_users' => Array ('prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users!" ), - 'groups_edit_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ), - 'groups_edit_additional_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ), - 'select_group' => Array('prefixes' => Array ('g.user_List'), 'format' => "!la_title_Groups! - !la_title_SelectGroup!"), + 'group_list' => Array ( + 'prefixes' => Array ('g.total_List'), 'format' => "!la_title_Groups!", + 'toolbar_buttons' => Array ('new_group', 'edit', 'delete', 'e-mail', 'view', 'dbl-click'), + ), + + 'groups_edit' => Array ( + 'prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), + ), + + 'groups_edit_users' => Array ( + 'prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'delete', 'view'), + ), + + 'groups_edit_permissions' => Array ( + 'prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'), + ), + + 'groups_edit_additional_permissions' => Array ( + 'prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!", + 'toolbar_buttons' => Array ('select', 'cancel'), + ), + + 'select_group' => Array( + 'prefixes' => Array ('g.user_List'), 'format' => "!la_title_Groups! - !la_title_SelectGroup!", + 'toolbar_buttons' => Array ('select', 'cancel', 'view'), + ), ), 'EditTabPresets' => Array ( Index: branches/RC/core/units/visits/visits_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/visits/visits_config.php (.../visits_config.php) (revision 11892) +++ branches/RC/core/units/visits/visits_config.php (.../visits_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array( - 'visits_list' => Array('prefixes' => Array('visits_List'), 'format' => "!la_title_Visits!"), - 'visits.incommerce_list' => Array('prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits!"), + 'visits_list' => Array( + 'prefixes' => Array('visits_List'), 'format' => "!la_title_Visits!", + 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), ), + + 'visits.incommerce_list' => Array( + 'prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits!", + 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + ), + ), + 'CalculatedFields' => Array( '' => Array ( 'UserName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)', Index: branches/RC/core/units/categories/categories_config.php =================================================================== diff -u -N -r11897 -r11902 --- branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11897) +++ branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array ('prefixes' => Array (), 'format' => "!la_title_Reviews!"), 'review_edit' => Array ('prefixes' => Array (), 'format' => "!la_title_Editing_Review!"), - 'categories_edit' => Array ('prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"), - 'categories_properties' => Array ('prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!"), - 'categories_relations' => Array ('prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Relations!"), + 'categories_edit' => Array ( + 'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!", + + ), + + 'categories_properties' => Array ( + 'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!", + + ), + + 'categories_relations' => Array ( + 'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Relations!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_relation', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), + + ), 'categories_related_searches' => Array ( 'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_RelatedSearches!", 'toolbar_buttons' => Array ('new_related_search', 'edit', 'delete', 'move_up', 'move_down', 'approve', 'decline', 'view'), ), - 'categories_images' => Array ('prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Images!"), + 'categories_images' => Array ( + 'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Images!", + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), + ), 'categories_permissions' => Array ('prefixes' => Array ('c', 'g_List'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Permissions!"), 'categories_custom' => Array ('prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"), 'categories_update' => Array ('prefixes' => Array (), 'format' => "!la_title_UpdatingCategories!"), @@ -127,20 +142,23 @@ 'edit_status_labels' => Array ('c-img' => '!la_title_Editing_Image!'), 'new_titlefield' => Array ('c-img' => ''), 'format' => "#c_status# '#c_titlefield#' - #c-img_status# '#c-img_titlefield#'", + 'toolbar_buttons' => Array ('select', 'cancel'), ), 'relations_edit' => Array ( 'prefixes' => Array ('c', 'c-rel'), 'new_status_labels' => Array ('c-rel' => "!la_title_Adding_Relationship! '!la_title_New_Relationship!'"), 'edit_status_labels' => Array ('c-rel' => '!la_title_Editing_Relationship!'), 'format' => "#c_status# '#c_titlefield#' - #c-rel_status#", + 'toolbar_buttons' => Array ('select', 'cancel'), ), 'related_searches_edit' => Array ( 'prefixes' => Array ('c', 'c-search'), 'new_status_labels' => Array ('c-search' => "!la_title_Adding_RelatedSearch_Keyword!"), 'edit_status_labels' => Array ('c-search' => '!la_title_Editing_RelatedSearch_Keyword!'), 'format' => "#c_status# '#c_titlefield#' - #c-search_status#", + 'toolbar_buttons' => Array ('select', 'cancel'), ), 'edit_content' => Array ('format' => '!la_EditingContent!'), Index: branches/RC/core/units/themes/themes_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/themes/themes_config.php (.../themes_config.php) (revision 11892) +++ branches/RC/core/units/themes/themes_config.php (.../themes_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array('theme' => '!la_title_NewTheme!'), ), - 'themes_list' => Array('prefixes' => Array('theme_List'), 'format' => "!la_tab_Themes!"), - 'themes_edit_general' => Array('prefixes' => Array('theme'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_General!"), - 'themes_edit_files' => Array('prefixes' => Array('theme', 'theme-file_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles!"), + 'themes_list' => Array( + 'prefixes' => Array('theme_List'), 'format' => "!la_tab_Themes!", + 'toolbar_buttons' => Array ('new_theme', 'edit', 'delete', 'primary_theme', 'rescan_themes', 'view', 'dbl-click'), + ), + 'themes_edit_general' => Array( + 'prefixes' => Array('theme'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_General!", + 'toolbar_buttons' => Array('select', 'cancel', 'prev', 'next'), + ), + + 'themes_edit_files' => Array( + 'prefixes' => Array('theme', 'theme-file_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles!", + 'toolbar_buttons' => Array('select', 'cancel', 'prev', 'next', 'view', 'dbl-click'), + ), + 'theme_file_edit' => Array ( 'prefixes' => Array ('theme', 'theme-file'), 'new_status_labels' => Array ('theme-file' => '!la_title_AddingThemeFile!'), 'edit_status_labels' => Array ('theme-file' => '!la_title_EditingThemeFile!'), 'new_titlefield' => Array ('theme-file' => '!la_title_NewThemeFile!'), 'format' => "#theme_status# '#theme_titlefield#' - #theme-file_status# '#theme-file_titlefield#'", + 'toolbar_buttons' => Array('select', 'cancel', 'reset_edit'), ), 'block_edit' => Array('prefixes' => Array('theme-file'), 'format' => "!la_title_EditingThemeFile! '#theme-file_titlefield#'"), @@ -95,6 +107,7 @@ 'ListSQLs' => Array ('' => ' SELECT %1$s.* %2$s FROM %s LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId = %1$s.StylesheetId'), + 'ItemSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %s LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId = %1$s.StylesheetId'), @@ -128,18 +141,17 @@ ), 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif', '1_1' => 'icon16_theme_primary.gif', '1_0' => 'icon16_theme.gif', '0_0' => 'icon16_theme_disabled.gif'), - 'Fields' => Array( - 'ThemeId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'filter_block' => 'grid_like_filter'), - 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), -// 'PrimaryTheme' => Array( 'title'=>'la_col_Primary', 'filter_block' => 'grid_options_filter'), - ), - - ), - ), + 'Default' => Array( + 'Icons' => Array('default'=>'icon16_custom.gif', '1_1' => 'icon16_theme_primary.gif', '1_0' => 'icon16_theme.gif', '0_0' => 'icon16_theme_disabled.gif'), + 'Fields' => Array( + 'ThemeId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter'), + 'Description' => Array( 'title'=>'la_col_Description', 'filter_block' => 'grid_like_filter'), + 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), +// 'PrimaryTheme' => Array( 'title'=>'la_col_Primary', 'filter_block' => 'grid_options_filter'), + ), + ), + ), ); ?> \ No newline at end of file Index: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl =================================================================== diff -u -N -r11698 -r11902 --- branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 11698) +++ branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 11902) @@ -71,7 +71,7 @@
- + " value="2"> Index: branches/RC/core/units/translator/translator_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/translator/translator_config.php (.../translator_config.php) (revision 11892) +++ branches/RC/core/units/translator/translator_config.php (.../translator_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array( 'default' => Array( - 'new_status_labels' => Array('trans'=>'!la_title_Adding_Order!'), - 'edit_status_labels' => Array('trans'=>'!la_title_Editing_Order!'), - 'new_titlefield' => Array('trans'=>''), - ), + 'new_status_labels' => Array('trans'=>'!la_title_Adding_Order!'), + 'edit_status_labels' => Array('trans'=>'!la_title_Editing_Order!'), + 'new_titlefield' => Array('trans'=>''), + ), - 'trans_edit' => Array('prefixes' => Array('trans'), 'format' => '!la_title_EditingTranslation!'), - + 'trans_edit' => Array( + 'prefixes' => Array('trans'), 'format' => '!la_title_EditingTranslation!', + 'toolbar_buttons' => Array ('select', 'cancel'), + ), ), 'ItemSQLs' => Array ('' => ''), @@ -47,11 +49,11 @@ ), 'VirtualFields' => Array( - 'Original' => Array(), - 'Language' => Array(), - 'SwitchLanguage' => Array('formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language', 'option_key_field' => 'LanguageId','option_title_field' => 'PackName'), - 'Translation' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => ''), - ), + 'Original' => Array(), + 'Language' => Array(), + 'SwitchLanguage' => Array('formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language', 'option_key_field' => 'LanguageId','option_title_field' => 'PackName'), + 'Translation' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => ''), + ), 'Grids' => Array(), ); Index: branches/RC/core/units/related_searches/related_searches_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/related_searches/related_searches_config.php (.../related_searches_config.php) (revision 11892) +++ branches/RC/core/units/related_searches/related_searches_config.php (.../related_searches_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array( '' => Array( - /* 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))', - 'ItemType' => '#ITEM_TYPES#', */ + ), ), @@ -76,30 +75,22 @@ 'RelatedSearchId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array('type'=>'int', 'not_null' => 1, 'required' => 1, 'default' => 0), 'Keyword' => Array('type'=>'string', 'required' => 1, 'not_null' => 1, 'default' => ''), - /* - 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'TargetType' => Array('type'=>'int','not_null'=>1,'default'=>0), - */ 'ItemType' => Array('type'=>'int', 'not_null' => 1, 'required' => 1, 'default' => 0), 'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), ), 'VirtualFields' => Array( - /* - 'ItemName' => Array(), - 'ItemType' => Array(), - */ + ), 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used - 'Fields' => Array( - 'RelatedSearchId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Keyword' => Array( 'title'=>'la_col_Keyword', 'data_block' => 'grid_keyword_td', 'filter_block' => 'grid_like_filter'), - 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), - ), - - ), - ), + 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used + 'Fields' => Array( + 'RelatedSearchId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Keyword' => Array( 'title'=>'la_col_Keyword', 'data_block' => 'grid_keyword_td', 'filter_block' => 'grid_like_filter'), + 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), + ), + ), + ), ); \ No newline at end of file Index: branches/RC/core/units/relationship/relationship_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 11892) +++ branches/RC/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array('type'=>'int', 'required' => 1, 'default' => NULL), 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'TargetType' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter', 'required' => 1, 'options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'),'not_null'=>1,'default'=>0,'use_phrases'=>1), - 'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1), + 'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter', 'required' => 1, 'options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'), 'not_null'=>1,'default'=>0,'use_phrases'=>1), + 'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'), 'not_null' => 1, 'default'=>1, 'use_phrases'=>1), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), ), - 'VirtualFields' => Array( 'ItemName' => Array(), + 'VirtualFields' => Array( + 'ItemName' => Array(), 'ItemType' => Array(), ), 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used - 'Fields' => Array( - 'RelationshipId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), - 'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'ItemType' => Array( 'title'=>'la_col_TargetType', 'filter_block' => 'grid_like_filter'), - 'Type' => Array( 'title'=>'la_col_RelationshipType', 'filter_block' => 'grid_options_filter'), - 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), - ), - - ), - ), + 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used + 'Fields' => Array( + 'RelationshipId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), + 'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), + 'ItemType' => Array( 'title'=>'la_col_TargetType', 'filter_block' => 'grid_like_filter'), + 'Type' => Array( 'title'=>'la_col_RelationshipType', 'filter_block' => 'grid_options_filter'), + 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), + ), + ), + ), ); \ No newline at end of file Index: branches/RC/core/units/stop_words/stop_words_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/stop_words/stop_words_config.php (.../stop_words_config.php) (revision 11892) +++ branches/RC/core/units/stop_words/stop_words_config.php (.../stop_words_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array ( 'prefixes' => Array ('stop-word_List'), 'format' => "!la_title_StopWords!", - 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'view'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), ), 'stop_word_edit' => Array ( Index: branches/RC/core/units/images/images_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/images/images_config.php (.../images_config.php) (revision 11892) +++ branches/RC/core/units/images/images_config.php (.../images_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array( - 'Default' => Array( - 'Icons' => Array('default'=>'icon17_custom.gif','1_0'=>'icon16_image.gif','0_0'=>'icon16_image_disabled.gif','1_1'=>'icon16_image_primary.gif'), - 'Fields' => Array( - 'ImageId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter'), - 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'image_caption_td', 'filter_block' => 'grid_like_filter'), - 'AltName' => Array( 'title'=>'la_col_AltName', 'filter_block' => 'grid_like_filter'), - 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td', 'filter_block' => 'grid_like_filter'), - 'Enabled' => Array( 'title'=>'la_col_ImageEnabled', 'filter_block' => 'grid_options_filter'), - 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'image_preview_td', 'filter_block' => 'grid_like_filter'), - ), - - ), - ), + 'Default' => Array( + 'Icons' => Array('default'=>'icon17_custom.gif','1_0'=>'icon16_image.gif','0_0'=>'icon16_image_disabled.gif','1_1'=>'icon16_image_primary.gif'), + 'Fields' => Array( + 'ImageId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter'), + 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'image_caption_td', 'filter_block' => 'grid_like_filter'), + 'AltName' => Array( 'title'=>'la_col_AltName', 'filter_block' => 'grid_like_filter'), + 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td', 'filter_block' => 'grid_like_filter'), + 'Enabled' => Array( 'title'=>'la_col_ImageEnabled', 'filter_block' => 'grid_options_filter'), + 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'image_preview_td', 'filter_block' => 'grid_like_filter'), + ), + ), + ), ); \ No newline at end of file Index: branches/RC/core/units/spelling_dictionary/spelling_dictionary_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/spelling_dictionary/spelling_dictionary_config.php (.../spelling_dictionary_config.php) (revision 11892) +++ branches/RC/core/units/spelling_dictionary/spelling_dictionary_config.php (.../spelling_dictionary_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array ( 'prefixes' => Array ('spelling-dictionary_List'), 'format' => "!la_title_SpellingDictionary!", - 'toolbar_buttons' => Array ('new_spelling_dictionary', 'edit', 'delete', 'export', 'view'), + 'toolbar_buttons' => Array ('new_spelling_dictionary', 'edit', 'delete', 'export', 'view', 'dbl-click'), ), 'spelling_dictionary_edit' => Array ( 'prefixes' => Array ('spelling-dictionary'), 'format' => "#spelling-dictionary_status# '#spelling-dictionary_titlefield#'", Index: branches/RC/core/units/reviews/reviews_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 11892) +++ branches/RC/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array ( 'reviews_edit' => Array('format' => "!la_title_Editing_Review!"), + + 'reviews' => Array( + 'toolbar_buttons' => Array('edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), + ), ), 'FilterMenu' => Array ( @@ -161,19 +165,18 @@ 'CreatedOn' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default'=>'#NOW#'), 'ReviewText' => Array('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''), 'Rating' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_None', 1 => 'lu_Rating_1', 2 => 'lu_Rating_2', 3 => 'lu_Rating_3', 4 => 'lu_Rating_4', 5 => 'lu_Rating_5'), 'use_phrases' => 1, 'min_value_inc' => 0, 'max_value_inc' => 5, 'default' => 0), - 'IPAddress' => Array('type'=>'string','max_value_inc'=>15,'not_null'=>1,'default'=>''), + 'IPAddress' => Array('type'=>'string', 'max_value_inc'=>15, 'not_null'=>1, 'default'=>'', ), 'ItemId' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'CreatedById' => Array('type' => 'int', 'formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), - 'ItemType' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>2 ), + 'CreatedById' => Array('type' => 'int', 'formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId', 'left_title_field'=>'Login', 'required'=>1, 'not_null'=>1, 'default'=>-1), + 'ItemType' => Array('type'=>'int', 'not_null'=>1, 'default'=>0), + 'Priority' => Array('type'=>'int', 'not_null'=>1, 'default'=>0), + 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active', 2=>'la_Pending', 0=>'la_Disabled'), 'not_null'=>1, 'default'=>2 ), 'TextFormat' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_text', 1 => 'la_html'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'Module' => Array('type'=>'string','not_null'=>1,'default'=>''), + 'Module' => Array('type'=>'string', 'not_null'=>1, 'default'=>''), ), 'VirtualFields' => Array ( 'ReviewedBy' => Array('type' => 'string', 'default' => ''), - 'CatalogItemName' => Array ('type' => 'string', 'default' => ''), 'CatalogItemId' => Array ('type' => 'int', 'default' => 0), 'CatalogItemCategory' => Array ('type' => 'int', 'default' => 0), Index: branches/RC/core/admin_templates/users/user_edit_group.tpl =================================================================== diff -u -N -r11623 -r11902 --- branches/RC/core/admin_templates/users/user_edit_group.tpl (.../user_edit_group.tpl) (revision 11623) +++ branches/RC/core/admin_templates/users/user_edit_group.tpl (.../user_edit_group.tpl) (revision 11902) @@ -29,7 +29,7 @@
- + Index: branches/RC/core/units/phrases/phrases_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 11892) +++ branches/RC/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array ('phrases' => '!la_title_Editing_Phrase!'), ), - 'phrase_edit' => Array ('prefixes' => Array ('phrases'), 'format' => '#phrases_status# #phrases_titlefield#'), + 'phrase_edit' => Array ( + 'prefixes' => Array ('phrases'), 'format' => '#phrases_status# #phrases_titlefield#', + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ), // for separate phrases list - 'phrases_list_st' => Array ('prefixes' => Array ('phrases.st_List'), 'format' => "!la_title_Phrases!"), - 'phrase_edit_single' => Array ('prefixes' => Array ('phrases'), 'format' => '#phrases_status# #phrases_titlefield#'), + 'phrases_list_st' => Array ( + 'prefixes' => Array ('phrases.st_List'), 'format' => "!la_title_Phrases!", + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), + ), + + 'phrase_edit_single' => Array ( + 'prefixes' => Array ('phrases'), 'format' => '#phrases_status# #phrases_titlefield#', + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ), ), 'FilterMenu' => Array ( @@ -97,7 +107,7 @@ // "Phrases" 'in-portal:phrases' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'core:settings_general', + 'icon' => 'conf_regional', 'label' => 'la_title_Phrases', 'url' => Array ('t' => 'languages/phrase_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), Index: branches/RC/core/units/thesaurus/thesaurus_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/thesaurus/thesaurus_config.php (.../thesaurus_config.php) (revision 11892) +++ branches/RC/core/units/thesaurus/thesaurus_config.php (.../thesaurus_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array ('thesaurus' => '!la_title_EditingThesaurus!'), ), - 'thesaurus_list' => Array ('prefixes' => Array ('thesaurus_List'), 'format' => "!la_title_Thesaurus!"), - 'thesaurus_edit' => Array ('prefixes' => Array ('thesaurus'), 'format' => "#thesaurus_status# '#thesaurus_titlefield#'"), + 'thesaurus_list' => Array ( + 'prefixes' => Array ('thesaurus_List'), 'format' => "!la_title_Thesaurus!", + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'export', 'view', 'dbl-click'), + ), + + 'thesaurus_edit' => Array ( + 'prefixes' => Array ('thesaurus'), 'format' => "#thesaurus_status# '#thesaurus_titlefield#'", + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ), ), 'PermSection' => Array('main' => 'in-portal:thesaurus'), Index: branches/RC/core/admin_templates/users/user_edit_items.tpl =================================================================== diff -u -N -r11823 -r11902 --- branches/RC/core/admin_templates/users/user_edit_items.tpl (.../user_edit_items.tpl) (revision 11823) +++ branches/RC/core/admin_templates/users/user_edit_items.tpl (.../user_edit_items.tpl) (revision 11902) @@ -128,7 +128,7 @@
- + Index: branches/RC/core/units/skins/skins_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/skins/skins_config.php (.../skins_config.php) (revision 11892) +++ branches/RC/core/units/skins/skins_config.php (.../skins_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array( 'prefixes' => Array('skin_List'), - 'format' => '!la_tab_Skins!', + 'format' => '!la_tab_Skins!', + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'primary_theme', 'clone', 'view', 'dbl-click'), ), 'skin_edit'=>Array( 'prefixes' => Array('skin'), 'format' => '#skin_status# #skin_titlefield#', + 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), ), ), Index: branches/RC/core/admin_templates/users/users_edit.tpl =================================================================== diff -u -N -r11623 -r11902 --- branches/RC/core/admin_templates/users/users_edit.tpl (.../users_edit.tpl) (revision 11623) +++ branches/RC/core/admin_templates/users/users_edit.tpl (.../users_edit.tpl) (revision 11902) @@ -68,13 +68,13 @@
- + - + @@ -89,7 +89,7 @@ - + Index: branches/RC/core/units/selectors/selectors_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 11892) +++ branches/RC/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array( - 'Default' => Array( - 'Icons' => Array('default'=>'icon16_selector.gif'), - 'Fields' => Array( - 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'), - ), - ), + 'Default' => Array( + 'Icons' => Array( + 'default'=>'icon16_selector.gif'), + 'Fields' => Array( + 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), + 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'), + 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'), + ), + ), - 'BlockStyles' => Array( - 'Icons' => Array('default'=>'icon16_selector.gif'), - 'Fields' => Array( - 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'), - 'ParentId' => Array('title'=>'la_col_Basedon', 'filter_block' => 'grid_options_filter'), - ), - ), - ), + 'BlockStyles' => Array( + 'Icons' => Array('default'=>'icon16_selector.gif'), + 'Fields' => Array( + 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), + 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'), + 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'), + 'ParentId' => Array('title'=>'la_col_Basedon', 'filter_block' => 'grid_options_filter'), + ), + ), + ), ); ?> \ No newline at end of file Index: branches/RC/core/admin_templates/categories/related_searches_edit.tpl =================================================================== diff -u -N -r11724 -r11902 --- branches/RC/core/admin_templates/categories/related_searches_edit.tpl (.../related_searches_edit.tpl) (revision 11724) +++ branches/RC/core/admin_templates/categories/related_searches_edit.tpl (.../related_searches_edit.tpl) (revision 11902) @@ -29,7 +29,7 @@
- + Index: branches/RC/core/units/pdf/pdf_config.php =================================================================== diff -u -N -r11892 -r11902 --- branches/RC/core/units/pdf/pdf_config.php (.../pdf_config.php) (revision 11892) +++ branches/RC/core/units/pdf/pdf_config.php (.../pdf_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'), 'RegisterClasses' => Array( - Array('pseudo'=>'PDFHelper','class'=>'kPDFHelper','file'=>'pdf_helper.php','build_event'=>'','require_classes'=>'kHelper'), + Array('pseudo' => 'PDFHelper', 'class'=>'kPDFHelper', 'file' => 'pdf_helper.php', 'build_event'=>'', 'require_classes' => 'kHelper'), ), ); \ No newline at end of file Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl =================================================================== diff -u -N -r11623 -r11902 --- branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 11623) +++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 11902) @@ -55,7 +55,7 @@
- +