Index: branches/RC/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r11164 -r11368 --- branches/RC/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 11164) +++ branches/RC/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 11368) @@ -329,7 +329,12 @@ $no_special = isset($params['no_special']) && $params['no_special']; if ($no_special) return $this->Special; - $list_unique_key = $this->getUniqueListKey($params).$parent_cat_id; + $list_unique_key = $this->getUniqueListKey($params); + if (!$this->Application->IsAdmin()) { + // add parent category to special, when on Front-End, + // because there can be many category lists on same page + $list_unique_key .= $parent_cat_id; + } if ($list_unique_key == '') { return parent::BuildListSpecial($params); } @@ -854,6 +859,64 @@ $url_params = Array('admin' => 1, 'pass' => 'm', 'index_file' => 'index.php'); return $this->Application->HREF($template,'_FRONT_END_', $url_params); } + + function InitCatalogTab($params) + { + $tab_params['mode'] = $this->Application->GetVar('tm'); // single/multi selection possible + $tab_params['special'] = $this->Application->GetVar('ts'); // use special for this tab + $tab_params['dependant'] = $this->Application->GetVar('td'); // is grid dependant on categories grid + + // set default params (same as in catalog) + if ($tab_params['mode'] === false) $tab_params['mode'] = 'multi'; + if ($tab_params['special'] === false) $tab_params['special'] = ''; + if ($tab_params['dependant'] === false) $tab_params['dependant'] = 'yes'; + + // pass params to block with tab content + $params['name'] = $params['render_as']; + $params['prefix'] = trim($this->Prefix.'.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.'); + + $prefix_append = $this->Application->GetVar('prefix_append'); + if ($prefix_append) { + $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') ? $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 + + return $this->Application->ParseBlock($params, 1); + } + + /** + * Show CachedNavbar of current item primary category + * + * @param Array $params + * @return string + */ + function CategoryName($params) + { + // show category cachednavbar of + $object =& $this->getObject($params); + $category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId'); + + $category_path = $this->Application->getCache('category_paths', $category_id); + if ($category_path === false) { + // not chached + if ($category_id > 0) { + $category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $object->GetField('CachedNavbar')), ' > '); + } + else { + $category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') ); + } + $this->Application->setCache('category_paths', $category_id, $category_path); + } + return $category_path; + } } ?> \ No newline at end of file Index: branches/RC/core/admin_templates/catalog/catalog_counters.tpl =================================================================== diff -u -N --- branches/RC/core/admin_templates/catalog/catalog_counters.tpl (revision 0) +++ branches/RC/core/admin_templates/catalog/catalog_counters.tpl (revision 11368) @@ -0,0 +1,20 @@ +// counters + + +// category related statistics +$Catalog.ParentCategoryID = ; +set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') ); + + + + + + + );"> + + + + +setInnerHTML('category_path', ''); + + \ No newline at end of file Index: branches/RC/core/admin_templates/catalog/catalog_elements.tpl =================================================================== diff -u -N --- branches/RC/core/admin_templates/catalog/catalog_elements.tpl (revision 0) +++ branches/RC/core/admin_templates/catalog/catalog_elements.tpl (revision 11368) @@ -0,0 +1,75 @@ + + checked/> + + + + + +
+ + +
+
+ + + + + + +
+ + +
+ + + + + +
+ + + + + +
+ + + + +
+
+ + \ No newline at end of file Index: branches/RC/core/install/english.lang =================================================================== diff -u -N -r11302 -r11368 --- branches/RC/core/install/english.lang (.../english.lang) (revision 11302) +++ branches/RC/core/install/english.lang (.../english.lang) (revision 11368) @@ -103,6 +103,9 @@ RHVyYXRpb24gVHlwZQ== RWZmZWN0aXZl RW1haWw= + RW1haWxzIFF1ZXVlZA== + RW1haWxzIFNlbnQ= + RW1haWxzIFRvdGFs Jm5ic3A7 RXZlbnQ= RmllbGQgQ29tcGFyaXNpb24= @@ -138,10 +141,13 @@ TmFtZQ== TG9jYXRpb24= TG9naW4= + TWFpbGluZyBMaXN0 TWFzdGVyIElE TWFzdGVyIFByZWZpeA== TWVtYmVyc2hpcCBFeHBpcmVz TWVzc2FnZSBIZWFkZXJz + TWVzc2FnZSBIdG1s + TWVzc2FnZSBUZXh0 TWlzc3BlbGxlZCBXb3Jk TW9kdWxl TmFtZQ== @@ -712,6 +718,9 @@ RWRpdG9ycyBQaWNr RWxhcHNlZCBUaW1l RS1tYWls + RW1haWxzIFF1ZXVlZA== + RW1haWxzIFNlbnQ= + RW1haWxzIFRvdGFs RW5hYmxlZA== RXJyb3IgVGFn RXN0aW1hdGVkIFRpbWU= @@ -987,6 +996,7 @@ QWZ0ZXI= QWxsb3c= QmVmb3Jl + Q2FuY2VsbGVk Q2l0eQ== ZGF5KHMp RGVueQ== @@ -999,7 +1009,10 @@ TGFzdCBOYW1l bWludXRlKHMp bW9udGgocyk= + Tm90IFByb2Nlc3NlZA== + UGFydGlhbGx5IFByb2Nlc3NlZA== UGhvbmU= + UHJvY2Vzc2Vk UnVubmluZw== c2Vjb25kKHMp U3RhdGU= @@ -1898,6 +1911,7 @@ QWRkaW5nIEJhbiBSdWxl QWRkaW5nIEN1c3RvbSBGaWVsZA== QWRkaW5nIEZpbGU= + QWRkaW5nIE1haWxpbmcgTGlzdA== QWRkaW5nIFNraW4= QWRkaW5nIFNwZWxsaW5nIERpY3Rpb25hcnk= QWRkaW5nIEJhc2UgU3R5bGU= @@ -1995,6 +2009,7 @@ TGFuZ3VhZ2UgUGFja3M= TGFuZ3VhZ2VzIE1hbmFnZW1lbnQ= TG9hZGluZyAuLi4= + TWFpbGluZyBMaXN0cw== TW9kdWxlIFN0YXR1cw== TmV3IEFnZW50 TmV3IEN1c3RvbSBGaWVsZA== @@ -2055,6 +2070,7 @@ VXNlcnM= U2VsZWN0IHVzZXI= VXNlcnMgTWFuYWdlbWVudA== + Vmlld2luZyBNYWlsaW5nIExpc3Q= VmlzaXRz V2Vic2l0ZSBTZXR0aW5ncw== dG8= @@ -2156,6 +2172,7 @@ UmVzZXQ= U2VsZWN0 U2VsZWN0IFVzZXI= + U2VuZA== U2VuZCBFLW1haWw= U2VuZCBFLW1haWw= U2V0IFByaW1hcnk= Index: branches/RC/core/admin_templates/catalog/catalog_tabs.tpl =================================================================== diff -u -N --- branches/RC/core/admin_templates/catalog/catalog_tabs.tpl (revision 0) +++ branches/RC/core/admin_templates/catalog/catalog_tabs.tpl (revision 11368) @@ -0,0 +1,33 @@ + + + + + +
+ + + + + + + +
+ _tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('');"> + + + + + + +
+ + + + + + (_item_count">?) + + +
+
+
\ No newline at end of file Index: branches/RC/core/admin_templates/incs/custom_blocks.tpl =================================================================== diff -u -N -r10537 -r11368 --- branches/RC/core/admin_templates/incs/custom_blocks.tpl (.../custom_blocks.tpl) (revision 10537) +++ branches/RC/core/admin_templates/incs/custom_blocks.tpl (.../custom_blocks.tpl) (revision 11368) @@ -1,5 +1,5 @@ - " /> + " /> @@ -43,68 +43,104 @@ - - - - - - " id="" value="" size="" datepickerIcon="admin/images/ddarrow.gif"> () + " id="" value="" size="" datepickerIcon="admin/images/ddarrow.gif">  + + () + " value=""> - - - - - - " id="" value="" size="" datepickerIcon="admin/images/ddarrow.gif"> () + " id="" value="" size="" datepickerIcon="admin/images/ddarrow.gif">  + + () + " />  " id="" value="" size=""> () - + - " > - - + + "> + + ', '')" onmouseout="hide_form_error('')"> + + +   + + + -   + - - - + - - - + - + >> global settings needed for thickbox <<<-----------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +/* *{padding: 0; margin: 0;} */ + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_window { + font: 12px Arial, Helvetica, sans-serif; + color: #333333; +} + +#TB_secondLine { + font: 10px Arial, Helvetica, sans-serif; + color:#666666; +} + +#TB_window a:link {color: #666666;} +#TB_window a:visited {color: #666666;} +#TB_window a:hover {color: #000;} +#TB_window a:active {color: #666666;} +#TB_window a:focus{color: #666666;} + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_overlay { + position: fixed; + z-index:100; + top: 0px; + left: 0px; + height:100%; + width:100%; +} + +.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} +.TB_overlayBG { + background-color:#000; + filter:alpha(opacity=75); + -moz-opacity: 0.75; + opacity: 0.75; +} + +* html #TB_overlay { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_window { + position: fixed; + background: #ffffff; + z-index: 102; + color:#000000; + display:none; + border: 4px solid #525252; + text-align:left; + top:50%; + left:50%; +} + +* html #TB_window { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_window img#TB_Image { + display:block; + margin: 15px 0 0 15px; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-top: 1px solid #666; + border-left: 1px solid #666; +} + +#TB_caption{ + height:25px; + padding:7px 30px 10px 25px; + float:left; +} + +#TB_closeWindow{ + height:25px; + padding:11px 25px 10px 0; + float:right; +} + +#TB_closeAjaxWindow{ + padding:7px 10px 5px 0; + margin-bottom:1px; + text-align:right; + float:right; +} + +#TB_ajaxWindowTitle{ + float:left; + padding:7px 0 5px 10px; + margin-bottom:1px; + font-weight: bold; +} + +#TB_title{ + background-color:#e8e8e8; + height:27px; +} + +#TB_ajaxContent{ + clear:both; + padding:2px 15px 15px 15px; + overflow:auto; + text-align:left; + line-height:1.4em; +} + +#TB_ajaxContent.TB_modal{ + padding:15px; +} + +#TB_ajaxContent p{ + padding:5px 0px 5px 0px; +} + +#TB_load{ + position: fixed; + display:none; + height:13px; + width:208px; + z-index:103; + top: 50%; + left: 50%; + margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ +} + +* html #TB_load { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_HideSelect{ + z-index:99; + position:fixed; + top: 0; + left: 0; + background-color:#fff; + border:none; + filter:alpha(opacity=0); + -moz-opacity: 0; + opacity: 0; + height:100%; + width:100%; +} + +* html #TB_HideSelect { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_iframeContent{ + clear:both; + border:none; + margin-bottom:-1px; + margin-top:1px; + _margin-bottom:1px; +} Index: branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl =================================================================== diff -u -N -r10961 -r11368 --- branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 10961) +++ branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 11368) @@ -61,19 +61,16 @@ a_toolbar.Render(); + + - - + + - - - - - - + + - - - - - - + - - - - - - - -
- - - - - - - - -
Search:  - - - - -
-
+ - + Application.setHook( + 'm:OnAfterWindowLoad', + function() { + $Catalog.Init(); + } + ); + - - - - - - - - -
- _tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('');"> - - - - - - -
- - - (_item_count">?) - - - - -
- -
- - - - \ No newline at end of file Index: branches/RC/core/admin_templates/incs/close_popup.tpl =================================================================== diff -u -N -r11333 -r11368 --- branches/RC/core/admin_templates/incs/close_popup.tpl (.../close_popup.tpl) (revision 11333) +++ branches/RC/core/admin_templates/incs/close_popup.tpl (.../close_popup.tpl) (revision 11368) @@ -1,18 +1,20 @@ + + + + -
- - - - - - - - - -
- -rev_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('-rev');"> - - - - - - -
- - - (-rev_item_count">?) - - - - -
-
- Index: branches/RC/core/admin_templates/skins/skin_list.tpl =================================================================== diff -u -N -r8929 -r11368 --- branches/RC/core/admin_templates/skins/skin_list.tpl (.../skin_list.tpl) (revision 8929) +++ branches/RC/core/admin_templates/skins/skin_list.tpl (.../skin_list.tpl) (revision 11368) @@ -1,4 +1,3 @@ - @@ -10,7 +9,7 @@ - + +
+
- - - - - - - - - - - - - - -
- - - - - - - - -
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/RC/core/admin_templates/js/application.js =================================================================== diff -u -N -r9639 -r11368 --- branches/RC/core/admin_templates/js/application.js (.../application.js) (revision 9639) +++ branches/RC/core/admin_templates/js/application.js (.../application.js) (revision 11368) @@ -1,12 +1,5 @@ function kApplication() { this.Hooks = new Array (); - - addLoadEvent( - function () { - Application.processHooks('m:OnAfterWindowLoad'); - } - ); - } kApplication.prototype.SetVar = function ($name, $value) { @@ -23,6 +16,14 @@ $hook_mode = hBEFORE; } if (typeof $hook_to == 'string') { + if ($hook_to == 'm:OnAfterWindowLoad') { + $(document).ready($do_code); + + // call add load method here, when jquery not available +// this.addLoadEvent($do_code); + return ; + } + setArrayValue(this.Hooks, $hook_to, $hook_mode, $do_code); } else { @@ -34,6 +35,21 @@ } } +kApplication.prototype.addLoadEvent = function (func, wnd) { + if (!wnd) wnd = window + var oldonload = wnd.onload; + if (typeof wnd.onload != 'function') { + wnd.onload = func; + } else { + wnd.onload = function() { + if (oldonload) { + oldonload(); + } + func(); + } + } +} + kApplication.prototype.processHooks = function ($hook_to, $hook_mode) { if (!isset($hook_mode)) { $hook_mode = hBEFORE; Index: branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js =================================================================== diff -u -N --- branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js (revision 0) +++ branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js (revision 11368) @@ -0,0 +1,465 @@ +/* + * Thickbox 3.1 - One Box To Rule Them All. + * By Cody Lindley (http://www.codylindley.com) + * Copyright (c) 2007 cody lindley + * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php +*/ + +// on page load call TB.init +$(document).ready( + function() { + // pass where to apply thickbox + TB.init('a.thickbox, area.thickbox, input.thickbox'); + + // preload image + TB.imgLoader = new Image(); + TB.imgLoader.src = TB.pathToImage; + } +); + +function TB () { + this.imgLoader = null; + this.pathToImage = 'images/loadingAnimation.gif'; + + this.Width = null; + this.Height = null; +} + +//add thickbox to href & area elements that have a class of .thickbox +TB.init = function (domChunk) { + $(domChunk).click( + function() { + var t = this.title || this.name || null; + var a = this.href || this.alt; + var g = this.rel || false; + + TB.show( {caption: t, url: a, imageGroup: g} ); + this.blur(); + return false; + } + ); +} + +// function called when the user clicks on a thickbox link +TB.show = function (params) { + +// caption, url, imageGroup, onDataReceived, onAfterShow, postParams + try { + if (typeof document.body.style.maxHeight === 'undefined') { + // if IE 6 + $('body', 'html').css( {height: '100%', width: '100%'} ); + $('html').css('overflow', 'hidden'); + + if (document.getElementById('TB_HideSelect') === null) { + // iframe to hide select elements in ie6 + $('body').append("
"); + $('#TB_overlay').click(TB.remove); + } + } else { + // all others + if (document.getElementById('TB_overlay') === null) { + $('body').append("
"); + $('#TB_overlay').click(TB.remove); + } + } + + if (TB.detectMacXFF()) { + $('#TB_overlay').addClass('TB_overlayMacFFBGHack'); // use png overlay so hide flash + } else { + $('#TB_overlay').addClass('TB_overlayBG'); // use background and opacity + } + + if (params.caption === null) { + params.caption = ''; + } + + $('body').append("
"); // add loader to the page + $('#TB_load').show(); // show loader + + var baseURL; + if (params.url.indexOf('?') !== -1) { + // ff there is a query string involved + baseURL = params.url.substr(0, params.url.indexOf('?')); + } else { + baseURL = params.url; + } + + var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/; + var url_params = {}; + + if ( baseURL.toLowerCase().match(urlString) ) { + TB.processImages(params, urlString); + } else { + var queryString = params.url.replace(/^[^\?]+\??/,''); + url_params = TB.parseQuery(queryString); + + TB.processDialog(params, url_params); + } + + if (url_params['modal'] != 'true') { + $(document).bind( + 'keyup', + function(e){ + if (e.which == 27){ + // close + TB.remove(); + } + } + ); + } + } catch(e) { + //nothing here + } +} + +// helper functions below +TB.processImages = function (params, urlString) { + // code to show images + var TB_PrevCaption = ''; + var TB_PrevURL = ''; + var TB_PrevHTML = ''; + var TB_NextCaption = ''; + var TB_NextURL = ''; + var TB_NextHTML = ''; + var TB_imageCount = ''; + var TB_FoundURL = false; + + if (params.imageGroup) { + // scan images in group to create Prev/Next links + var TB_TempArray = $('a[@rel=' + params.imageGroup + ']').get(); + for (var TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === '')); TB_Counter++) { + var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString); + if (!(TB_TempArray[TB_Counter].href == params.url)) { + if (TB_FoundURL) { + TB_NextCaption = TB_TempArray[TB_Counter].title; + TB_NextURL = TB_TempArray[TB_Counter].href; + TB_NextHTML = "  Next >"; + } else { + TB_PrevCaption = TB_TempArray[TB_Counter].title; + TB_PrevURL = TB_TempArray[TB_Counter].href; + TB_PrevHTML = "  < Prev"; + } + } else { + TB_FoundURL = true; + TB_imageCount = 'Image ' + (TB_Counter + 1) + ' of ' + TB_TempArray.length; + } + } + } + + var imgPreloader = new Image(); + $(imgPreloader).bind( + 'load', + function() { + $(this).unbind('load'); + var $image_size = TB.scaleImage.call(TB, this); + + TB.Width = $image_size.width + 30; + TB.Height = $image_size.height + 60; + $('#TB_window').append("" + params.caption + "" + "
" + params.caption + "
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); + $('#TB_closeWindowButton').click(TB.remove); + + if (TB_PrevHTML !== '') { + function goPrev() { + $('#TB_window').remove(); + $('body').append("
"); + TB.show( {caption: TB_PrevCaption, url: TB_PrevURL, imageGroup: params.imageGroup} ); + return false; + } + + $('#TB_prev').click(goPrev); + } + + if (TB_NextHTML !== '') { + function goNext() { + $('#TB_window').remove(); + $('body').append("
"); + TB.show( {caption: TB_NextCaption, url: TB_NextURL, imageGroup: params.imageGroup} ); + return false; + } + + $('#TB_next').click(goNext); + + } + + $(document).bind( + 'keydown', + function(e) { + var keycode = e.which; + + if (keycode == 27) { // close + TB.remove(); + } else if (keycode == 190) { + // display previous image + if (TB_NextHTML != '') { + $(this).unbind('keydown'); + goNext(); + } + } else if (keycode == 188) { + // display next image + if(TB_PrevHTML != ''){ + $(this).unbind('keydown'); + goPrev(); + } + } + } + ); + + // show image after it's loaded + TB.position(); + $('#TB_load').remove(); + $('#TB_ImageOff').click(TB.remove); + $('#TB_window').css('display', 'block'); // for safari using css instead of show + } + ); + + imgPreloader.src = params.url; +} + +TB.scaleImage = function ($image) { + // resizing large images - orginal by Christian Montoya edited by me + var pagesize = TB.getPageSize(); + var x = pagesize[0] - 150; + var y = pagesize[1] - 150; + + var imageWidth = $image.width; + var imageHeight = $image.height; + + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + } + } else if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + } + } + + return {width: imageWidth, height: imageHeight}; +} + +TB.processDialog = function (params, url_params) { + // code to show html + + // window size is global + TB.Width = (url_params['width'] * 1) + 30 || 630; // defaults to 630 if no paramaters were added to URL + TB.Height = (url_params['height'] * 1) + 40 || 440; // defaults to 440 if no paramaters were added to URL + + var ajaxContentW = TB.Width - 30; + var ajaxContentH = TB.Height - 45; + + if (params.url.indexOf('TB_iframe') != -1) { + // either iframe or ajax window + urlNoQuery = params.url.split('TB_'); + $('#TB_iframeContent').remove(); + + if (url_params['modal'] != 'true') { + // iframe no modal + $('#TB_window').append("
" + params.caption + "
close or Esc Key
"); + }else{ + // iframe modal + $('#TB_overlay').unbind(); + $('#TB_window').append(""); + } + } else { + // not an iframe, ajax + if ($('#TB_window').css('display') != 'block') { + if (url_params['modal'] != 'true') { + // ajax no modal + $('#TB_window').append("
" + params.caption + "
close or Esc Key
"); + } else { + // ajax modal + $('#TB_overlay').unbind(); + $('#TB_window').append("
"); + } + } else { + // this means the window is already up, we are just loading new content via ajax + $('#TB_ajaxContent')[0].style.width = ajaxContentW + 'px'; + $('#TB_ajaxContent')[0].style.height = ajaxContentH + 'px'; + $('#TB_ajaxContent')[0].scrollTop = 0; + $('#TB_ajaxWindowTitle').html(params.caption); + } + } + + $('#TB_closeWindowButton').click(TB.remove); + + if (params.url.indexOf('TB_inline') != -1) { + $('#TB_ajaxContent').append( $('#' + url_params['inlineId']).children() ); + $('#TB_window').unload( + function () { + // move elements back when you're finished + $('#' + url_params['inlineId']).append( $('#TB_ajaxContent').children() ); + } + ); + + TB.position(); + $('#TB_load').remove(); + $('#TB_window').css('display', 'block'); + } else if (params.url.indexOf('TB_iframe') != -1) { + TB.position(); + + if ($.browser.safari) { + // safari needs help because it will not fire iframe onload + $('#TB_load').remove(); + $('#TB_window').css('display', 'block'); + } + } else { + var $content_url = params.url + '&random=' + (new Date().getTime()); + + if (params.postParams === undefined) { + $.get( + $content_url, + function ($data) { + TB.onDataReceived($data, params); + } + ); + } + else { + $.post( + $content_url, + params.postParams, + function ($data) { + TB.onDataReceived($data, params); + } + ); + } + + /*$('#TB_ajaxContent').load( + params.url += '&random=' + (new Date().getTime()), + params.postParams, + function() { + //to do a post change this load method + TB.position(); + $('#TB_load').remove(); + TB.init('#TB_ajaxContent a.thickbox'); + $('#TB_window').css('display', 'block'); + + if ( $.isFunction(params.showCallback) ) { + params.showCallback(); + } + } + );*/ + } +} + +TB.parseRedirect = function ($data) { + var $match_redirect = new RegExp('^#redirect#(.*)').exec($data); + if ($match_redirect != null) { + // redirect to external template requested + return $match_redirect[1]; + } + + return false; +} + +TB.onDataReceived = function ($data, $params) { + if ( $.isFunction($params.onDataReceived) ) { + if (!$params.onDataReceived($data)) { + // this callback even could prevent redirect action + // callback requested to stop processing + return ; + } + } + + var $redirect = TB.parseRedirect($data); + if ($redirect !== false) { + window.location.href = $redirect; + return ; + } + + $('#TB_ajaxContent').html($data); + + TB.position(); + $('#TB_load').remove(); + TB.init('#TB_ajaxContent a.thickbox'); + $('#TB_window').css('display', 'block'); + + if ( $.isFunction($params.onAfterShow) ) { + $params.onAfterShow(); + } +} + +TB.showIframe = function () { + $('#TB_load').remove(); + $('#TB_window').css('display', 'block'); +} + +TB.remove = function () { + $('#TB_imageOff').unbind('click'); + $('#TB_closeWindowButton').unbind('click'); + + $('#TB_window').fadeOut( + 'fast', + function(){ + $('#TB_window,#TB_overlay,#TB_HideSelect').trigger('unload').unbind().remove(); + } + ); + + $('#TB_load').remove(); + if (typeof document.body.style.maxHeight == 'undefined') { + // if IE 6 + $('body','html').css( {height: 'auto', width: 'auto'} ); + $('html').css('overflow', ''); + } + + $(document).unbind('keydown').unbind('keyup'); + + return false; +} + +TB.position = function () { + $('#TB_window').css( {marginLeft: '-' + parseInt((TB.Width / 2), 10) + 'px', width: TB.Width + 'px'} ); + + if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { + // take away IE6 + $('#TB_window').css( {marginTop: '-' + parseInt((TB.Height / 2), 10) + 'px'} ); + } +} + +TB.parseQuery = function (query) { + var Params = {}; + if (!query) { + // return empty object + return Params; + } + + var Pairs = query.split(/[;&]/); + + for (var i = 0; i < Pairs.length; i++ ) { + var KeyVal = Pairs[i].split('='); + if (!KeyVal || KeyVal.length != 2) { + continue; + } + + var key = unescape( KeyVal[0] ); + var val = unescape( KeyVal[1] ); + val = val.replace(/\+/g, ' '); + Params[key] = val; + } + + return Params; +} + +TB.getPageSize = function () { + var de = document.documentElement; + var w = window.innerWidth || self.innerWidth || (de && de.clientWidth) || document.body.clientWidth; + var h = window.innerHeight || self.innerHeight || (de && de.clientHeight) || document.body.clientHeight; + + return [w, h]; +} + +TB.detectMacXFF = function () { + var userAgent = navigator.userAgent.toLowerCase(); + if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox') != -1) { + return true; + } + + return false; +} + + Index: branches/RC/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r11303 -r11368 --- branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 11303) +++ branches/RC/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 11368) @@ -303,6 +303,7 @@ $params['children_count'] = isset($section_data['children']) ? count($section_data['children']) : 0; + // remove template, so it doesn't appear as additional parameter in url $template = $section_data['url']['t']; unset($section_data['url']['t']); @@ -319,6 +320,9 @@ $section_data['late_load'] = ''; } + // restore template + $section_data['url']['t'] = $template; + $ret .= $this->Application->ParseBlock( array_merge_recursive2($params, $section_data) ); $params['section_name'] = $section_name; } @@ -407,7 +411,10 @@ $special = isset($params['special']) ? $params['special'] : ''; $replace_main = isset($params['replace_m']) && $params['replace_m']; $skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array(); - $block_params = Array('name' => $params['render_as']); + + $block_params = $this->prepareTagParams($params); + $block_params['name'] = $params['render_as']; + foreach ($this->Application->ModuleInfo as $module_name => $module_info) { $prefix = $module_info['Var']; @@ -418,9 +425,19 @@ $prefix = 'c'; } + $icon = $this->Application->getUnitOption($prefix, 'CatalogTabIcon'); + if (strpos($icon, ':') !== false) { + list ($icon_module, $icon) = explode(':', $icon, 2); + } + else { + $icon_module = 'core'; + } + $label = $this->Application->getUnitOption($prefix, $params['title_property']); $block_params['title'] = $label; $block_params['prefix'] = $prefix; + $block_params['icon_module'] = $icon_module; + $block_params['icon'] = $icon; $ret .= $this->Application->ParseBlock($block_params); } return $ret; Index: branches/RC/core/admin_templates/categories/xml/tree_categories.tpl =================================================================== diff -u -N -r11168 -r11368 --- branches/RC/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 11168) +++ branches/RC/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 11368) @@ -1,7 +1,22 @@ - " icon="img/icons/icon24_catalog.gif" href="" onclick="checkCatalog(, '')" load_url=""> + + + + + + + + - - + + \ No newline at end of file Index: branches/RC/core/admin_templates/catalog/advanced_view.tpl =================================================================== diff -u -N -r11096 -r11368 --- branches/RC/core/admin_templates/catalog/advanced_view.tpl (.../advanced_view.tpl) (revision 11096) +++ branches/RC/core/admin_templates/catalog/advanced_view.tpl (.../advanced_view.tpl) (revision 11368) @@ -1,11 +1,8 @@ - - + + - - + - - @@ -14,10 +11,9 @@ "/> - - - - + + + + + -
- - - - - - - - - -
- .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/RC/core/units/categories/categories_config.php =================================================================== diff -u -N -r11117 -r11368 --- branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11117) +++ branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11368) @@ -64,6 +64,7 @@ 'TableName' => TABLE_PREFIX.'Category', 'ViewMenuPhrase' => 'la_text_Categories', + 'CatalogTabIcon' => 'icon16_cat.gif', 'TitlePresets' => Array( 'default' => Array( 'new_status_labels' => Array('c' => '!la_title_Adding_Category!'), @@ -72,7 +73,7 @@ ), 'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), - 'catalog' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), + 'catalog' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories!"), 'advanced_view' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_AdvancedView!"), @@ -304,17 +305,47 @@ ), 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array('default'=>'icon16_cat.gif'), - 'Fields' => Array( - 'Name' => Array('title' => 'la_col_Name', 'data_block' => 'category_td'), - 'Description' => Array('title' => 'la_col_Description'), - 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'), - ), + '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_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => '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', ), + ), + ), - ), - ), + '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_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => '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', ), + ), + ), + '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_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => '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', ), + ), + ), + ), + + + 'ConfigMapping' => Array( 'PerPage' => 'Perpage_Category', 'ShortListPerPage' => 'Perpage_Category_Short', Index: branches/RC/core/admin_templates/catalog_tab.tpl =================================================================== diff -u -N -r11146 -r11368 --- branches/RC/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 11146) +++ branches/RC/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 11368) @@ -1,95 +1,109 @@ - -
- - - - - - - - - $Catalog.setItemCount('c.showall', ''); - $Catalog.setCurrentCategory('c.showall', ); - - - - Grids['c.showall'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline')); - - Grids['c.showall'].EnableRadioMode(); - Grids['c.showall'].DblClick = function() {return false}; + + + + a_toolbar.AddButton( + new ToolBarButton( + 'new_cat', + '', + function() { + $form_name = $Catalog.queryTabRegistry('prefix', '', 'tab_id') + '_form'; + std_precreate_item('', 'categories/categories_edit'); + }, true + ) + ); - - - alert(''); - - - #separator# - - - + +
+ + - - - + + $Catalog.setItemCount('', ''); + + + + + + + + + + + + + + + // substiture form action, like from was created from here + document.getElementById('categories_form').action = ''; + $Catalog.setItemCount('', ''); + $Catalog.setCurrentCategory('', ); + $Catalog.saveSearch('', '', ''); + + + + + +  * + +
+ + + : ">
+ + + , '');"> + +  * + - - - - _" width="50%"> - radiocheckbox" name="" id=""> - img/itemicons/">  - : - - - ( / )
-
- - - - : "> - -
- - -
- - - ParentPath:
- - ()
- -
- - + - - - - - - -
- -
- + + <inp2:m_Phrase name='la_Browse' html_escape='1'/> + - -
+ - - %">  + + +
+ + PP: + - - - -
+ + + Grids[''].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6')); + + + a_toolbar.DisableButton('upcat'); + a_toolbar.DisableButton('homecat'); + + a_toolbar.EnableButton('upcat'); + a_toolbar.EnableButton('homecat'); + + $Catalog.reflectPasteButton(); + + + alert(''); + + + #separator# + + + - - - + + + \ No newline at end of file Index: branches/RC/core/admin_templates/categories/xml/categories_list.tpl =================================================================== diff -u -N -r11113 -r11368 --- branches/RC/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 11113) +++ branches/RC/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 11368) @@ -1,17 +1,47 @@ - - -Grids['c'] = new Grid('c', 'table_white_selected', ':original', edit, a_toolbar); -Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]'); -Grids['c'].InitItems(); + + + + + + + , '');"> + + ( / ) + + + + + + + + +  * + + +var catalog_height = $Catalog.BottomVisible ? 200 : 'auto'; + + + + + + + Grids['c'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6')); - // substiture form action, like from was created from here document.getElementById('categories_form').action = ''; $Catalog.setItemCount('c', ''); + +document.getElementById('top_pagination_bar[c]').innerHTML = ''; + $Catalog.ParentCategoryID = ; document.getElementById('c_search_warning').style.display = 'blocknone'; document.getElementById('c_search_keyword').value = ''; @@ -37,7 +67,6 @@ a_toolbar.EnableButton('homecat'); - Grids['c'].EnableRadioMode(); Grids['c'].DblClick = function() {return false}; $Catalog.reflectPasteButton(); @@ -46,38 +75,8 @@ alert(''); +GridScrollers['c'].afterLoad(); #separator# - -
- - - - - - - - - - - -
_" width="50%"> - radiocheckbox" name="" id=""> - img/itemicons/">  - , '');">: - - - ( / )
-
- -
- - - ParentPath:
- - ()
- img/spacer.gif" width="1" height="4"> -
-
- -

+ + \ No newline at end of file Index: branches/RC/core/admin_templates/js/jquery/jquery.pack.js =================================================================== diff -u -N --- branches/RC/core/admin_templates/js/jquery/jquery.pack.js (revision 0) +++ branches/RC/core/admin_templates/js/jquery/jquery.pack.js (revision 11368) @@ -0,0 +1,11 @@ +/* + * jQuery 1.2.6 - New Wave Javascript + * + * Copyright (c) 2008 John Resig (jquery.com) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Date: 2009-02-02 21:20:23 $ + * $Rev: 5685 $ + */ +eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(H(){J w=1b.4M,3m$=1b.$;J D=1b.4M=1b.$=H(a,b){I 2B D.17.5j(a,b)};J u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/,62=/^.[^:#\\[\\.]*$/,12;D.17=D.44={5j:H(d,b){d=d||S;G(d.16){7[0]=d;7.K=1;I 7}G(1j d=="23"){J c=u.2D(d);G(c&&(c[1]||!b)){G(c[1])d=D.4h([c[1]],b);N{J a=S.61(c[3]);G(a){G(a.2v!=c[3])I D().2q(d);I D(a)}d=[]}}N I D(b).2q(d)}N G(D.1D(d))I D(S)[D.17.27?"27":"43"](d);I 7.6Y(D.2d(d))},5w:"1.2.6",8G:H(){I 7.K},K:0,3p:H(a){I a==12?D.2d(7):7[a]},2I:H(b){J a=D(b);a.5n=7;I a},6Y:H(a){7.K=0;2p.44.1p.1w(7,a);I 7},P:H(a,b){I D.P(7,a,b)},5i:H(b){J a=-1;I D.2L(b&&b.5w?b[0]:b,7)},1K:H(c,a,b){J d=c;G(c.1q==56)G(a===12)I 7[0]&&D[b||"1K"](7[0],c);N{d={};d[c]=a}I 7.P(H(i){R(c 1n d)D.1K(b?7.V:7,c,D.1i(7,d[c],b,i,c))})},1g:H(b,a){G((b==\'2h\'||b==\'1Z\')&&3d(a)<0)a=12;I 7.1K(b,a,"2a")},1r:H(b){G(1j b!="49"&&b!=U)I 7.4E().3v((7[0]&&7[0].2z||S).5F(b));J a="";D.P(b||7,H(){D.P(7.3t,H(){G(7.16!=8)a+=7.16!=1?7.76:D.17.1r([7])})});I a},5z:H(b){G(7[0])D(b,7[0].2z).5y().39(7[0]).2l(H(){J a=7;1B(a.1x)a=a.1x;I a}).3v(7);I 7},8Y:H(a){I 7.P(H(){D(7).6Q().5z(a)})},8R:H(a){I 7.P(H(){D(7).5z(a)})},3v:H(){I 7.3W(19,M,Q,H(a){G(7.16==1)7.3U(a)})},6F:H(){I 7.3W(19,M,M,H(a){G(7.16==1)7.39(a,7.1x)})},6E:H(){I 7.3W(19,Q,Q,H(a){7.1d.39(a,7)})},5q:H(){I 7.3W(19,Q,M,H(a){7.1d.39(a,7.2H)})},3l:H(){I 7.5n||D([])},2q:H(b){J c=D.2l(7,H(a){I D.2q(b,a)});I 7.2I(/[^+>] [^+>]/.11(b)||b.1h("..")>-1?D.4r(c):c)},5y:H(e){J f=7.2l(H(){G(D.14.1f&&!D.4n(7)){J a=7.6o(M),5h=S.3h("1v");5h.3U(a);I D.4h([5h.4H])[0]}N I 7.6o(M)});J d=f.2q("*").5c().P(H(){G(7[E]!=12)7[E]=U});G(e===M)7.2q("*").5c().P(H(i){G(7.16==3)I;J c=D.L(7,"3w");R(J a 1n c)R(J b 1n c[a])D.W.1e(d[i],a,c[a][b],c[a][b].L)});I f},1E:H(b){I 7.2I(D.1D(b)&&D.3C(7,H(a,i){I b.1k(a,i)})||D.3g(b,7))},4Y:H(b){G(b.1q==56)G(62.11(b))I 7.2I(D.3g(b,7,M));N b=D.3g(b,7);J a=b.K&&b[b.K-1]!==12&&!b.16;I 7.1E(H(){I a?D.2L(7,b)<0:7!=b})},1e:H(a){I 7.2I(D.4r(D.2R(7.3p(),1j a==\'23\'?D(a):D.2d(a))))},3F:H(a){I!!a&&D.3g(a,7).K>0},7T:H(a){I 7.3F("."+a)},6e:H(b){G(b==12){G(7.K){J c=7[0];G(D.Y(c,"2A")){J e=c.64,63=[],15=c.15,2V=c.O=="2A-2V";G(e<0)I U;R(J i=2V?e:0,2f=2V?e+1:15.K;i<2f;i++){J d=15[i];G(d.2W){b=D.14.1f&&!d.at.2x.an?d.1r:d.2x;G(2V)I b;63.1p(b)}}I 63}N I(7[0].2x||"").1o(/\\r/g,"")}I 12}G(b.1q==4L)b+=\'\';I 7.P(H(){G(7.16!=1)I;G(b.1q==2p&&/5O|5L/.11(7.O))7.4J=(D.2L(7.2x,b)>=0||D.2L(7.34,b)>=0);N G(D.Y(7,"2A")){J a=D.2d(b);D("9R",7).P(H(){7.2W=(D.2L(7.2x,a)>=0||D.2L(7.1r,a)>=0)});G(!a.K)7.64=-1}N 7.2x=b})},2K:H(a){I a==12?(7[0]?7[0].4H:U):7.4E().3v(a)},7b:H(a){I 7.5q(a).21()},79:H(i){I 7.3s(i,i+1)},3s:H(){I 7.2I(2p.44.3s.1w(7,19))},2l:H(b){I 7.2I(D.2l(7,H(a,i){I b.1k(a,i,a)}))},5c:H(){I 7.1e(7.5n)},L:H(d,b){J a=d.1R(".");a[1]=a[1]?"."+a[1]:"";G(b===12){J c=7.5C("9z"+a[1]+"!",[a[0]]);G(c===12&&7.K)c=D.L(7[0],d);I c===12&&a[1]?7.L(a[0]):c}N I 7.1P("9u"+a[1]+"!",[a[0],b]).P(H(){D.L(7,d,b)})},3b:H(a){I 7.P(H(){D.3b(7,a)})},3W:H(g,f,h,d){J e=7.K>1,3x;I 7.P(H(){G(!3x){3x=D.4h(g,7.2z);G(h)3x.9o()}J b=7;G(f&&D.Y(7,"1T")&&D.Y(3x[0],"4F"))b=7.3H("22")[0]||7.3U(7.2z.3h("22"));J c=D([]);D.P(3x,H(){J a=e?D(7).5y(M)[0]:7;G(D.Y(a,"1m"))c=c.1e(a);N{G(a.16==1)c=c.1e(D("1m",a).21());d.1k(b,a)}});c.P(6T)})}};D.17.5j.44=D.17;H 6T(i,a){G(a.4d)D.3Y({1a:a.4d,31:Q,1O:"1m"});N D.5u(a.1r||a.6O||a.4H||"");G(a.1d)a.1d.37(a)}H 1z(){I+2B 8J}D.1l=D.17.1l=H(){J b=19[0]||{},i=1,K=19.K,4x=Q,15;G(b.1q==8I){4x=b;b=19[1]||{};i=2}G(1j b!="49"&&1j b!="H")b={};G(K==i){b=7;--i}R(;i-1}},6q:H(b,c,a){J e={};R(J d 1n c){e[d]=b.V[d];b.V[d]=c[d]}a.1k(b);R(J d 1n c)b.V[d]=e[d]},1g:H(d,e,c){G(e=="2h"||e=="1Z"){J b,3X={30:"5x",5g:"1G",18:"3I"},35=e=="2h"?["5e","6k"]:["5G","6i"];H 5b(){b=e=="2h"?d.8f:d.8c;J a=0,2C=0;D.P(35,H(){a+=3d(D.2a(d,"57"+7,M))||0;2C+=3d(D.2a(d,"2C"+7+"4b",M))||0});b-=29.83(a+2C)}G(D(d).3F(":4j"))5b();N D.6q(d,3X,5b);I 29.2f(0,b)}I D.2a(d,e,c)},2a:H(f,l,k){J e,V=f.V;H 3E(b){G(!D.14.2k)I Q;J a=3P.54(b,U);I!a||a.52("3E")==""}G(l=="1y"&&D.14.1f){e=D.1K(V,"1y");I e==""?"1":e}G(D.14.2G&&l=="18"){J d=V.50;V.50="0 7Y 7W";V.50=d}G(l.1I(/4i/i))l=y;G(!k&&V&&V[l])e=V[l];N G(3P.54){G(l.1I(/4i/i))l="4i";l=l.1o(/([A-Z])/g,"-$1").3y();J c=3P.54(f,U);G(c&&!3E(f))e=c.52(l);N{J g=[],2E=[],a=f,i=0;R(;a&&3E(a);a=a.1d)2E.6h(a);R(;i<2E.K;i++)G(3E(2E[i])){g[i]=2E[i].V.18;2E[i].V.18="3I"}e=l=="18"&&g[2E.K-1]!=U?"2F":(c&&c.52(l))||"";R(i=0;i]*?)\\/>/g,H(b,a,c){I c.1I(/^(aK|4f|7E|aG|4T|7A|aB|3n|az|ay|av)$/i)?b:a+">"});J f=D.3k(d).3y(),1v=h.3h("1v");J e=!f.1h("",""]||!f.1h("",""]||f.1I(/^<(aq|22|am|ak|ai)/)&&[1,"<1T>",""]||!f.1h("<4F")&&[2,"<1T><22>",""]||(!f.1h("<22><4F>",""]||!f.1h("<7E")&&[2,"<1T><22><7q>",""]||D.14.1f&&[1,"1v<1v>",""]||[0,"",""];1v.4H=e[1]+d+e[2];1B(e[0]--)1v=1v.5T;G(D.14.1f){J g=!f.1h("<1T")&&f.1h("<22")<0?1v.1x&&1v.1x.3t:e[1]=="<1T>"&&f.1h("<22")<0?1v.3t:[];R(J j=g.K-1;j>=0;--j)G(D.Y(g[j],"22")&&!g[j].3t.K)g[j].1d.37(g[j]);G(/^\\s/.11(d))1v.39(h.5F(d.1I(/^\\s*/)[0]),1v.1x)}d=D.2d(1v.3t)}G(d.K===0&&(!D.Y(d,"3V")&&!D.Y(d,"2A")))I;G(d[0]==12||D.Y(d,"3V")||d.15)k.1p(d);N k=D.2R(k,d)});I k},1K:H(d,f,c){G(!d||d.16==3||d.16==8)I 12;J e=!D.4n(d),40=c!==12,1f=D.14.1f;f=e&&D.3X[f]||f;G(d.2j){J g=/5Q|4d|V/.11(f);G(f=="2W"&&D.14.2k)d.1d.64;G(f 1n d&&e&&!g){G(40){G(f=="O"&&D.Y(d,"4T")&&d.1d)7p"O a3 a1\'t 9V 9U";d[f]=c}G(D.Y(d,"3V")&&d.7i(f))I d.7i(f).76;I d[f]}G(1f&&e&&f=="V")I D.1K(d.V,"9T",c);G(40)d.9Q(f,""+c);J h=1f&&e&&g?d.4G(f,2):d.4G(f);I h===U?12:h}G(1f&&f=="1y"){G(40){d.6B=1;d.1E=(d.1E||"").1o(/7f\\([^)]*\\)/,"")+(3r(c)+\'\'=="9L"?"":"7f(1y="+c*7a+")")}I d.1E&&d.1E.1h("1y=")>=0?(3d(d.1E.1I(/1y=([^)]*)/)[1])/7a)+\'\':""}f=f.1o(/-([a-z])/9H,H(a,b){I b.2r()});G(40)d[f]=c;I d[f]},3k:H(a){I(a||"").1o(/^\\s+|\\s+$/g,"")},2d:H(b){J a=[];G(b!=U){J i=b.K;G(i==U||b.1R||b.4I||b.1k)a[0]=b;N 1B(i)a[--i]=b[i]}I a},2L:H(b,a){R(J i=0,K=a.K;i*",7).21();1B(7.1x)7.37(7.1x)}},H(a,b){D.17[a]=H(){I 7.P(b,19)}});D.P(["6N","4b"],H(i,c){J b=c.3y();D.17[b]=H(a){I 7[0]==1b?D.14.2G&&S.1c["5t"+c]||D.14.2k&&1b["5s"+c]||S.70=="6Z"&&S.1C["5t"+c]||S.1c["5t"+c]:7[0]==S?29.2f(29.2f(S.1c["4y"+c],S.1C["4y"+c]),29.2f(S.1c["2i"+c],S.1C["2i"+c])):a==12?(7.K?D.1g(7[0],b):U):7.1g(b,a.1q==56?a:a+"2X")}});H 25(a,b){I a[0]&&3r(D.2a(a[0],b,M),10)||0}J C=D.14.2k&&3r(D.14.5B)<8H?"(?:[\\\\w*3m-]|\\\\\\\\.)":"(?:[\\\\w\\8F-\\8E*3m-]|\\\\\\\\.)",6L=2B 4v("^>\\\\s*("+C+"+)"),6J=2B 4v("^("+C+"+)(#)("+C+"+)"),6I=2B 4v("^([#.]?)("+C+"*)");D.1l({6H:{"":H(a,i,m){I m[2]=="*"||D.Y(a,m[2])},"#":H(a,i,m){I a.4G("2v")==m[2]},":":{8D:H(a,i,m){I im[3]-0},3a:H(a,i,m){I m[3]-0==i},79:H(a,i,m){I m[3]-0==i},3o:H(a,i){I i==0},3S:H(a,i,m,r){I i==r.K-1},6D:H(a,i){I i%2==0},6C:H(a,i){I i%2},"3o-4u":H(a){I a.1d.3H("*")[0]==a},"3S-4u":H(a){I D.3a(a.1d.5T,1,"4l")==a},"8z-4u":H(a){I!D.3a(a.1d.5T,2,"4l")},6W:H(a){I a.1x},4E:H(a){I!a.1x},8y:H(a,i,m){I(a.6O||a.8x||D(a).1r()||"").1h(m[3])>=0},4j:H(a){I"1G"!=a.O&&D.1g(a,"18")!="2F"&&D.1g(a,"5g")!="1G"},1G:H(a){I"1G"==a.O||D.1g(a,"18")=="2F"||D.1g(a,"5g")=="1G"},8w:H(a){I!a.3R},3R:H(a){I a.3R},4J:H(a){I a.4J},2W:H(a){I a.2W||D.1K(a,"2W")},1r:H(a){I"1r"==a.O},5O:H(a){I"5O"==a.O},5L:H(a){I"5L"==a.O},5p:H(a){I"5p"==a.O},3Q:H(a){I"3Q"==a.O},5o:H(a){I"5o"==a.O},6A:H(a){I"6A"==a.O},6z:H(a){I"6z"==a.O},2s:H(a){I"2s"==a.O||D.Y(a,"2s")},4T:H(a){I/4T|2A|6y|2s/i.11(a.Y)},3T:H(a,i,m){I D.2q(m[3],a).K},8t:H(a){I/h\\d/i.11(a.Y)},8s:H(a){I D.3C(D.3O,H(b){I a==b.T}).K}}},6x:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,2B 4v("^([:.#]*)("+C+"+)")],3g:H(a,c,b){J d,1t=[];1B(a&&a!=d){d=a;J f=D.1E(a,c,b);a=f.t.1o(/^\\s*,\\s*/,"");1t=b?c=f.r:D.2R(1t,f.r)}I 1t},2q:H(t,o){G(1j t!="23")I[t];G(o&&o.16!=1&&o.16!=9)I[];o=o||S;J d=[o],2o=[],3S,Y;1B(t&&3S!=t){J r=[];3S=t;t=D.3k(t);J l=Q,3j=6L,m=3j.2D(t);G(m){Y=m[1].2r();R(J i=0;d[i];i++)R(J c=d[i].1x;c;c=c.2H)G(c.16==1&&(Y=="*"||c.Y.2r()==Y))r.1p(c);d=r;t=t.1o(3j,"");G(t.1h(" ")==0)6M;l=M}N{3j=/^([>+~])\\s*(\\w*)/i;G((m=3j.2D(t))!=U){r=[];J k={};Y=m[2].2r();m=m[1];R(J j=0,3i=d.K;j<3i;j++){J n=m=="~"||m=="+"?d[j].2H:d[j].1x;R(;n;n=n.2H)G(n.16==1){J g=D.L(n);G(m=="~"&&k[g])1X;G(!Y||n.Y.2r()==Y){G(m=="~")k[g]=M;r.1p(n)}G(m=="+")1X}}d=r;t=D.3k(t.1o(3j,""));l=M}}G(t&&!l){G(!t.1h(",")){G(o==d[0])d.4s();2o=D.2R(2o,d);r=d=[o];t=" "+t.6v(1,t.K)}N{J h=6J;J m=h.2D(t);G(m){m=[0,m[2],m[3],m[1]]}N{h=6I;m=h.2D(t)}m[2]=m[2].1o(/\\\\/g,"");J f=d[d.K-1];G(m[1]=="#"&&f&&f.61&&!D.4n(f)){J p=f.61(m[2]);G((D.14.1f||D.14.2G)&&p&&1j p.2v=="23"&&p.2v!=m[2])p=D(\'[@2v="\'+m[2]+\'"]\',f)[0];d=r=p&&(!m[3]||D.Y(p,m[3]))?[p]:[]}N{R(J i=0;d[i];i++){J a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];G(a=="*"&&d[i].Y.3y()=="49")a="3n";r=D.2R(r,d[i].3H(a))}G(m[1]==".")r=D.5m(r,m[2]);G(m[1]=="#"){J e=[];R(J i=0;r[i];i++)G(r[i].4G("2v")==m[2]){e=[r[i]];1X}r=e}d=r}t=t.1o(h,"")}}G(t){J b=D.1E(t,r);d=r=b.r;t=D.3k(b.t)}}G(t)d=[];G(d&&o==d[0])d.4s();2o=D.2R(2o,d);I 2o},5m:H(r,m,a){m=" "+m+" ";J c=[];R(J i=0;r[i];i++){J b=(" "+r[i].1F+" ").1h(m)>=0;G(!a&&b||a&&!b)c.1p(r[i])}I c},1E:H(t,r,h){J d;1B(t&&t!=d){d=t;J p=D.6x,m;R(J i=0;p[i];i++){m=p[i].2D(t);G(m){t=t.8r(m[0].K);m[2]=m[2].1o(/\\\\/g,"");1X}}G(!m)1X;G(m[1]==":"&&m[2]=="4Y")r=62.11(m[3])?D.1E(m[3],r,M).r:D(r).4Y(m[3]);N G(m[1]==".")r=D.5m(r,m[2],h);N G(m[1]=="["){J g=[],O=m[3];R(J i=0,3i=r.K;i<3i;i++){J a=r[i],z=a[D.3X[m[2]]||m[2]];G(z==U||/5Q|4d|2W/.11(m[2]))z=D.1K(a,m[2])||\'\';G((O==""&&!!z||O=="="&&z==m[5]||O=="!="&&z!=m[5]||O=="^="&&z&&!z.1h(m[5])||O=="$="&&z.6v(z.K-m[5].K)==m[5]||(O=="*="||O=="~=")&&z.1h(m[5])>=0)^h)g.1p(a)}r=g}N G(m[1]==":"&&m[2]=="3a-4u"){J e={},g=[],11=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2D(m[3]=="6D"&&"2n"||m[3]=="6C"&&"2n+1"||!/\\D/.11(m[3])&&"8q+"+m[3]||m[3]),3o=(11[1]+(11[2]||1))-0,d=11[3]-0;R(J i=0,3i=r.K;i<3i;i++){J j=r[i],1d=j.1d,2v=D.L(1d);G(!e[2v]){J c=1;R(J n=1d.1x;n;n=n.2H)G(n.16==1)n.4q=c++;e[2v]=M}J b=Q;G(3o==0){G(j.4q==d)b=M}N G((j.4q-d)%3o==0&&(j.4q-d)/3o>=0)b=M;G(b^h)g.1p(j)}r=g}N{J f=D.6H[m[1]];G(1j f=="49")f=f[m[2]];G(1j f=="23")f=6u("Q||H(a,i){I "+f+";}");r=D.3C(r,H(a,i){I f(a,i,m,r)},h)}}I{r:r,t:t}},4S:H(b,c){J a=[],1t=b[c];1B(1t&&1t!=S){G(1t.16==1)a.1p(1t);1t=1t[c]}I a},3a:H(a,e,c,b){e=e||1;J d=0;R(;a;a=a[c])G(a.16==1&&++d==e)1X;I a},5v:H(n,a){J r=[];R(;n;n=n.2H){G(n.16==1&&n!=a)r.1p(n)}I r}});D.W={1e:H(f,i,g,e){G(f.16==3||f.16==8)I;G(D.14.1f&&f.4I)f=1b;G(!g.24)g.24=7.24++;G(e!=12){J h=g;g=7.3M(h,H(){I h.1w(7,19)});g.L=e}J j=D.L(f,"3w")||D.L(f,"3w",{}),1H=D.L(f,"1H")||D.L(f,"1H",H(){G(1j D!="12"&&!D.W.5k)I D.W.1H.1w(19.3L.T,19)});1H.T=f;D.P(i.1R(/\\s+/),H(c,b){J a=b.1R(".");b=a[0];g.O=a[1];J d=j[b];G(!d){d=j[b]={};G(!D.W.2t[b]||D.W.2t[b].4p.1k(f)===Q){G(f.3K)f.3K(b,1H,Q);N G(f.6t)f.6t("4o"+b,1H)}}d[g.24]=g;D.W.26[b]=M});f=U},24:1,26:{},21:H(e,h,f){G(e.16==3||e.16==8)I;J i=D.L(e,"3w"),1L,5i;G(i){G(h==12||(1j h=="23"&&h.8p(0)=="."))R(J g 1n i)7.21(e,g+(h||""));N{G(h.O){f=h.2y;h=h.O}D.P(h.1R(/\\s+/),H(b,a){J c=a.1R(".");a=c[0];G(i[a]){G(f)2U i[a][f.24];N R(f 1n i[a])G(!c[1]||i[a][f].O==c[1])2U i[a][f];R(1L 1n i[a])1X;G(!1L){G(!D.W.2t[a]||D.W.2t[a].4A.1k(e)===Q){G(e.6p)e.6p(a,D.L(e,"1H"),Q);N G(e.6n)e.6n("4o"+a,D.L(e,"1H"))}1L=U;2U i[a]}}})}R(1L 1n i)1X;G(!1L){J d=D.L(e,"1H");G(d)d.T=U;D.3b(e,"3w");D.3b(e,"1H")}}},1P:H(h,c,f,g,i){c=D.2d(c);G(h.1h("!")>=0){h=h.3s(0,-1);J a=M}G(!f){G(7.26[h])D("*").1e([1b,S]).1P(h,c)}N{G(f.16==3||f.16==8)I 12;J b,1L,17=D.1D(f[h]||U),W=!c[0]||!c[0].32;G(W){c.6h({O:h,2J:f,32:H(){},3J:H(){},4C:1z()});c[0][E]=M}c[0].O=h;G(a)c[0].6m=M;J d=D.L(f,"1H");G(d)b=d.1w(f,c);G((!17||(D.Y(f,\'a\')&&h=="4V"))&&f["4o"+h]&&f["4o"+h].1w(f,c)===Q)b=Q;G(W)c.4s();G(i&&D.1D(i)){1L=i.1w(f,b==U?c:c.7d(b));G(1L!==12)b=1L}G(17&&g!==Q&&b!==Q&&!(D.Y(f,\'a\')&&h=="4V")){7.5k=M;1U{f[h]()}1V(e){}}7.5k=Q}I b},1H:H(b){J a,1L,38,5f,4m;b=19[0]=D.W.6l(b||1b.W);38=b.O.1R(".");b.O=38[0];38=38[1];5f=!38&&!b.6m;4m=(D.L(7,"3w")||{})[b.O];R(J j 1n 4m){J c=4m[j];G(5f||c.O==38){b.2y=c;b.L=c.L;1L=c.1w(7,19);G(a!==Q)a=1L;G(1L===Q){b.32();b.3J()}}}I a},6l:H(b){G(b[E]==M)I b;J d=b;b={8o:d};J c="8n 8m 8l 8k 2s 8j 47 5d 6j 5E 8i L 8h 8g 4K 2y 5a 59 8e 8b 58 6f 8a 88 4k 87 86 84 6d 2J 4C 6c O 82 81 35".1R(" ");R(J i=c.K;i;i--)b[c[i]]=d[c[i]];b[E]=M;b.32=H(){G(d.32)d.32();d.80=Q};b.3J=H(){G(d.3J)d.3J();d.7Z=M};b.4C=b.4C||1z();G(!b.2J)b.2J=b.6d||S;G(b.2J.16==3)b.2J=b.2J.1d;G(!b.4k&&b.4K)b.4k=b.4K==b.2J?b.6c:b.4K;G(b.58==U&&b.5d!=U){J a=S.1C,1c=S.1c;b.58=b.5d+(a&&a.2e||1c&&1c.2e||0)-(a.6b||0);b.6f=b.6j+(a&&a.2c||1c&&1c.2c||0)-(a.6a||0)}G(!b.35&&((b.47||b.47===0)?b.47:b.5a))b.35=b.47||b.5a;G(!b.59&&b.5E)b.59=b.5E;G(!b.35&&b.2s)b.35=(b.2s&1?1:(b.2s&2?3:(b.2s&4?2:0)));I b},3M:H(a,b){b.24=a.24=a.24||b.24||7.24++;I b},2t:{27:{4p:H(){55();I},4A:H(){I}},3D:{4p:H(){G(D.14.1f)I Q;D(7).2O("53",D.W.2t.3D.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("53",D.W.2t.3D.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3D";I D.W.1H.1w(7,19)}},3N:{4p:H(){G(D.14.1f)I Q;D(7).2O("51",D.W.2t.3N.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("51",D.W.2t.3N.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3N";I D.W.1H.1w(7,19)}}}};D.17.1l({2O:H(c,a,b){I c=="4X"?7.2V(c,a,b):7.P(H(){D.W.1e(7,c,b||a,b&&a)})},2V:H(d,b,c){J e=D.W.3M(c||b,H(a){D(7).4e(a,e);I(c||b).1w(7,19)});I 7.P(H(){D.W.1e(7,d,e,c&&b)})},4e:H(a,b){I 7.P(H(){D.W.21(7,a,b)})},1P:H(c,a,b){I 7.P(H(){D.W.1P(c,a,7,M,b)})},5C:H(c,a,b){I 7[0]&&D.W.1P(c,a,7[0],Q,b)},2m:H(b){J c=19,i=1;1B(i=0){J i=g.3s(e,g.K);g=g.3s(0,e)}c=c||H(){};J f="2P";G(d)G(D.1D(d)){c=d;d=U}N{d=D.3n(d);f="6g"}J h=7;D.3Y({1a:g,O:f,1O:"2K",L:d,1J:H(a,b){G(b=="1W"||b=="7J")h.2K(i?D("<1v/>").3v(a.4U.1o(/<1m(.|\\s)*?\\/1m>/g,"")).2q(i):a.4U);h.P(c,[a.4U,b,a])}});I 7},aL:H(){I D.3n(7.7I())},7I:H(){I 7.2l(H(){I D.Y(7,"3V")?D.2d(7.aH):7}).1E(H(){I 7.34&&!7.3R&&(7.4J||/2A|6y/i.11(7.Y)||/1r|1G|3Q/i.11(7.O))}).2l(H(i,c){J b=D(7).6e();I b==U?U:b.1q==2p?D.2l(b,H(a,i){I{34:c.34,2x:a}}):{34:c.34,2x:b}}).3p()}});D.P("7H,7G,7F,7D,7C,7B".1R(","),H(i,o){D.17[o]=H(f){I 7.2O(o,f)}});J B=1z();D.1l({3p:H(d,b,a,c){G(D.1D(b)){a=b;b=U}I D.3Y({O:"2P",1a:d,L:b,1W:a,1O:c})},aE:H(b,a){I D.3p(b,U,a,"1m")},aD:H(c,b,a){I D.3p(c,b,a,"3z")},aC:H(d,b,a,c){G(D.1D(b)){a=b;b={}}I D.3Y({O:"6g",1a:d,L:b,1W:a,1O:c})},aA:H(a){D.1l(D.60,a)},60:{1a:5Z.5Q,26:M,O:"2P",2T:0,7z:"4R/x-ax-3V-aw",7x:M,31:M,L:U,5Y:U,3Q:U,4Q:{2N:"4R/2N, 1r/2N",2K:"1r/2K",1m:"1r/4t, 4R/4t",3z:"4R/3z, 1r/4t",1r:"1r/as",4w:"*/*"}},4z:{},3Y:H(s){s=D.1l(M,s,D.1l(M,{},D.60,s));J g,2Z=/=\\?(&|$)/g,1u,L,O=s.O.2r();G(s.L&&s.7x&&1j s.L!="23")s.L=D.3n(s.L);G(s.1O=="4P"){G(O=="2P"){G(!s.1a.1I(2Z))s.1a+=(s.1a.1I(/\\?/)?"&":"?")+(s.4P||"7u")+"=?"}N G(!s.L||!s.L.1I(2Z))s.L=(s.L?s.L+"&":"")+(s.4P||"7u")+"=?";s.1O="3z"}G(s.1O=="3z"&&(s.L&&s.L.1I(2Z)||s.1a.1I(2Z))){g="4P"+B++;G(s.L)s.L=(s.L+"").1o(2Z,"="+g+"$1");s.1a=s.1a.1o(2Z,"="+g+"$1");s.1O="1m";1b[g]=H(a){L=a;1W();1J();1b[g]=12;1U{2U 1b[g]}1V(e){}G(i)i.37(h)}}G(s.1O=="1m"&&s.1Y==U)s.1Y=Q;G(s.1Y===Q&&O=="2P"){J j=1z();J k=s.1a.1o(/(\\?|&)3m=.*?(&|$)/,"$ap="+j+"$2");s.1a=k+((k==s.1a)?(s.1a.1I(/\\?/)?"&":"?")+"3m="+j:"")}G(s.L&&O=="2P"){s.1a+=(s.1a.1I(/\\?/)?"&":"?")+s.L;s.L=U}G(s.26&&!D.4O++)D.W.1P("7H");J n=/^(?:\\w+:)?\\/\\/([^\\/?#]+)/;G(s.1O=="1m"&&O=="2P"&&n.11(s.1a)&&n.2D(s.1a)[1]!=5Z.al){J i=S.3H("6w")[0];J h=S.3h("1m");h.4d=s.1a;G(s.7t)h.aj=s.7t;G(!g){J l=Q;h.ah=h.ag=H(){G(!l&&(!7.3f||7.3f=="68"||7.3f=="1J")){l=M;1W();1J();i.37(h)}}}i.3U(h);I 12}J m=Q;J c=1b.7s?2B 7s("ae.ac"):2B 7r();G(s.5Y)c.6R(O,s.1a,s.31,s.5Y,s.3Q);N c.6R(O,s.1a,s.31);1U{G(s.L)c.4B("ab-aa",s.7z);G(s.5S)c.4B("a9-5R-a8",D.4z[s.1a]||"a7, a6 a5 a4 5N:5N:5N a2");c.4B("X-9Z-9Y","7r");c.4B("9W",s.1O&&s.4Q[s.1O]?s.4Q[s.1O]+", */*":s.4Q.4w)}1V(e){}G(s.7m&&s.7m(c,s)===Q){s.26&&D.4O--;c.7l();I Q}G(s.26)D.W.1P("7B",[c,s]);J d=H(a){G(!m&&c&&(c.3f==4||a=="2T")){m=M;G(f){7k(f);f=U}1u=a=="2T"&&"2T"||!D.7j(c)&&"3e"||s.5S&&D.7h(c,s.1a)&&"7J"||"1W";G(1u=="1W"){1U{L=D.6X(c,s.1O,s.9S)}1V(e){1u="5J"}}G(1u=="1W"){J b;1U{b=c.5I("7g-5R")}1V(e){}G(s.5S&&b)D.4z[s.1a]=b;G(!g)1W()}N D.5H(s,c,1u);1J();G(s.31)c=U}};G(s.31){J f=4I(d,13);G(s.2T>0)3B(H(){G(c){c.7l();G(!m)d("2T")}},s.2T)}1U{c.9P(s.L)}1V(e){D.5H(s,c,U,e)}G(!s.31)d();H 1W(){G(s.1W)s.1W(L,1u);G(s.26)D.W.1P("7C",[c,s])}H 1J(){G(s.1J)s.1J(c,1u);G(s.26)D.W.1P("7F",[c,s]);G(s.26&&!--D.4O)D.W.1P("7G")}I c},5H:H(s,a,b,e){G(s.3e)s.3e(a,b,e);G(s.26)D.W.1P("7D",[a,s,e])},4O:0,7j:H(a){1U{I!a.1u&&5Z.9O=="5p:"||(a.1u>=7e&&a.1u<9N)||a.1u==7c||a.1u==9K||D.14.2k&&a.1u==12}1V(e){}I Q},7h:H(a,c){1U{J b=a.5I("7g-5R");I a.1u==7c||b==D.4z[c]||D.14.2k&&a.1u==12}1V(e){}I Q},6X:H(a,c,b){J d=a.5I("9J-O"),2N=c=="2N"||!c&&d&&d.1h("2N")>=0,L=2N?a.9I:a.4U;G(2N&&L.1C.2j=="5J")7p"5J";G(b)L=b(L,c);G(c=="1m")D.5u(L);G(c=="3z")L=6u("("+L+")");I L},3n:H(a){J s=[];G(a.1q==2p||a.5w)D.P(a,H(){s.1p(3u(7.34)+"="+3u(7.2x))});N R(J j 1n a)G(a[j]&&a[j].1q==2p)D.P(a[j],H(){s.1p(3u(j)+"="+3u(7))});N s.1p(3u(j)+"="+3u(D.1D(a[j])?a[j]():a[j]));I s.6s("&").1o(/%20/g,"+")}});D.17.1l({1N:H(c,b){I c?7.2g({1Z:"1N",2h:"1N",1y:"1N"},c,b):7.1E(":1G").P(H(){7.V.18=7.5D||"";G(D.1g(7,"18")=="2F"){J a=D("<"+7.2j+" />").6P("1c");7.V.18=a.1g("18");G(7.V.18=="2F")7.V.18="3I";a.21()}}).3l()},1M:H(b,a){I b?7.2g({1Z:"1M",2h:"1M",1y:"1M"},b,a):7.1E(":4j").P(H(){7.5D=7.5D||D.1g(7,"18");7.V.18="2F"}).3l()},78:D.17.2m,2m:H(a,b){I D.1D(a)&&D.1D(b)?7.78.1w(7,19):a?7.2g({1Z:"2m",2h:"2m",1y:"2m"},a,b):7.P(H(){D(7)[D(7).3F(":1G")?"1N":"1M"]()})},9G:H(b,a){I 7.2g({1Z:"1N"},b,a)},9F:H(b,a){I 7.2g({1Z:"1M"},b,a)},9E:H(b,a){I 7.2g({1Z:"2m"},b,a)},9D:H(b,a){I 7.2g({1y:"1N"},b,a)},9M:H(b,a){I 7.2g({1y:"1M"},b,a)},9C:H(c,a,b){I 7.2g({1y:a},c,b)},2g:H(k,j,i,g){J h=D.77(j,i,g);I 7[h.36===Q?"P":"36"](H(){G(7.16!=1)I Q;J f=D.1l({},h),p,1G=D(7).3F(":1G"),46=7;R(p 1n k){G(k[p]=="1M"&&1G||k[p]=="1N"&&!1G)I f.1J.1k(7);G(p=="1Z"||p=="2h"){f.18=D.1g(7,"18");f.33=7.V.33}}G(f.33!=U)7.V.33="1G";f.45=D.1l({},k);D.P(k,H(c,a){J e=2B D.28(46,f,c);G(/2m|1N|1M/.11(a))e[a=="2m"?1G?"1N":"1M":a](k);N{J b=a.6r().1I(/^([+-]=)?([\\d+-.]+)(.*)$/),2b=e.1t(M)||0;G(b){J d=3d(b[2]),2M=b[3]||"2X";G(2M!="2X"){46.V[c]=(d||1)+2M;2b=((d||1)/e.1t(M))*2b;46.V[c]=2b+2M}G(b[1])d=((b[1]=="-="?-1:1)*d)+2b;e.3G(2b,d,2M)}N e.3G(2b,a,"")}});I M})},36:H(a,b){G(D.1D(a)||(a&&a.1q==2p)){b=a;a="28"}G(!a||(1j a=="23"&&!b))I A(7[0],a);I 7.P(H(){G(b.1q==2p)A(7,a,b);N{A(7,a).1p(b);G(A(7,a).K==1)b.1k(7)}})},9X:H(b,c){J a=D.3O;G(b)7.36([]);7.P(H(){R(J i=a.K-1;i>=0;i--)G(a[i].T==7){G(c)a[i](M);a.7n(i,1)}});G(!c)7.5A();I 7}});J A=H(b,c,a){G(b){c=c||"28";J q=D.L(b,c+"36");G(!q||a)q=D.L(b,c+"36",D.2d(a))}I q};D.17.5A=H(a){a=a||"28";I 7.P(H(){J q=A(7,a);q.4s();G(q.K)q[0].1k(7)})};D.1l({77:H(b,a,c){J d=b&&b.1q==a0?b:{1J:c||!c&&a||D.1D(b)&&b,2u:b,41:c&&a||a&&a.1q!=9t&&a};d.2u=(d.2u&&d.2u.1q==4L?d.2u:D.28.5K[d.2u])||D.28.5K.74;d.5M=d.1J;d.1J=H(){G(d.36!==Q)D(7).5A();G(D.1D(d.5M))d.5M.1k(7)};I d},41:{73:H(p,n,b,a){I b+a*p},5P:H(p,n,b,a){I((-29.9r(p*29.9q)/2)+0.5)*a+b}},3O:[],48:U,28:H(b,c,a){7.15=c;7.T=b;7.1i=a;G(!c.3Z)c.3Z={}}});D.28.44={4D:H(){G(7.15.2Y)7.15.2Y.1k(7.T,7.1z,7);(D.28.2Y[7.1i]||D.28.2Y.4w)(7);G(7.1i=="1Z"||7.1i=="2h")7.T.V.18="3I"},1t:H(a){G(7.T[7.1i]!=U&&7.T.V[7.1i]==U)I 7.T[7.1i];J r=3d(D.1g(7.T,7.1i,a));I r&&r>-9p?r:3d(D.2a(7.T,7.1i))||0},3G:H(c,b,d){7.5V=1z();7.2b=c;7.3l=b;7.2M=d||7.2M||"2X";7.1z=7.2b;7.2S=7.4N=0;7.4D();J e=7;H t(a){I e.2Y(a)}t.T=7.T;D.3O.1p(t);G(D.48==U){D.48=4I(H(){J a=D.3O;R(J i=0;i7.15.2u+7.5V){7.1z=7.3l;7.2S=7.4N=1;7.4D();7.15.45[7.1i]=M;J b=M;R(J i 1n 7.15.45)G(7.15.45[i]!==M)b=Q;G(b){G(7.15.18!=U){7.T.V.33=7.15.33;7.T.V.18=7.15.18;G(D.1g(7.T,"18")=="2F")7.T.V.18="3I"}G(7.15.1M)7.T.V.18="2F";G(7.15.1M||7.15.1N)R(J p 1n 7.15.45)D.1K(7.T.V,p,7.15.3Z[p])}G(b)7.15.1J.1k(7.T);I Q}N{J n=t-7.5V;7.4N=n/7.15.2u;7.2S=D.41[7.15.41||(D.41.5P?"5P":"73")](7.4N,n,0,1,7.15.2u);7.1z=7.2b+((7.3l-7.2b)*7.2S);7.4D()}I M}};D.1l(D.28,{5K:{9l:9j,9i:7e,74:9g},2Y:{2e:H(a){a.T.2e=a.1z},2c:H(a){a.T.2c=a.1z},1y:H(a){D.1K(a.T.V,"1y",a.1z)},4w:H(a){a.T.V[a.1i]=a.1z+a.2M}}});D.17.2i=H(){J b=0,1S=0,T=7[0],3q;G(T)ao(D.14){J d=T.1d,4a=T,1s=T.1s,1Q=T.2z,5U=2k&&3r(5B)<9c&&!/9a/i.11(v),1g=D.2a,3c=1g(T,"30")=="3c";G(T.7y){J c=T.7y();1e(c.1A+29.2f(1Q.1C.2e,1Q.1c.2e),c.1S+29.2f(1Q.1C.2c,1Q.1c.2c));1e(-1Q.1C.6b,-1Q.1C.6a)}N{1e(T.5X,T.5W);1B(1s){1e(1s.5X,1s.5W);G(42&&!/^t(98|d|h)$/i.11(1s.2j)||2k&&!5U)2C(1s);G(!3c&&1g(1s,"30")=="3c")3c=M;4a=/^1c$/i.11(1s.2j)?4a:1s;1s=1s.1s}1B(d&&d.2j&&!/^1c|2K$/i.11(d.2j)){G(!/^96|1T.*$/i.11(1g(d,"18")))1e(-d.2e,-d.2c);G(42&&1g(d,"33")!="4j")2C(d);d=d.1d}G((5U&&(3c||1g(4a,"30")=="5x"))||(42&&1g(4a,"30")!="5x"))1e(-1Q.1c.5X,-1Q.1c.5W);G(3c)1e(29.2f(1Q.1C.2e,1Q.1c.2e),29.2f(1Q.1C.2c,1Q.1c.2c))}3q={1S:1S,1A:b}}H 2C(a){1e(D.2a(a,"6V",M),D.2a(a,"6U",M))}H 1e(l,t){b+=3r(l,10)||0;1S+=3r(t,10)||0}I 3q};D.17.1l({30:H(){J a=0,1S=0,3q;G(7[0]){J b=7.1s(),2i=7.2i(),4c=/^1c|2K$/i.11(b[0].2j)?{1S:0,1A:0}:b.2i();2i.1S-=25(7,\'94\');2i.1A-=25(7,\'aF\');4c.1S+=25(b,\'6U\');4c.1A+=25(b,\'6V\');3q={1S:2i.1S-4c.1S,1A:2i.1A-4c.1A}}I 3q},1s:H(){J a=7[0].1s;1B(a&&(!/^1c|2K$/i.11(a.2j)&&D.1g(a,\'30\')==\'93\'))a=a.1s;I D(a)}});D.P([\'5e\',\'5G\'],H(i,b){J c=\'4y\'+b;D.17[c]=H(a){G(!7[0])I;I a!=12?7.P(H(){7==1b||7==S?1b.92(!i?a:D(1b).2e(),i?a:D(1b).2c()):7[c]=a}):7[0]==1b||7[0]==S?46[i?\'aI\':\'aJ\']||D.71&&S.1C[c]||S.1c[c]:7[0][c]}});D.P(["6N","4b"],H(i,b){J c=i?"5e":"5G",4f=i?"6k":"6i";D.17["5s"+b]=H(){I 7[b.3y()]()+25(7,"57"+c)+25(7,"57"+4f)};D.17["90"+b]=H(a){I 7["5s"+b]()+25(7,"2C"+c+"4b")+25(7,"2C"+4f+"4b")+(a?25(7,"6S"+c)+25(7,"6S"+4f):0)}})})();',62,669,'|||||||this|||||||||||||||||||||||||||||||||||if|function|return|var|length|data|true|else|type|each|false|for|document|elem|null|style|event||nodeName|||test|undefined||browser|options|nodeType|fn|display|arguments|url|window|body|parentNode|add|msie|css|indexOf|prop|typeof|call|extend|script|in|replace|push|constructor|text|offsetParent|cur|status|div|apply|firstChild|opacity|now|left|while|documentElement|isFunction|filter|className|hidden|handle|match|complete|attr|ret|hide|show|dataType|trigger|doc|split|top|table|try|catch|success|break|cache|height||remove|tbody|string|guid|num|global|ready|fx|Math|curCSS|start|scrollTop|makeArray|scrollLeft|max|animate|width|offset|tagName|safari|map|toggle||done|Array|find|toUpperCase|button|special|duration|id|copy|value|handler|ownerDocument|select|new|border|exec|stack|none|opera|nextSibling|pushStack|target|html|inArray|unit|xml|bind|GET|isReady|merge|pos|timeout|delete|one|selected|px|step|jsre|position|async|preventDefault|overflow|name|which|queue|removeChild|namespace|insertBefore|nth|removeData|fixed|parseFloat|error|readyState|multiFilter|createElement|rl|re|trim|end|_|param|first|get|results|parseInt|slice|childNodes|encodeURIComponent|append|events|elems|toLowerCase|json|readyList|setTimeout|grep|mouseenter|color|is|custom|getElementsByTagName|block|stopPropagation|addEventListener|callee|proxy|mouseleave|timers|defaultView|password|disabled|last|has|appendChild|form|domManip|props|ajax|orig|set|easing|mozilla|load|prototype|curAnim|self|charCode|timerId|object|offsetChild|Width|parentOffset|src|unbind|br|currentStyle|clean|float|visible|relatedTarget|previousSibling|handlers|isXMLDoc|on|setup|nodeIndex|unique|shift|javascript|child|RegExp|_default|deep|scroll|lastModified|teardown|setRequestHeader|timeStamp|update|empty|tr|getAttribute|innerHTML|setInterval|checked|fromElement|Number|jQuery|state|active|jsonp|accepts|application|dir|input|responseText|click|styleSheets|unload|not|lastToggle|outline|mouseout|getPropertyValue|mouseover|getComputedStyle|bindReady|String|padding|pageX|metaKey|keyCode|getWH|andSelf|clientX|Left|all|visibility|container|index|init|triggered|removeAttribute|classFilter|prevObject|submit|file|after|windowData|inner|client|globalEval|sibling|jquery|absolute|clone|wrapAll|dequeue|version|triggerHandler|oldblock|ctrlKey|createTextNode|Top|handleError|getResponseHeader|parsererror|speeds|checkbox|old|00|radio|swing|href|Modified|ifModified|lastChild|safari2|startTime|offsetTop|offsetLeft|username|location|ajaxSettings|getElementById|isSimple|values|selectedIndex|runtimeStyle|rsLeft|_load|loaded|DOMContentLoaded|clientTop|clientLeft|toElement|srcElement|val|pageY|POST|unshift|Bottom|clientY|Right|fix|exclusive|detachEvent|cloneNode|removeEventListener|swap|toString|join|attachEvent|eval|substr|head|parse|textarea|reset|image|zoom|odd|even|before|prepend|exclude|expr|quickClass|quickID|uuid|quickChild|continue|Height|textContent|appendTo|contents|open|margin|evalScript|borderTopWidth|borderLeftWidth|parent|httpData|setArray|CSS1Compat|compatMode|boxModel|cssFloat|linear|def|webkit|nodeValue|speed|_toggle|eq|100|replaceWith|304|concat|200|alpha|Last|httpNotModified|getAttributeNode|httpSuccess|clearInterval|abort|beforeSend|splice|styleFloat|throw|colgroup|XMLHttpRequest|ActiveXObject|scriptCharset|callback|fieldset|multiple|processData|getBoundingClientRect|contentType|link|ajaxSend|ajaxSuccess|ajaxError|col|ajaxComplete|ajaxStop|ajaxStart|serializeArray|notmodified|keypress|keydown|change|mouseup|mousedown|dblclick|focus|blur|stylesheet|hasClass|rel|doScroll|black|hover|solid|cancelBubble|returnValue|wheelDelta|view|round|shiftKey|resize|screenY|screenX|relatedNode|mousemove|prevValue|originalTarget|offsetHeight|keyup|newValue|offsetWidth|eventPhase|detail|currentTarget|cancelable|bubbles|attrName|attrChange|altKey|originalEvent|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|font|gt|lt|uFFFF|u0128|size|417|Boolean|Date|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|wrap|contentWindow|contentDocument|iframe|children|siblings|prevAll|wrapInner|nextAll|outer|prev|scrollTo|static|marginTop|next|inline|parents|able|cellSpacing|adobeair|cellspacing|522|maxLength|maxlength|readOnly|400|readonly|fast|600|class|slow|1px|htmlFor|reverse|10000|PI|cos|compatible|Function|setData|ie|ra|it|rv|getData|userAgent|navigator|fadeTo|fadeIn|slideToggle|slideUp|slideDown|ig|responseXML|content|1223|NaN|fadeOut|300|protocol|send|setAttribute|option|dataFilter|cssText|changed|be|Accept|stop|With|Requested|Object|can|GMT|property|1970|Jan|01|Thu|Since|If|Type|Content|XMLHTTP|th|Microsoft|td|onreadystatechange|onload|cap|charset|colg|host|tfoot|specified|with|1_|thead|leg|plain|attributes|opt|embed|urlencoded|www|area|hr|ajaxSetup|meta|post|getJSON|getScript|marginLeft|img|elements|pageYOffset|pageXOffset|abbr|serialize|pixelLeft'.split('|'),0,{})) \ No newline at end of file Index: branches/RC/core/admin_templates/js/jquery/thickbox/loadingAnimation.gif =================================================================== diff -u -N Binary files differ Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl =================================================================== diff -u -N -r11111 -r11368 --- branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl (.../item_selector_advanced_view.tpl) (revision 11111) +++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl (.../item_selector_advanced_view.tpl) (revision 11368) @@ -1,14 +1,10 @@ - - + + - - + - - - @@ -26,52 +22,28 @@ var $Catalog = new Catalog('', 'is_advanced_view_', 0); + + -
- - - - - - - - - - - - - - - - -
- .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/RC/core/kernel/nparser/nparser.php =================================================================== diff -u -N -r11336 -r11368 --- branches/RC/core/kernel/nparser/nparser.php (.../nparser.php) (revision 11336) +++ branches/RC/core/kernel/nparser/nparser.php (.../nparser.php) (revision 11368) @@ -590,6 +590,11 @@ $silent = $params['is_silent']; } + if (isset($params['pass_params'])) { + // ability to pass params from block to template + $params = array_merge($this->Params, $params); + } + $this->PushParams($params); $ret = $this->Run($t, $silent); $this->PopParams(); Index: branches/RC/core/units/reviews/reviews_config.php =================================================================== diff -u -N -r10455 -r11368 --- branches/RC/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 10455) +++ branches/RC/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 11368) @@ -182,12 +182,12 @@ 'ReviewsSection' => Array ( 'Icons' => Array ('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'), 'Fields' => Array ( - 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), 'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td'), 'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy' ), 'CreatedOn_formatted' => Array( 'title'=>'la_col_CreatedOn', 'sort_field' => 'CreatedOn' ), - 'Status' => Array( 'title'=>'la_col_Status' ), - 'Rating' => Array( 'title'=>'la_col_Rating' ), + 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter' ), + 'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter' ), ), ), ), Index: branches/RC/core/admin_templates/users/user_edit_items.tpl =================================================================== diff -u -N -r11141 -r11368 --- branches/RC/core/admin_templates/users/user_edit_items.tpl (.../user_edit_items.tpl) (revision 11141) +++ branches/RC/core/admin_templates/users/user_edit_items.tpl (.../user_edit_items.tpl) (revision 11368) @@ -1,4 +1,5 @@ + @@ -109,6 +110,8 @@ + + Index: branches/RC/core/admin_templates/reviews/reviews_tab.tpl =================================================================== diff -u -N -r10455 -r11368 --- branches/RC/core/admin_templates/reviews/reviews_tab.tpl (.../reviews_tab.tpl) (revision 10455) +++ branches/RC/core/admin_templates/reviews/reviews_tab.tpl (.../reviews_tab.tpl) (revision 11368) @@ -3,44 +3,41 @@ - + + + $Catalog.setItemCount('', ''); $Catalog.setCurrentCategory('', 0); + $Catalog.saveSearch('', '', ''); - - + + +
+ + + + + + + Grids[''].AddAlternativeGrid('', true); Grids[''].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6')); $Catalog.reflectPasteButton(); $Catalog.setViewMenu(''); - Grids[''].EnableRadioMode(); Grids[''].DblClick = function() {return false}; #separator# - - - - -
- - - - - - - - - + - \ No newline at end of file + \ No newline at end of file Index: branches/RC/core/units/general/cat_dbitem.php =================================================================== diff -u -N -r9824 -r11368 --- branches/RC/core/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 9824) +++ branches/RC/core/units/general/cat_dbitem.php (.../cat_dbitem.php) (revision 11368) @@ -42,13 +42,16 @@ $this->usePendingEditing = $this->Application->getUnitOption($this->Prefix, 'UsePendingEditing'); } - function Create($force_id=false, $system_create=false) + function Create($force_id = false, $system_create = false) { - if (!$this->Validate()) return false; + // TODO: move to OnBeforeItemCreate method + if ($this->Validate()) { + // TODO: such approach will not respect changes from OnBeforeItemCreate event + $this->SetDBField('ResourceId', $this->Application->NextResourceId()); + } - $this->SetDBField('ResourceId', $this->Application->NextResourceId()); - $this->SetDBField('Modified', adodb_mktime() ); - $this->UpdateFormattersSubFields(array('Modified')); + $this->SetDBField('Modified_date', adodb_mktime() ); + $this->SetDBField('Modified_time', adodb_mktime() ); if ($this->mode != 't' && !$this->Application->IsAdmin()) { $owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField'); @@ -63,8 +66,10 @@ $this->generateFilename(); } - $ret = parent::Create(); + $ret = parent::Create($force_id, $system_create); + if ($ret) { + // TODO: move to OnAfterItemCreate method $this->assignPrimaryCategory(); } return $ret; Index: branches/RC/core/admin_templates/js/script.js =================================================================== diff -u -N -r11281 -r11368 --- branches/RC/core/admin_templates/js/script.js (.../script.js) (revision 11281) +++ branches/RC/core/admin_templates/js/script.js (.../script.js) (revision 11368) @@ -20,7 +20,6 @@ // hook processing var hBEFORE = 1; // this is const, but including this twice causes errors var hAFTER = 2; // this is const, but including this twice causes errors - var $hooks = new Array(); replaceFireBug(); } @@ -664,7 +663,6 @@ case 27: search_reset($prefix_special, $grid, parseInt($ajax)); break; - } } @@ -1396,6 +1394,7 @@ function findPos(obj, with_scroll) { if (!with_scroll) var with_scroll = false; var curleft = curtop = 0; + if (obj.offsetParent) { curleft = obj.offsetLeft - (with_scroll ? obj.scrollLeft : 0) curtop = obj.offsetTop - (with_scroll ? obj.scrollTop : 0) @@ -1404,6 +1403,7 @@ curtop += obj.offsetTop - (with_scroll ? obj.scrollTop : 0) } } + return [curleft,curtop]; } @@ -1420,19 +1420,9 @@ } }; -function addLoadEvent(func, wnd) { - if (!wnd) wnd = window - var oldonload = wnd.onload; - if (typeof wnd.onload != 'function') { - wnd.onload = func; - } else { - wnd.onload = function() { - if (oldonload) { - oldonload(); - } - func(); - } - } +function addLoadEvent(func, wnd) +{ + Application.setHook('m:OnAfterWindowLoad', func); } function replaceFireBug() { @@ -1442,8 +1432,8 @@ window.console = {}; for (var i = 0; i < names.length; ++i) { - window.console[names[i]] = function() { - alert('FireBug console object methods are not available outside Firefox!'); + window.console[names[i]] = function($msg) { + alert('FireBug console object methods are not available outside Firefox!' + "\n" + $msg); } } } @@ -1479,4 +1469,12 @@ if (typeof UploadsManager != 'undefined') { UploadsManager.iterate($method); } +} + +String.prototype.trim = function () { + return this.replace(/\s*((\S+\s*)*)/, "$1").replace(/((\s*\S+)*)\s*/, "$1"); +} + +String.prototype.toNumeric = function () { + return parseInt( this.replace(/(auto|medium)/, '0px').replace(/[a-z]/gi,'') ); } \ No newline at end of file Index: branches/RC/core/units/categories/categories_item.php =================================================================== diff -u -N -r10920 -r11368 --- branches/RC/core/units/categories/categories_item.php (.../categories_item.php) (revision 10920) +++ branches/RC/core/units/categories/categories_item.php (.../categories_item.php) (revision 11368) @@ -2,14 +2,17 @@ class CategoriesItem extends kDBItem { - function Create($force_id=false, $system_create=false) + function Create($force_id = false, $system_create = false) { $this->checkFilename(); $this->generateFilename(); - if (!$this->Validate()) return false; + if ($this->Validate()) { + // TODO: such approach will not respect changes from CategoryEventHandler::OnBeforeItemCreate event + $this->SetDBField('ResourceId', $this->Application->NextResourceId()); + } - $this->SetDBField('ResourceId', $this->Application->NextResourceId()); + // TODO: move to CategoryEventHandler::OnBeforeItemCreate $this->SetDBField('CreatedById', $this->Application->RecallVar('user_id') ); $this->SetDBField('CreatedOn_date', adodb_mktime() ); $this->SetDBField('CreatedOn_time', adodb_mktime() ); @@ -18,24 +21,26 @@ $this->SetDBField('ParentId', $parent_category); $ret = parent::Create($force_id, $system_create); + if ($ret) { + // TODO: move to CategoryEventHandler::OnAfterItemCreate method $sql = 'UPDATE %s SET ParentPath = %s WHERE CategoryId = %s'; $parent_path = $this->buildParentPath(); $this->Conn->Query( sprintf($sql, $this->TableName, $this->Conn->qstr($parent_path), $this->GetID() ) ); $this->SetDBField('ParentPath', $parent_path); } + return $ret; } - function Update($id=null, $system_update=false) + function Update($id=null, $system_update = false) { $this->checkFilename(); $this->generateFilename(); - $ret = parent::Update($id, $system_update); - return $ret; + return parent::Update($id, $system_update); } function buildParentPath() @@ -53,7 +58,7 @@ return $parent_path.$this->GetID().'|'; } - + /** * replace not allowed symbols with "_" chars + remove duplicate "_" chars in result * @@ -85,7 +90,7 @@ if(!$filename) return $filename; $escape_char = $this->Application->ConfigValue('FilenameSpecialCharReplacement'); - + $item_id = !$this->GetID() ? 0 : $this->GetID(); $check_in_parent_cat_only = $item_id ? ' AND ParentId = '.$this->GetDBField('ParentId') : ''; Index: branches/RC/core/admin_templates/js/catalog.js =================================================================== diff -u -N -r11163 -r11368 --- branches/RC/core/admin_templates/js/catalog.js (.../catalog.js) (revision 11163) +++ branches/RC/core/admin_templates/js/catalog.js (.../catalog.js) (revision 11368) @@ -5,19 +5,29 @@ this.Separator = '#separator#'; this.ParentCategoryID = 0; this.OnResponceMethod = null; - this.TabShift = isset($tab_shift) ? $tab_shift : 1; // start from 2nd tab (index starting from 0) this.TabRegistry = new Array(); - this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix'); + + if (window.location.hash && window.location.hash.match(/^#tab-(.*)/)) { + // get active tab from anchor + this.ActivePrefix = RegExp.$1; + } + else { + // get active tab from cookie + this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix'); + } + this.PreviousPrefix = this.ActivePrefix; this.TabByCategory = false; // preselect tab by category (used in catalog only) $ViewMenus = new Array('c'); + + this.searchInfo = {}; // information about search (for each tab) } Catalog.prototype.Init = function () { var $prefix = this.queryTabRegistry('prefix', this.ActivePrefix, 'prefix'); - if ($prefix !== this.ActivePrefix && this.TabRegistry.length > this.TabShift) { + if ($prefix !== this.ActivePrefix && this.TabRegistry.length > 0) { // ActivePrefix not set or has non-existing prefix value - this.ActivePrefix = this.TabRegistry[this.TabShift]['prefix']; + this.ActivePrefix = this.TabRegistry[0]['prefix']; } this.SetAlternativeTabs(); this.AfterInit(); @@ -29,10 +39,10 @@ Catalog.prototype.SetAlternativeTabs = function () { // set alternative grids between all items (catalog is set when tab is loaded via AJAX first time) - var $i = this.TabShift; + var $i = 0; while ($i < this.TabRegistry.length) { // run through all prefixes - var $j = this.TabShift; + var $j = 0; while ($j < this.TabRegistry.length) { if (this.TabRegistry[$i]['prefix'] == this.TabRegistry[$j]['prefix']) { $j++; @@ -65,19 +75,15 @@ Request.makeRequest($kf.action, this.BusyRequest[$prefix], $result_div, this.successCallback, this.errorCallback, $result_div, this); $form_name = 'kernel_form'; // restore back to main form with current category id of catalog -}; +} Catalog.prototype.successCallback = function($request, $params, $object) { + if (Request.processRedirect($request)) { + return ; + } var $text = $request.responseText; - var $match_redirect = new RegExp('^#redirect#(.*)').exec($text); - if ($match_redirect != null) { - // redirect to external template requested - window.location.href = $match_redirect[1]; - return false; - } - $params = $params.split(','); var $js_end = $text.indexOf($object.Separator); @@ -106,8 +112,28 @@ if (typeof($Debugger) != 'undefined') { $Debugger.Clear(); } + +// var $tab_id = $params[0].replace(/_div$/, ''); +// var $prefix = $object.queryTabRegistry('tab_id', $tab_id, 'prefix'); } +Catalog.prototype.resizeGrid = function ($prefix) { + if ($prefix != this.ActivePrefix) { + // no need to resize, because grid is already visible + return true; + } + + var $grid = GridScrollers[$prefix]; + if ($grid) { + $grid.RefreshPos(); + $grid.Resize( $grid.GetAutoSize('auto') ); + + return true; + } + + return false; +} + Catalog.prototype.trim = function ($string) { return $string.replace(/\s*((\S+\s*)*)/, "$1").replace(/((\s*\S+)*)\s*/, "$1"); } @@ -152,29 +178,39 @@ set_hidden_field('m_cat_id', $cat_id); } + // 1. make all tabs unselected this.resetTabs(false); - // query sub categories of $cat_id - var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'categories/xml/categories_list').replace('#CATEGORY_ID#', $cat_id); + // 2. update grid for current tab + this.switchTab(this.TabByCategory ? $module_prefix : null); // refresh current item tab + // 3. update counters for all tabs var $prefix = this.TabRegistry[0]['prefix']; - var $tab_id = this.TabRegistry[0]['tab_id']; + + var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'catalog/catalog_counters').replace('#CATEGORY_ID#', $cat_id); this.BusyRequest[$prefix] = false; - Request.makeRequest($url, this.BusyRequest[$prefix], $tab_id + '_div', this.successCallback, this.errorCallback, $tab_id + '_div', this); - this.switchTab(this.TabByCategory ? $module_prefix : null); // refresh current item tab + Request.makeRequest($url, this.BusyRequest[$prefix], '', this.updateCounters, this.errorCallback, '', this); } +Catalog.prototype.updateCounters = function($request, $params, $object) { + if (Request.processRedirect($request)) { + return ; + } + + eval($request.responseText); +} + // set all item tabs counters to "?" before quering catagories Catalog.prototype.resetTabs = function($reset_content) { - var $i = this.TabShift; + var $i = 0; while ($i < this.TabRegistry.length) { this.setItemCount(this.TabRegistry[$i]['prefix'], '?'); $i++; } if ($reset_content) { // set category for all tabs to -1 (forces reload next time) - $i = this.TabShift; + $i = 0; while ($i < this.TabRegistry.length) { document.getElementById(this.TabRegistry[$i]['tab_id'] + '_div').setAttribute('category_id', -1); $i++; @@ -211,8 +247,12 @@ var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab document.getElementById($div_id).style.display = 'block'; this.ShowDependentButtons(this.ActivePrefix); + + this.displaySearch($prefix); this.setViewMenu(this.ActivePrefix); + setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix); + window.location.hash = '#tab-' + this.ActivePrefix; this.refreshTab($prefix, $div_id, $force); } @@ -229,9 +269,10 @@ this.BusyRequest[$prefix] = false; Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this); } - /*else { - alert('refresh disabled = {tab: '+this.ActivePrefix+'; cat_id: '+$cat_id+'; form_name: '+$form_name+'}'); - }*/ + else { +// alert('refresh disabled = {tab: '+this.ActivePrefix+'; cat_id: '+$cat_id+'; form_name: '+$form_name+'}'); + this.resizeGrid($prefix); + } } // adds information about tab to tab_registry @@ -300,6 +341,25 @@ setInnerHTML($prefix + '_item_count', $count); } +Catalog.prototype.saveSearch = function ($prefix, $keyword, $grid_name) { + this.searchInfo[$prefix] = { + 'keyword': $keyword, + 'grid': $grid_name + } + + this.displaySearch($prefix); +} +Catalog.prototype.displaySearch = function ($prefix) { + var $search_input = document.getElementById('search_keyword') + + $search_input.setAttribute('PrefixSpecial', $prefix); + + if (this.searchInfo[$prefix]) { + $search_input.value = this.searchInfo[$prefix].keyword; + $search_input.setAttribute('Grid', this.searchInfo[$prefix].grid); + } +} + Catalog.prototype.setCurrentCategory = function($prefix, $category_id) { var $tab_id = this.queryTabRegistry('prefix', $prefix, 'tab_id'); // alert('setting current category for prefix: ['+$prefix+']; tab_id ['+$tab_id+'] = ['+$category_id+']'); @@ -308,23 +368,11 @@ Catalog.prototype.getCurrentPrefix = function() { - if (isset(Grids[this.ActivePrefix]) && (Grids[this.ActivePrefix].SelectedCount > 0)) { - // item tab grid exists and some items are selected - return this.ActivePrefix; - } - else { - // return prefix of first registred tab -> categories - return this.TabRegistry[0]['prefix']; - } + return this.ActivePrefix; } Catalog.prototype.setViewMenu = function($item_prefix) { - if (this.TabShift == 1) { - $ViewMenus = isset($item_prefix) ? new Array('c', $item_prefix) : new Array('c'); - } - else { - $ViewMenus = isset($item_prefix) ? new Array($item_prefix) : new Array(); - } + $ViewMenus = isset($item_prefix) ? new Array($item_prefix) : new Array(); } Catalog.prototype.reflectPasteButton = function($status) { Index: branches/RC/core/admin_templates/incs/style.css =================================================================== diff -u -N -r11303 -r11368 --- branches/RC/core/admin_templates/incs/style.css (.../style.css) (revision 11303) +++ branches/RC/core/admin_templates/incs/style.css (.../style.css) (revision 11368) @@ -707,4 +707,16 @@ .uploader-text { font-size: 11px; -} \ No newline at end of file +} + +tr.hidden-filter td { + display: none; +} + +span#category_path, span#category_path a { + color: #FFFFFF; +} + +span#category_path a { + text-decoration: underline; +} Index: branches/RC/core/kernel/utility/debugger.php =================================================================== diff -u -N -r11350 -r11368 --- branches/RC/core/kernel/utility/debugger.php (.../debugger.php) (revision 11350) +++ branches/RC/core/kernel/utility/debugger.php (.../debugger.php) (revision 11368) @@ -1210,20 +1210,20 @@ { if ($this->constOn('DBG_TOOLBAR_BUTTONS')) { // we have sql & error count in toolbar, don't duplicate here - $info = Array( + $info = Array( 'Script Runtime' => 'PROFILE:script_runtime', 'SQL\'s Runtime' => 'PROFILE_T:sql', ); } else { // toolbar not visible, then show sql & error count too $info = Array ( - 'Script Runtime' => 'PROFILE:script_runtime', - 'SQL\'s Runtime' => 'PROFILE_T:sql', - '-' => 'SEP:-', - 'Notice / Warning' => 'PROFILE_TC:error_handling', - 'SQLs Count' => 'PROFILE_TC:sql', - ); + 'Script Runtime' => 'PROFILE:script_runtime', + 'SQL\'s Runtime' => 'PROFILE_T:sql', + '-' => 'SEP:-', + 'Notice / Warning' => 'PROFILE_TC:error_handling', + 'SQLs Count' => 'PROFILE_TC:sql', + ); } $ret = 'Application:'.$this->formatSize($memory_used).' ('.$memory_used.')'; Index: branches/RC/core/admin_templates/categories/ci_blocks.tpl =================================================================== diff -u -N -r11113 -r11368 --- branches/RC/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 11113) +++ branches/RC/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 11368) @@ -5,24 +5,22 @@ - - - - - - - - - + + + + + + + + - -
- - - : ">
- - - + +
+ + + :
+ + Index: branches/RC/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r11319 -r11368 --- branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11319) +++ branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11368) @@ -2304,6 +2304,32 @@ { return $this->Application->getUnitOption($this->Prefix, $params['name']); } + + /** + * Returns list of allowed toolbar buttons or false, when all is allowed + * + * @param Array $params + * @return string + */ + function VisibleToolbarButtons($params) + { + $preset_name = $params['title_preset']; + $title_presets = $this->Application->getUnitOption($this->Prefix, 'TitlePresets'); + + if (!array_key_exists($preset_name, $title_presets)) { + trigger_error('Title preset not specified or missing (in tag "' . $this->getPrefixSpecial() . ':' . __METHOD__ . '")', E_USER_WARNING); + return false; + } + + $preset_info = $title_presets[$preset_name]; + if (!array_key_exists('toolbar_buttons', $preset_info) || !is_array($preset_info['toolbar_buttons'])) { + return false; + } + + $toolbar_buttons = array_map('addslashes', $preset_info['toolbar_buttons']); + + return $toolbar_buttons ? "'" . implode("', '", $toolbar_buttons) . "'" : 'false'; + } } ?> \ No newline at end of file Index: branches/RC/core/kernel/session/session.php =================================================================== diff -u -N -r10975 -r11368 --- branches/RC/core/kernel/session/session.php (.../session.php) (revision 10975) +++ branches/RC/core/kernel/session/session.php (.../session.php) (revision 11368) @@ -640,7 +640,7 @@ //If session has expired if ($this->Expiration < adodb_mktime()) { - $this->Destroy(); + $this->Destroy(); return false; } Index: branches/RC/core/admin_templates/js/grid_scroller.js =================================================================== diff -u -N -r10911 -r11368 --- branches/RC/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 10911) +++ branches/RC/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 11368) @@ -652,7 +652,13 @@ widths[i] = (parent_dim.innerWidth - parent_dim.borders[1] - parent_dim.borders[3] - input_dim.borders[1] - input_dim.borders[3] - 2)+'px'; } for (var i=0; i