Index: branches/5.0.x/core/units/categories/categories_config.php =================================================================== diff -u -r12231 -r12248 --- branches/5.0.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 12231) +++ branches/5.0.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 12248) @@ -1,6 +1,6 @@ Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', - 'options_sql' => ' SELECT CONCAT(":: ", tf.Description, " :: ", FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName) ) AS Title, + 'options_sql' => ' SELECT CONCAT(tf.Description, " :: ", FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName) ) AS Title, CONCAT(FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName)) AS Value FROM ' . TABLE_PREFIX . 'ThemeFiles AS tf LEFT JOIN ' . TABLE_PREFIX . 'Theme AS t ON t.ThemeId = tf.ThemeId @@ -385,41 +385,41 @@ 'Default' => Array ( 'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'), 'Fields' => Array( - 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'), - 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ), - 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ), - 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ), - 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ), - 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', ), + 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50), + 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), + 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), + 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70), + 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75), ), ), 'Radio' => Array ( 'Selector' => 'radio', 'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'), 'Fields' => Array( - 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', ), - 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'), - 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ), - 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ), - 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ), - 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ), - 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', ), + 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 50), + 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), + 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), + 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70), + 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75), ), ), 'Structure' => Array ( 'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'), 'Fields' => Array( - 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'), - 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ), - 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ), - 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ), - 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ), - 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ), - 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', ), + 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50), + 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), + 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), + 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70), + 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter'), + 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75), ), ), ), Index: branches/5.0.x/core/units/general/helpers/col_picker_helper.php =================================================================== diff -u -r12117 -r12248 --- branches/5.0.x/core/units/general/helpers/col_picker_helper.php (.../col_picker_helper.php) (revision 12117) +++ branches/5.0.x/core/units/general/helpers/col_picker_helper.php (.../col_picker_helper.php) (revision 12248) @@ -1,6 +1,6 @@ $options) { $fields[$counter] = $name; $titles[$name] = $options['title']; - $widths[$name] = 100; // $options['width'] - depricated + $widths[$name] = array_key_exists('width', $options) ? $options['width'] : 100; // only once per grid ! if (isset($options['hidden']) && $options['hidden']) { $hidden[$counter] = $name;