Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl =================================================================== diff -u -r5763 -r5787 --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl (.../advanced_view.tpl) (revision 5763) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl (.../advanced_view.tpl) (revision 5787) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.15.2/kernel/admin_templates/xml/categories_list.tpl =================================================================== diff -u -r5636 -r5787 --- branches/unlabeled/unlabeled-1.15.2/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 5636) +++ branches/unlabeled/unlabeled-1.15.2/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 5787) @@ -34,6 +34,10 @@ a_toolbar.EnableButton('upcat'); a_toolbar.EnableButton('homecat'); + + Grids['c'].RadioMode = true; + Grids['c'].DblClick = function() {return false}; + $Catalog.reflectPasteButton(); #separator# @@ -42,7 +46,7 @@ + + +
_" width="50%"> - " id=""> + radiocheckbox" name="" id=""> ">  );">: Index: branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php =================================================================== diff -u -r5715 -r5787 --- branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5715) +++ branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5787) @@ -470,6 +470,33 @@ } return parent::PrintPages($params); } + + function InitCatalog($params) + { + $tab_prefixes = $this->Application->GetVar('tp'); // {all, , none} + if ($tab_prefixes === false) $tab_prefixes = 'all'; + $skip_prefixes = isset($params['skip_prefixes']) && $params['skip_prefixes'] ? explode(',', $params['skip_prefixes']) : Array(); + + // get all prefixes available + $prefixes = Array(); + foreach ($this->Application->ModuleInfo as $module_name => $module_data) { + if ($module_data['Var'] == 'm') continue; + $prefixes[] = $module_data['Var']; + } + + if ($tab_prefixes == 'none') { + $skip_prefixes = array_unique(array_merge($skip_prefixes, $prefixes)); + } + elseif ($tab_prefixes != 'all') { + // prefix list here + $tab_prefixes = explode(',', $tab_prefixes); // list of prefixes that should stay + $skip_prefixes = array_diff($prefixes, $tab_prefixes); + } + + $params['name'] = $params['render_as']; + $params['skip_prefixes'] = implode(',', $skip_prefixes); + return $this->Application->ParseBlock($params, 1); + } } Index: branches/unlabeled/unlabeled-1.15.2/core/admin_templates/categories/xml/categories_list.tpl =================================================================== diff -u -r5636 -r5787 --- branches/unlabeled/unlabeled-1.15.2/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 5636) +++ branches/unlabeled/unlabeled-1.15.2/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 5787) @@ -34,6 +34,10 @@ a_toolbar.EnableButton('upcat'); a_toolbar.EnableButton('homecat'); + + Grids['c'].RadioMode = true; + Grids['c'].DblClick = function() {return false}; + $Catalog.reflectPasteButton(); #separator# @@ -42,7 +46,7 @@ Index: branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl =================================================================== diff -u -r5715 -r5787 --- branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5715) +++ branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5787) @@ -20,7 +20,7 @@ + + + +
_" width="50%"> - " id=""> + radiocheckbox" name="" id=""> ">  );">: Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl (revision 5787) @@ -0,0 +1,52 @@ + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php =================================================================== diff -u -r5715 -r5787 --- branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5715) +++ branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5787) @@ -470,6 +470,33 @@ } return parent::PrintPages($params); } + + function InitCatalog($params) + { + $tab_prefixes = $this->Application->GetVar('tp'); // {all, , none} + if ($tab_prefixes === false) $tab_prefixes = 'all'; + $skip_prefixes = isset($params['skip_prefixes']) && $params['skip_prefixes'] ? explode(',', $params['skip_prefixes']) : Array(); + + // get all prefixes available + $prefixes = Array(); + foreach ($this->Application->ModuleInfo as $module_name => $module_data) { + if ($module_data['Var'] == 'm') continue; + $prefixes[] = $module_data['Var']; + } + + if ($tab_prefixes == 'none') { + $skip_prefixes = array_unique(array_merge($skip_prefixes, $prefixes)); + } + elseif ($tab_prefixes != 'all') { + // prefix list here + $tab_prefixes = explode(',', $tab_prefixes); // list of prefixes that should stay + $skip_prefixes = array_diff($prefixes, $tab_prefixes); + } + + $params['name'] = $params['render_as']; + $params['skip_prefixes'] = implode(',', $skip_prefixes); + return $this->Application->ParseBlock($params, 1); + } } Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_advanced_view.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_advanced_view.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_advanced_view.tpl (revision 5787) @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + +
+ "/> + + +
+ + + +
+ + + + + + + + + + + + + + + + +
+ .showall_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('.showall');"> + + + + + + +
+ + + (.showall_item_count">?) + + + + +
+
+ + + + + + + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.15.2/kernel/units/configuration/configuration_event_handler.php =================================================================== diff -u -r5497 -r5787 --- branches/unlabeled/unlabeled-1.15.2/kernel/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 5497) +++ branches/unlabeled/unlabeled-1.15.2/kernel/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 5787) @@ -171,26 +171,22 @@ $event->redirect_params = Array('opener' => 's', 'pass'=>'all,conf'); //stay! $event->redirect = false; }*/ - + /** - * Allows to process module root category selection + * Process items from selector (selected_ids var, key - prefix, value - comma separated ids) * * @param kEvent $event */ - function OnSelectItems(&$event) + function OnProcessSelected(&$event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); - - $items_info = $this->Application->GetVar('c'); - list($resource_id, $field_values) = each($items_info); - - if ($resource_id) { - $sql = 'SELECT CategoryId - FROM '.TABLE_PREFIX.'Category - WHERE ResourceId = '.$resource_id; - $category_id = $this->Conn->GetOne($sql); - $this->Application->StoreVar('ModuleRootCategory', $category_id); + $selected_ids = $this->Application->GetVar('selected_ids'); + $category_id = $selected_ids['c']; + if (strlen($category_id) == 0) { + // no category selected, the use current + $category_id = $this->Application->GetVar('m_cat_id'); } + + $this->Application->StoreVar('ModuleRootCategory', $category_id); $this->finalizePopup($event); } Index: branches/unlabeled/unlabeled-1.15.2/core/units/configuration/configuration_event_handler.php =================================================================== diff -u -r5497 -r5787 --- branches/unlabeled/unlabeled-1.15.2/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 5497) +++ branches/unlabeled/unlabeled-1.15.2/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 5787) @@ -171,26 +171,22 @@ $event->redirect_params = Array('opener' => 's', 'pass'=>'all,conf'); //stay! $event->redirect = false; }*/ - + /** - * Allows to process module root category selection + * Process items from selector (selected_ids var, key - prefix, value - comma separated ids) * * @param kEvent $event */ - function OnSelectItems(&$event) + function OnProcessSelected(&$event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); - - $items_info = $this->Application->GetVar('c'); - list($resource_id, $field_values) = each($items_info); - - if ($resource_id) { - $sql = 'SELECT CategoryId - FROM '.TABLE_PREFIX.'Category - WHERE ResourceId = '.$resource_id; - $category_id = $this->Conn->GetOne($sql); - $this->Application->StoreVar('ModuleRootCategory', $category_id); + $selected_ids = $this->Application->GetVar('selected_ids'); + $category_id = $selected_ids['c']; + if (strlen($category_id) == 0) { + // no category selected, the use current + $category_id = $this->Application->GetVar('m_cat_id'); } + + $this->Application->StoreVar('ModuleRootCategory', $category_id); $this->finalizePopup($event); } Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl (revision 5787) @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + +
+ "/> + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + +
Search:  + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + +
+ _tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('');"> + + + + + + +
+ + + (_item_count">?) + + + + +
+ +
+ + + + + + + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/advanced_view.tpl =================================================================== diff -u -r5763 -r5787 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/advanced_view.tpl (.../advanced_view.tpl) (revision 5763) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/advanced_view.tpl (.../advanced_view.tpl) (revision 5787) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/catalog_tab.tpl =================================================================== diff -u -r5751 -r5787 --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 5751) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 5787) @@ -12,6 +12,10 @@ Grids['c.showall'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline')); + + Grids['c.showall'].RadioMode = true; + Grids['c.showall'].DblClick = function() {return false}; + #separator# @@ -20,7 +24,7 @@ 		_" width="50%"> - " id=""> + radiocheckbox" name="" id=""> ">  : Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl (revision 5787) @@ -0,0 +1,52 @@ + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog_tab.tpl =================================================================== diff -u -r5751 -r5787 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 5751) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 5787) @@ -12,6 +12,10 @@ Grids['c.showall'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline')); + + Grids['c.showall'].RadioMode = true; + Grids['c.showall'].DblClick = function() {return false}; + #separator# @@ -20,7 +24,7 @@ _" width="50%"> - " id=""> + radiocheckbox" name="" id=""> ">  : Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl (revision 5787) @@ -0,0 +1,12 @@ + + + + +
+ + + + + +
+
\ No newline at end of file Index: branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/config/config_general.tpl =================================================================== diff -u -r5715 -r5787 --- branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/config/config_general.tpl (.../config_general.tpl) (revision 5715) +++ branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/config/config_general.tpl (.../config_general.tpl) (revision 5787) @@ -113,8 +113,7 @@ - - ', 'ModuleRootCategory');"> + ', 'ModuleRootCategory', '950x600');"> 		 
+ + + +
+ + + + + + + + + + + + + + + + +
+ .showall_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('.showall');"> + + + + + + +
+ + + (.showall_item_count">?) + + + + +
+
+ + + + + + + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_tabs.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_tabs.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_tabs.tpl (revision 5787) @@ -0,0 +1,12 @@ + + + + +
+ + + + + +
+
\ No newline at end of file Index: branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -r5715 -r5787 --- branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5715) +++ branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5787) @@ -20,7 +20,7 @@ +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + +
Search:  + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + +
+ _tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('');"> + + + + + + +
+ + + (_item_count">?) + + + + +
+ +
+ + + + + + + + + + \ No newline at end of file