-
+
| oInfooValue" align="center">
|
-
+
-
+
-
+
-
+
-
+
-
+
@@ -94,7 +94,7 @@
-
+
| ">
 " border="0" alt="" title="" />
" class="userslink"> ()
@@ -106,7 +106,7 @@
-
+
@@ -115,19 +115,19 @@
-
+
- ">
+ ">
|
-
+
|
">
@@ -141,15 +141,14 @@
|
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
Index: branches/unlabeled/unlabeled-1.24.2/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r6116 -r6514
--- branches/unlabeled/unlabeled-1.24.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 6116)
+++ branches/unlabeled/unlabeled-1.24.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 6514)
@@ -22,25 +22,25 @@
var $is_catalog = true;
var $Catalog = new Catalog('', 'catalog_');
var a_toolbar = new ToolBar();
-
+
a_toolbar.AddButton( new ToolBarButton('upcat', '', function() {
$Catalog.go_to_cat($Catalog.ParentCategoryID);
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('homecat', '', function() {
$Catalog.go_to_cat(0);
}
- ) );
-
+ ) );
+
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
+
a_toolbar.AddButton( new ToolBarButton('new_cat', '', function() {
std_precreate_item('c', 'categories/categories_edit');
}
- ) );
-
-
+ ) );
+
+
a_toolbar.AddButton( new ToolBarButton('editcat', '', function() {
var $edit_url = '';
var $category_id = get_hidden_field('m_cat_id');
@@ -49,33 +49,33 @@
redirect($redirect_url);
}
) );
-
+
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('edit', '', edit) );
-
+
a_toolbar.AddButton( new ToolBarButton('delete', '',
function() {
var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template');
std_delete_items($Catalog.getCurrentPrefix(), $template, 1);
- } ) );
-
-
+ } ) );
+
+
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
+
a_toolbar.AddButton( new ToolBarButton('approve', '', function() {
$Catalog.submit_event(null, 'OnMassApprove');
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('decline', '', function() {
$Catalog.submit_event(null, 'OnMassDecline');
}
- ) );
-
+ ) );
+
a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
+
a_toolbar.AddButton( new ToolBarButton('export', '', function() {
var $export_prefixes = new Array('l', 'p');
if (in_array($Catalog.ActivePrefix, $export_prefixes)) {
@@ -86,65 +86,65 @@
}
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '', function() {
redirect('');
}
) );
-
+
a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('cut', '', function() {
$Catalog.submit_event(null, 'OnCut');
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('copy', '', function() {
$Catalog.submit_event(null, 'OnCopy');
}
) );
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('paste', '', function() {
- $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) {
+ $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) {
$object.resetTabs(true);
- $object.switchTab();
+ $object.switchTab();
} );
}
) );
-
+
/*a_toolbar.AddButton( new ToolBarButton('clear_clipboard', '', function() {
if (confirm('')) {
- $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
+ $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
$GridManager.CheckDependencies($object.ActivePrefix);
} );
}
}
) );*/
-
+
a_toolbar.AddButton( new ToolBarSeparator('sep5') );
-
+
a_toolbar.AddButton( new ToolBarButton('move_up', '', function() {
$Catalog.submit_event(null, 'OnMassMoveUp');
}
) );
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('move_down', '', function() {
$Catalog.submit_event(null, 'OnMassMoveDown');
}
) );
-
+
a_toolbar.AddButton( new ToolBarSeparator('sep6') );
-
+
a_toolbar.AddButton( new ToolBarButton('view', '', function() {
show_viewmenu(a_toolbar, 'view');
}
) );
-
- a_toolbar.Render();
-
+
+ a_toolbar.Render();
+
function edit()
{
var $current_prefix = $Catalog.getCurrentPrefix();
@@ -189,7 +189,7 @@
|
-
+ |
|
@@ -218,10 +218,10 @@
-
+
| oInfooValue" align="center">
|
-
+
-
+
-
+
-
+
-
+
-
+
@@ -94,7 +94,7 @@
-
+
| ">
" border="0" alt="" title="" />
" class="userslink"> ()
@@ -106,7 +106,7 @@
-
+
@@ -115,19 +115,19 @@
-
+
|
- ">
+ ">
|
-
+
|
">
@@ -141,15 +141,14 @@
|
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
Index: branches/unlabeled/unlabeled-1.6.2/core/units/languages/languages_item.php
===================================================================
diff -u -r6449 -r6514
--- branches/unlabeled/unlabeled-1.6.2/core/units/languages/languages_item.php (.../languages_item.php) (revision 6449)
+++ branches/unlabeled/unlabeled-1.6.2/core/units/languages/languages_item.php (.../languages_item.php) (revision 6514)
@@ -31,6 +31,9 @@
*/
function formatNumber($number, $precision = null)
{
+ if (is_null($precision)) {
+ $precision = preg_match('/[\.,]+/', $number) ? strlen(preg_replace('/^.*[\.,]+/', '', $number)) : 0;
+ }
return number_format($number, $precision, $this->GetDBField('DecimalPoint'), $this->GetDBField('ThousandSep'));
}
Index: branches/unlabeled/unlabeled-1.51.2/core/units/categories/categories_config.php
===================================================================
diff -u -r6135 -r6514
--- branches/unlabeled/unlabeled-1.51.2/core/units/categories/categories_config.php (.../categories_config.php) (revision 6135)
+++ branches/unlabeled/unlabeled-1.51.2/core/units/categories/categories_config.php (.../categories_config.php) (revision 6514)
@@ -41,8 +41,8 @@
'pending' => Array(
'icon' => 'icon16_cat_pending.gif',
'label' => 'la_tab_Categories',
- 'js_url' => "set_persistant_var('Category_View', 41, 'advanced_view', '#url#')",
- 'url' => Array('t' => 'advanced_view', 'index_file' => 'advanced_view.php', 'SetTab' => 'category', 'pass' => 'm'),
+ 'js_url' => '#url#',
+ 'url' => Array('t' => 'advanced_view', 'SetTab' => 'c', 'pass' => 'm,c.showall', 'c.showall_event' => 'OnSetFilterPattern', 'c.showall_filters' => 'show_active=0,show_pending=1,show_disabled=0,show_new=1,show_pick=1'),
'status' => STATUS_PENDING,
),
),
Index: branches/unlabeled/unlabeled-1.6.2/kernel/units/languages/languages_item.php
===================================================================
diff -u -r6449 -r6514
--- branches/unlabeled/unlabeled-1.6.2/kernel/units/languages/languages_item.php (.../languages_item.php) (revision 6449)
+++ branches/unlabeled/unlabeled-1.6.2/kernel/units/languages/languages_item.php (.../languages_item.php) (revision 6514)
@@ -31,6 +31,9 @@
*/
function formatNumber($number, $precision = null)
{
+ if (is_null($precision)) {
+ $precision = preg_match('/[\.,]+/', $number) ? strlen(preg_replace('/^.*[\.,]+/', '', $number)) : 0;
+ }
return number_format($number, $precision, $this->GetDBField('DecimalPoint'), $this->GetDBField('ThousandSep'));
}
Index: branches/unlabeled/unlabeled-1.28.2/core/admin_templates/js/catalog.js
===================================================================
diff -u -r6121 -r6514
--- branches/unlabeled/unlabeled-1.28.2/core/admin_templates/js/catalog.js (.../catalog.js) (revision 6121)
+++ branches/unlabeled/unlabeled-1.28.2/core/admin_templates/js/catalog.js (.../catalog.js) (revision 6514)
@@ -6,7 +6,7 @@
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');
this.PreviousPrefix = this.ActivePrefix;
@@ -49,13 +49,13 @@
Catalog.prototype.submit_kernel_form = function($tab_id) {
var $prefix = 'dummy';
var $result_div = '';
-
+
if (isset($tab_id)) {
// responce result + progress are required
$prefix = this.queryTabRegistry('tab_id', $tab_id, 'prefix');
$result_div = $tab_id + '_div';
}
-
+
var $kf = document.getElementById($form_name);
Request.params = Request.serializeForm($kf);
@@ -75,11 +75,12 @@
window.location.href = $match_redirect[1];
return false;
}
-
+
$params = $params.split(',');
-
-
+
+
var $js_end = $text.indexOf($object.Separator);
+// alert($text.substring(0, $js_end));
if ($js_end != -1) {
// allow to detect if output is permitted by ajax request parameters
var $request_visible = '$request_visible = ' + ($params[0].length ? 'true' : 'false') + "\n";
@@ -95,12 +96,12 @@
else if ($params[0].length) {
document.getElementById($params[0]).innerHTML = $text;
}
-
+
if (typeof($object.OnResponceMethod) == 'function') {
$object.OnResponceMethod($object);
$object.OnResponceMethod = null;
}
-
+
if (typeof($Debugger) != 'undefined') {
$Debugger.Clear();
}
@@ -115,7 +116,7 @@
if (typeof($OnResponceMethod) == 'function') {
this.OnResponceMethod = $OnResponceMethod;
}
-
+
var $prev_template = get_hidden_field('t');
if (!isset($prefix_special)) $prefix_special = this.getCurrentPrefix();
var $tab_id = this.queryTabRegistry('prefix', $prefix_special, 'tab_id');
@@ -165,7 +166,7 @@
this.setItemCount(this.TabRegistry[$i]['prefix'], '?');
$i++;
}
-
+
if ($reset_content) {
// set category for all tabs to -1 (forces reload next time)
$i = this.TabShift;
@@ -181,7 +182,7 @@
// active prefix is not registred -> cookie left, but not modules installed/enabled at the moment
return false;
}
-
+
if (!isset($prefix)) $prefix = this.ActivePrefix;
if (this.BusyRequest[$prefix]) {
@@ -204,7 +205,7 @@
this.ShowDependentButtons(this.ActivePrefix);
this.setViewMenu(this.ActivePrefix);
setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix);
-
+
this.refreshTab($prefix, $div_id, $force);
}
@@ -267,7 +268,7 @@
else {
alert('has form: ['+$tab_id + '_form'+']');
}*/
-
+
var $dep_buttons = this.queryTabRegistry('prefix', $prefix, 'dep_buttons');
var $i = 0;
while ($i < $dep_buttons.length) {
Index: branches/unlabeled/unlabeled-1.51.2/kernel/units/categories/categories_config.php
===================================================================
diff -u -r6135 -r6514
--- branches/unlabeled/unlabeled-1.51.2/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 6135)
+++ branches/unlabeled/unlabeled-1.51.2/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 6514)
@@ -41,8 +41,8 @@
'pending' => Array(
'icon' => 'icon16_cat_pending.gif',
'label' => 'la_tab_Categories',
- 'js_url' => "set_persistant_var('Category_View', 41, 'advanced_view', '#url#')",
- 'url' => Array('t' => 'advanced_view', 'index_file' => 'advanced_view.php', 'SetTab' => 'category', 'pass' => 'm'),
+ 'js_url' => '#url#',
+ 'url' => Array('t' => 'advanced_view', 'SetTab' => 'c', 'pass' => 'm,c.showall', 'c.showall_event' => 'OnSetFilterPattern', 'c.showall_filters' => 'show_active=0,show_pending=1,show_disabled=0,show_new=1,show_pick=1'),
'status' => STATUS_PENDING,
),
),
Index: branches/unlabeled/unlabeled-1.24.2/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r6116 -r6514
--- branches/unlabeled/unlabeled-1.24.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 6116)
+++ branches/unlabeled/unlabeled-1.24.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 6514)
@@ -22,25 +22,25 @@
var $is_catalog = true;
var $Catalog = new Catalog('', 'catalog_');
var a_toolbar = new ToolBar();
-
+
a_toolbar.AddButton( new ToolBarButton('upcat', '', function() {
$Catalog.go_to_cat($Catalog.ParentCategoryID);
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('homecat', '', function() {
$Catalog.go_to_cat(0);
}
- ) );
-
+ ) );
+
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
+
a_toolbar.AddButton( new ToolBarButton('new_cat', '', function() {
std_precreate_item('c', 'categories/categories_edit');
}
- ) );
-
-
+ ) );
+
+
a_toolbar.AddButton( new ToolBarButton('editcat', '', function() {
var $edit_url = '';
var $category_id = get_hidden_field('m_cat_id');
@@ -49,33 +49,33 @@
redirect($redirect_url);
}
) );
-
+
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('edit', '', edit) );
-
+
a_toolbar.AddButton( new ToolBarButton('delete', '',
function() {
var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template');
std_delete_items($Catalog.getCurrentPrefix(), $template, 1);
- } ) );
-
-
+ } ) );
+
+
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
+
a_toolbar.AddButton( new ToolBarButton('approve', '', function() {
$Catalog.submit_event(null, 'OnMassApprove');
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('decline', '', function() {
$Catalog.submit_event(null, 'OnMassDecline');
}
- ) );
-
+ ) );
+
a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
+
a_toolbar.AddButton( new ToolBarButton('export', '', function() {
var $export_prefixes = new Array('l', 'p');
if (in_array($Catalog.ActivePrefix, $export_prefixes)) {
@@ -86,65 +86,65 @@
}
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '', function() {
redirect('');
}
) );
-
+
a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('cut', '', function() {
$Catalog.submit_event(null, 'OnCut');
}
) );
-
+
a_toolbar.AddButton( new ToolBarButton('copy', '', function() {
$Catalog.submit_event(null, 'OnCopy');
}
) );
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('paste', '', function() {
- $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) {
+ $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) {
$object.resetTabs(true);
- $object.switchTab();
+ $object.switchTab();
} );
}
) );
-
+
/*a_toolbar.AddButton( new ToolBarButton('clear_clipboard', '', function() {
if (confirm('')) {
- $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
+ $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
$GridManager.CheckDependencies($object.ActivePrefix);
} );
}
}
) );*/
-
+
a_toolbar.AddButton( new ToolBarSeparator('sep5') );
-
+
a_toolbar.AddButton( new ToolBarButton('move_up', '', function() {
$Catalog.submit_event(null, 'OnMassMoveUp');
}
) );
-
-
+
+
a_toolbar.AddButton( new ToolBarButton('move_down', '', function() {
$Catalog.submit_event(null, 'OnMassMoveDown');
}
) );
-
+
a_toolbar.AddButton( new ToolBarSeparator('sep6') );
-
+
a_toolbar.AddButton( new ToolBarButton('view', '', function() {
show_viewmenu(a_toolbar, 'view');
}
) );
-
- a_toolbar.Render();
-
+
+ a_toolbar.Render();
+
function edit()
{
var $current_prefix = $Catalog.getCurrentPrefix();
@@ -189,7 +189,7 @@
|
-
+ |
|
@@ -218,10 +218,10 @@
- 
