Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl =================================================================== diff -u -r6848 -r6889 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 6848) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 6889) @@ -70,7 +70,7 @@ $Menus[''+'_view_menu'].showIcon = true; - $Menus[''+'_view_menu'].addItem(rs('.columns'),'','javascript:openSelector("", "", "", "400x500")'); + $Menus[''+'_view_menu'].addItem(rs('.columns'),'','javascript:openSelector("", "", "", "600x500")'); Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl =================================================================== diff -u -r6848 -r6889 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl (.../column_picker.tpl) (revision 6848) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl (.../column_picker.tpl) (revision 6889) @@ -1,27 +1,42 @@ - + - + + + - -
@@ -32,33 +47,32 @@ -
- : - - +
- - -
+ +

+

+ +

@@ -67,7 +81,7 @@
- +"/> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r6878 -r6889 --- branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 6878) +++ branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 6889) @@ -507,46 +507,42 @@ function PrintColumns($params) { - $var_name = $this->Application->GetVar('picker_name'); - $new = isset($params['new']) && $params['new']; - if ($new) { - $var_name = 'column_picker_'.$var_name; - } + $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper'); + /* @var $picker_helper kColumnPickerHelper */ - $user =& $this->Application->recallObject('u'); - $val = $user->getPersistantVar($var_name); - $cols = $val ? unserialize($val) : array(); + $main_prefix = $this->Application->GetVar('main_prefix'); + $cols = $picker_helper->LoadColumns($main_prefix); $o = ''; - if ($params['hidden'] == 'true') { + if (isset($params['hidden']) && $params['hidden']) { foreach ($cols['hidden_fields'] as $col) { - $title = $new ? $this->Application->Phrase($cols['titles'][$col]) : $cols['titles'][$col]; + $title = $this->Application->Phrase($cols['titles'][$col]); $o .= "