Index: trunk/core/kernel/application.php
===================================================================
diff -u -r5024 -r5026
--- trunk/core/kernel/application.php (.../application.php) (revision 5024)
+++ trunk/core/kernel/application.php (.../application.php) (revision 5026)
@@ -1316,6 +1316,8 @@
if( isset($params['js_redirect']) ) unset($params['js_redirect']);
if (!isset($params['pass'])) $params['pass'] = 'all';
+ if ($this->GetVar('ajax') == 'yes') $params['ajax'] = 'yes';
+
$params['__URLENCODE__'] = 1;
$location = $this->HREF($t, $prefix, $params, $index_file);
Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r5025 -r5026
--- trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5025)
+++ trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5026)
@@ -22,12 +22,12 @@
var a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('upcat', '', function() {
- Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form');
}
) );
a_toolbar.AddButton( new ToolBarButton('homecat', '', function() {
- Catalog.submit_event('c', 'OnGoHome', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c', 'OnGoHome', null, 'categories_div', 'categories_form');
}
) );
@@ -56,19 +56,19 @@
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
a_toolbar.AddButton( new ToolBarButton('approve', '', function() {
- Catalog.submit_event('c','OnMassApprove', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c','OnMassApprove', null, 'categories_div', 'categories_form');
}
) );
a_toolbar.AddButton( new ToolBarButton('decline', '', function() {
- Catalog.submit_event('c','OnMassDecline', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c','OnMassDecline', null, 'categories_div', 'categories_form');
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep3') );
a_toolbar.AddButton( new ToolBarButton('export', '', function() {
- alert( Request.serializeForm('categories_form') );
+
}
) );
@@ -112,7 +112,7 @@
a_toolbar.AddButton( new ToolBarSeparator('sep6') );
a_toolbar.AddButton( new ToolBarButton('view', '', function() {
- show_viewmenu(a_toolbar,'view');
+ show_viewmenu(a_toolbar, 'view');
}
) );
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -r4996 -r5026
--- trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 4996)
+++ trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 5026)
@@ -944,4 +944,35 @@
} else {
el.removeEventListener(evname, func, true);
}
- };*/
\ No newline at end of file
+ };*/
+
+ function setCookie($Name, $Value)
+ {
+ // set cookie
+ if(getCookie($Name) != $Value)
+ {
+ document.cookie = $Name+'='+escape($Value)+'; path=' + $base_path + '/';
+ }
+ }
+
+ function getCookie($Name)
+ {
+ // get cookie
+ var $cookieString = document.cookie;
+ var $index = $cookieString.indexOf($Name+'=');
+ if($index == -1) return null;
+
+ $index = $cookieString.indexOf('=',$index)+1;
+ var $endstr = $cookieString.indexOf(';',$index);
+ if($endstr == -1) $endstr = $cookieString.length;
+ return unescape($cookieString.substring($index, $endstr));
+ }
+
+ function deleteCookie($Name)
+ {
+ // deletes cookie
+ if (getCookie($Name))
+ {
+ document.cookie = $Name+'=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/';
+ }
+ }
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -r5024 -r5026
--- trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5024)
+++ trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5026)
@@ -1,14 +1,13 @@
var $is_catalog = true;
-function Catalog($url_mask) {
+function Catalog($url_mask, $cookie_prefix) {
+ this.CookiePrefix = $cookie_prefix ? $cookie_prefix : '';
this.BusyRequest = false;
this.URLMask = $url_mask;
this.Separator = '#separator#';
this.TabRegistry = new Array();
-
- // get from cookie
- this.ActivePrefix = '';
+ this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix');
$ViewMenus = new Array('c');
}
@@ -107,6 +106,7 @@
var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab
document.getElementById($div_id).style.display = 'block';
this.ShowDependentButtons(this.ActivePrefix);
+ setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix);
$ViewMenus = new Array('c', this.ActivePrefix);
// this.TabRegistry.length == 1
Index: trunk/kernel/admin_templates/incs/header.tpl
===================================================================
diff -u -r4996 -r5026
--- trunk/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 4996)
+++ trunk/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 5026)
@@ -29,7 +29,7 @@
var main_title = '';
var tpl_changed = 0;
var base_url = '';
-
+var $base_path = '';
var img_path = "img/";
Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r5025 -r5026
--- trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5025)
+++ trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5026)
@@ -22,12 +22,12 @@
var a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('upcat', '', function() {
- Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form');
}
) );
a_toolbar.AddButton( new ToolBarButton('homecat', '', function() {
- Catalog.submit_event('c', 'OnGoHome', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c', 'OnGoHome', null, 'categories_div', 'categories_form');
}
) );
@@ -56,19 +56,19 @@
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
a_toolbar.AddButton( new ToolBarButton('approve', '', function() {
- Catalog.submit_event('c','OnMassApprove', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c','OnMassApprove', null, 'categories_div', 'categories_form');
}
) );
a_toolbar.AddButton( new ToolBarButton('decline', '', function() {
- Catalog.submit_event('c','OnMassDecline', null, 'categories_div', 'categories_form');
+ $Catalog.submit_event('c','OnMassDecline', null, 'categories_div', 'categories_form');
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep3') );
a_toolbar.AddButton( new ToolBarButton('export', '', function() {
- alert( Request.serializeForm('categories_form') );
+
}
) );
@@ -112,7 +112,7 @@
a_toolbar.AddButton( new ToolBarSeparator('sep6') );
a_toolbar.AddButton( new ToolBarButton('view', '', function() {
- show_viewmenu(a_toolbar,'view');
+ show_viewmenu(a_toolbar, 'view');
}
) );