Index: branches/5.2.x/admin_templates/reports/results.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/reports/results.tpl (.../results.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/reports/results.tpl (.../results.tpl) (revision 16341)
@@ -14,8 +14,8 @@
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('cancel', '', function() {
-// window.location = ''
- window.location = '';
+// window.location = ''
+ window.location = '';
return true;
}
) );
@@ -44,7 +44,7 @@
// Chart window open button
a_toolbar.AddButton( new ToolBarButton('in-commerce:view_chart', '', function() {
- openSelector('rep', '');
+ openSelector('rep', '');
}
) );
Index: branches/5.2.x/admin_templates/shipping/shipping_costs.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/shipping/shipping_costs.tpl (.../shipping_costs.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/shipping/shipping_costs.tpl (.../shipping_costs.tpl) (revision 16341)
@@ -47,7 +47,7 @@
a_toolbar.AddButton( new ToolBarButton('in-commerce:modify', '',
function() {
- openSelector('s', '');
+ openSelector('s', '');
} ) );
a_toolbar.Render();
Index: branches/5.2.x/admin_templates/affiliate_plans/affiliate_plans_items.tpl
===================================================================
diff -u -r15536 -r16341
--- branches/5.2.x/admin_templates/affiliate_plans/affiliate_plans_items.tpl (.../affiliate_plans_items.tpl) (revision 15536)
+++ branches/5.2.x/admin_templates/affiliate_plans/affiliate_plans_items.tpl (.../affiliate_plans_items.tpl) (revision 16341)
@@ -41,7 +41,7 @@
a_toolbar.AddButton( new ToolBarButton('new_item', '',
function() {
- openSelector('api', '', '');
+ openSelector('api', '', '');
} ) );
Index: branches/5.2.x/admin_templates/discounts/coupons_list.tpl
===================================================================
diff -u -r14569 -r16341
--- branches/5.2.x/admin_templates/discounts/coupons_list.tpl (.../coupons_list.tpl) (revision 14569)
+++ branches/5.2.x/admin_templates/discounts/coupons_list.tpl (.../coupons_list.tpl) (revision 16341)
@@ -28,7 +28,7 @@
a_toolbar.AddButton( new ToolBarButton('clone', '',
function() {
//set_event('sc', 'OnSaveCreated');
- openSelector('coup', '', '', '600x260', 'OnPrepareClone');
+ openSelector('coup', '', '', '600x260', 'OnPrepareClone');
} ) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
Index: branches/5.2.x/admin_templates/discounts/gift_certificate_list.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/discounts/gift_certificate_list.tpl (.../gift_certificate_list.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/discounts/gift_certificate_list.tpl (.../gift_certificate_list.tpl) (revision 16341)
@@ -53,7 +53,7 @@
addLoadEvent(
function() {
- openSelector('gc', '');
+ openSelector('gc', '');
}
);
Index: branches/5.2.x/admin_templates/import.tpl
===================================================================
diff -u -r15264 -r16341
--- branches/5.2.x/admin_templates/import.tpl (.../import.tpl) (revision 15264)
+++ branches/5.2.x/admin_templates/import.tpl (.../import.tpl) (revision 16341)
@@ -13,7 +13,7 @@
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('prev', '', function() {
- location.href = '';
+ location.href = '';
}
) );
Index: branches/5.2.x/admin_templates/products/products_options.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/products/products_options.tpl (.../products_options.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/products/products_options.tpl (.../products_options.tpl) (revision 16341)
@@ -98,7 +98,7 @@
Index: branches/5.2.x/admin_templates/products/products_relations.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/products/products_relations.tpl (.../products_relations.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/products/products_relations.tpl (.../products_relations.tpl) (revision 16341)
@@ -35,7 +35,7 @@
//Relations related:
a_toolbar.AddButton( new ToolBarButton('new_item', '::',
function() {
- openSelector('rel', '', 'TargetId', '950x600');
+ openSelector('rel', '', 'TargetId', '950x600');
} ) );
function edit()
Index: branches/5.2.x/admin_templates/discounts/discount_items.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/discounts/discount_items.tpl (.../discount_items.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/discounts/discount_items.tpl (.../discount_items.tpl) (revision 16341)
@@ -41,7 +41,7 @@
a_toolbar.AddButton( new ToolBarButton('new_item', '',
function() {
- openSelector('di', '', '');
+ openSelector('di', '', '');
} ) );
Index: branches/5.2.x/units/products/products_tag_processor.php
===================================================================
diff -u -r16315 -r16341
--- branches/5.2.x/units/products/products_tag_processor.php (.../products_tag_processor.php) (revision 16315)
+++ branches/5.2.x/units/products/products_tag_processor.php (.../products_tag_processor.php) (revision 16341)
@@ -1,6 +1,6 @@
Application->HREF('__default__', '', Array ('pass_category' => 1)), kUtil::ESCAPE_URL);
+ $params['continue'] = $this->Application->HREF('__default__', '', Array ('pass_category' => 1));
return $this->Application->ProcessParsedTag('m', 'Link', $params);
}
Index: branches/5.2.x/admin_templates/affiliate_plans/affiliates_edit.tpl
===================================================================
diff -u -r15536 -r16341
--- branches/5.2.x/admin_templates/affiliate_plans/affiliates_edit.tpl (.../affiliates_edit.tpl) (revision 15536)
+++ branches/5.2.x/admin_templates/affiliate_plans/affiliates_edit.tpl (.../affiliates_edit.tpl) (revision 16341)
@@ -34,7 +34,7 @@
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
a_toolbar.AddButton( new ToolBarButton('in-commerce:pay_out', '', function() {
- direct_edit('affil', '');
+ direct_edit('affil', '');
}
) );
Index: branches/5.2.x/admin_templates/export_progress.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/export_progress.tpl (.../export_progress.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/export_progress.tpl (.../export_progress.tpl) (revision 16341)
@@ -10,7 +10,7 @@
submit_event('p.export', 'OnExportCancel');
}
- $ProductExport = new AjaxProgressBar('');
+ $ProductExport = new AjaxProgressBar('');
\ No newline at end of file
Index: branches/5.2.x/admin_templates/orders/orders_edit_billing.tpl
===================================================================
diff -u -r16151 -r16341
--- branches/5.2.x/admin_templates/orders/orders_edit_billing.tpl (.../orders_edit_billing.tpl) (revision 16151)
+++ branches/5.2.x/admin_templates/orders/orders_edit_billing.tpl (.../orders_edit_billing.tpl) (revision 16341)
@@ -67,7 +67,7 @@
Index: branches/5.2.x/admin_templates/products/products_packagecontent.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/products/products_packagecontent.tpl (.../products_packagecontent.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/products/products_packagecontent.tpl (.../products_packagecontent.tpl) (revision 16341)
@@ -35,7 +35,7 @@
a_toolbar.AddButton( new ToolBarButton('new_item', '::',
function() {
- openSelector('p', '', 'PackageContent', null, 'OnSaveItems');
+ openSelector('p', '', 'PackageContent', null, 'OnSaveItems');
} ) );
a_toolbar.AddButton( new ToolBarButton('delete', '',
Index: branches/5.2.x/admin_templates/import_progress.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/import_progress.tpl (.../import_progress.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/import_progress.tpl (.../import_progress.tpl) (revision 16341)
@@ -10,7 +10,7 @@
submit_event('p.import', 'OnExportCancel');
}
- $ProductImport = new AjaxProgressBar('');
+ $ProductImport = new AjaxProgressBar('');
\ No newline at end of file
Index: branches/5.2.x/admin_templates/orders/orders_edit_preview.tpl
===================================================================
diff -u -r14582 -r16341
--- branches/5.2.x/admin_templates/orders/orders_edit_preview.tpl (.../orders_edit_preview.tpl) (revision 14582)
+++ branches/5.2.x/admin_templates/orders/orders_edit_preview.tpl (.../orders_edit_preview.tpl) (revision 16341)
@@ -33,7 +33,7 @@
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
a_toolbar.AddButton( new ToolBarButton('print', '', function() {
- openSelector('ord', '', '', '750x700');
+ openSelector('ord', '', '', '750x700');
}
) );
Index: branches/5.2.x/admin_templates/orders/orders_edit_items.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/orders/orders_edit_items.tpl (.../orders_edit_items.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/orders/orders_edit_items.tpl (.../orders_edit_items.tpl) (revision 16341)
@@ -48,7 +48,7 @@
//Order items related:
a_toolbar.AddButton( new ToolBarButton('new_item', '',
function() {
- openSelector('orditems', '', '', null, 'OnSaveItems');
+ openSelector('orditems', '', '', null, 'OnSaveItems');
} ) );
a_toolbar.AddButton( new ToolBarButton('delete', '',
Index: branches/5.2.x/admin_templates/discounts/coupon_items.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/discounts/coupon_items.tpl (.../coupon_items.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/discounts/coupon_items.tpl (.../coupon_items.tpl) (revision 16341)
@@ -41,7 +41,7 @@
a_toolbar.AddButton( new ToolBarButton('new_item', '::',
function() {
- openSelector('coupi', '', '');
+ openSelector('coupi', '', '');
} ) );
Index: branches/5.2.x/admin_templates/orders/export/export_progress.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/orders/export/export_progress.tpl (.../export_progress.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/orders/export/export_progress.tpl (.../export_progress.tpl) (revision 16341)
@@ -10,7 +10,7 @@
submit_event('ord.export', 'OnExportCancel');
}
- $ProductExport = new AjaxProgressBar('');
+ $ProductExport = new AjaxProgressBar('');
\ No newline at end of file
Index: branches/5.2.x/admin_templates/products/products_edit.tpl
===================================================================
diff -u -r15611 -r16341
--- branches/5.2.x/admin_templates/products/products_edit.tpl (.../products_edit.tpl) (revision 15611)
+++ branches/5.2.x/admin_templates/products/products_edit.tpl (.../products_edit.tpl) (revision 16341)
@@ -170,11 +170,11 @@
}
function openShipping() {
- openSelector('p','', 'ShippingOption', '800x600', 'OnPreSaveAndOpenPopup');
+ openSelector('p','', 'ShippingOption', '800x600', 'OnPreSaveAndOpenPopup');
}
function openCouponSelector() {
- openSelector('p','', 'AssignedCoupon', '800x400', 'OnPreSaveAndOpenPopup');
+ openSelector('p','', 'AssignedCoupon', '800x400', 'OnPreSaveAndOpenPopup');
}
Index: branches/5.2.x/admin_templates/reports/progress.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/reports/progress.tpl (.../progress.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/reports/progress.tpl (.../progress.tpl) (revision 16341)
@@ -7,9 +7,9 @@
function cancel_action() {
submit_event('rep', 'OnGoBack');
}
- // $ProductExport = new AjaxProgressBar('');
+ // $ProductExport = new AjaxProgressBar('');
- $ProductExport = new AjaxProgressBar('');
+ $ProductExport = new AjaxProgressBar('');
\ No newline at end of file
Index: branches/5.2.x/admin_templates/products/products_pricing.tpl
===================================================================
diff -u -r14569 -r16341
--- branches/5.2.x/admin_templates/products/products_pricing.tpl (.../products_pricing.tpl) (revision 14569)
+++ branches/5.2.x/admin_templates/products/products_pricing.tpl (.../products_pricing.tpl) (revision 16341)
@@ -64,7 +64,7 @@
set_hidden_field('t', $prev_template);
}
- var $BracketManager = new Catalog('', 'permmanager_', 'ProductPriceBracketManager');
+ var $BracketManager = new Catalog('', 'permmanager_', 'ProductPriceBracketManager');
@@ -131,7 +131,7 @@
}
}
a_toolbar.AddButton( new ToolBarButton('delete', '::', delete_brackets) );
-
+
function edit(){ }
a_toolbar.Render();
@@ -151,7 +151,7 @@
a_toolbar.DisableButton('delete');
-
+
Index: branches/5.2.x/admin_templates/products/products_categories.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/products/products_categories.tpl (.../products_categories.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/products/products_categories.tpl (.../products_categories.tpl) (revision 16341)
@@ -37,7 +37,7 @@
//Category related:
a_toolbar.AddButton( new ToolBarButton('new_item', '::',
function() {
- openSelector('p', '', 'ItemCategory');
+ openSelector('p', '', 'ItemCategory');
} ) );
a_toolbar.AddButton( new ToolBarButton('delete', '',
Index: branches/5.2.x/admin_templates/orders/export/export.tpl
===================================================================
diff -u -r14258 -r16341
--- branches/5.2.x/admin_templates/orders/export/export.tpl (.../export.tpl) (revision 14258)
+++ branches/5.2.x/admin_templates/orders/export/export.tpl (.../export.tpl) (revision 16341)
@@ -108,7 +108,7 @@
Request.method = 'POST';
Request.params = Request.serializeForm($kf);
$kf.elements['events[ord.export]'].value = tmp;
- Request.makeRequest('', delete_busy, '', function() {
+ Request.makeRequest('', delete_busy, '', function() {
presets = document.getElementById('');
for (i=0; i< presets.options.length; i++) {