Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import_step2.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import_step2.tpl (.../languages_import_step2.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import_step2.tpl (.../languages_import_step2.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/translator.tpl =================================================================== diff -u -r6848 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 6848) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 7027) @@ -41,7 +41,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl =================================================================== diff -u -r6918 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 6918) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 7027) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js =================================================================== diff -u -r7021 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 7021) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 7027) @@ -67,6 +67,8 @@ this.ScrollerW = 0; this.ScrollerH = 0; + + this.MinWidths = []; } GridScroller.prototype.Render = function(id) @@ -190,8 +192,8 @@ total += target; } this.MinDataWidth = total; - this.SetWidths('header_'+this.GridId, widths, total); - this.SetWidths('data_'+this.GridId, widths, total); + this.SetWidths('header_'+this.GridId, widths, 0, -1); + this.SetWidths('data_'+this.GridId, widths, 0, -1); if (this.LeftCells != 0) { this.SetHeights('left_header_'+this.GridId, this.GetHeights('header_'+this.GridId)); @@ -200,12 +202,15 @@ this.SetHeights('left_footer_'+this.GridId, this.GetHeights('footer_'+this.GridId)); } +// alert('setting left widths') + this.SetWidths('left_header_'+this.GridId, [10], 0, 1); + this.SetWidths('left_data_'+this.GridId, [10], 0, 1); } this.HeadTable.style.width = '100%' if (this.HasFooter()) { - this.SetRowWidths('footer_'+this.GridId, widths, total); + this.SetRowWidths('footer_'+this.GridId, widths); this.FooterTable.style.width = '100%' this.FooterHeight = this.FooterTable.offsetHeight; this.FooterOuter.style.height = this.FooterHeight + 'px' @@ -249,17 +254,44 @@ } } -GridScroller.prototype.SetRowWidths = function(table_id, widths, total, row) +GridScroller.prototype.SetRowWidths = function(table_id, widths, row, from, to) { if (!row) row = 0; table = document.getElementById(table_id); var inner_width = 0; - for (var col=0; col' + table.rows[row].cells[col].innerHTML + '' + final_width = widths[col]; + +// alert('col: '+col) + if ( this.MinWidths[col+min_offset] && (final_width < this.MinWidths[col+min_offset])) { +// alert('correcting minwidth of '+col+': '+this.MinWidths[col]+ ' / '+final_width) + final_width = this.MinWidths[col+min_offset] + } + table.rows[row].cells[col].innerHTML = '
' + table.rows[row].cells[col].innerHTML + '
' // alert('setting '+widths[col]+' for col '+col) - table.rows[row].cells[col].style.width = widths[col]+'px'; -// alert('set ('+col+')'+table.rows[0].cells[col].innerHTML+' to '+widths[col]) +// if (isNaN(final_width)) { +// alert('set '+table_id+'col '+col+' '+table.rows[0].cells[col].innerHTML+' to '+widths[col]) +// } + table.rows[row].cells[col].style.width = final_width+'px'; + +// alert('set ('+col+')'+table.rows[0].cells[col].innerHTML+' to '+widths[col]) } } @@ -276,12 +308,12 @@ // return heights; } -GridScroller.prototype.SetWidths = function(table_id, widths, total) +GridScroller.prototype.SetWidths = function(table_id, widths, from, to) { var table = document.getElementById(table_id); for (var row=0; row' - o += '' + header + '' + o += '' + header + '' o += '' + left_data + '' o += '' + data + '' @@ -524,7 +557,8 @@ var o = ''; var even = false; for (var row in this.Data) { - o += even ? '' : '' + var id = this.IDs[row] ? 'id="left_'+this.IDs[row]+'"' : ''; + o += even ? '' : '' even = !even; for (var col=0; col'+this.Data[row][col]+'' @@ -576,7 +610,8 @@ var o = ''; var even = false; for (var row in this.Data) { - o += even ? '' : '' + var id = this.IDs[row] ? 'id="'+this.IDs[row]+'"' : ''; + o += even ? '' : '' even = !even; for (var col=this.LeftCells; col'+this.Data[row][col]+'' Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_email.tpl =================================================================== diff -u -r7025 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 7025) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks2.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks2.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks2.tpl (revision 7027) @@ -0,0 +1,435 @@ + + + + + + ', , )" class="nav_url"> + + + + ', , )" class="nav_url">> + + + + ', , )" class="nav_url">< + + + + ', , )" class="nav_url">>> + + + + ', , )" class="nav_url"><< + + + + + : + + + + +tableborder_full_kernelpagination_bar"> + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + +
:  + _search_keyword" + name="_search_keyword" + value="" + PrefixSpecial="" + Grid="" + ajax="" + style="border: 1px solid grey;"> + + ]"> + +
+ + + + + document.getElementById('_search_keyword').onkeydown = search_keydown; + Toolbars['_search'] = new ToolBar('icon16_'); + Toolbars['_search'].AddButton( + new ToolBarButton( + 'search', + '', + function() { search('','', ) }, + null, + '') ); + Toolbars['_search'].AddButton( + new ToolBarButton( + 'search_reset', + '', + function() { search_reset('','', ) }, + null, + '') ); + Toolbars['_search'].Render(document.getElementById('search_buttons[]')); + + + + + ','', );" class="columntitle_small">.gif" border="0" align="absmiddle"> + + + + + + + + + + + + + + + + + +
" id="">">
+ + + + + + + + + + +
" id="">
+ + + + + + + + + + + +
" id="">">
+ + + + + + + + + + +
">
+ + + + + + + + + + + +
" id="">">
+ + + + + "> + + + + " name="" value=""> + + + + + + + + + error"> + + *:
+ + ,-cdata', '-cdata:cust_', 'popups/translator', , 1);" title=""> + + ,-cdata', '-cdata:cust_', 'popups/translator', );" title=""> + + + + + + + + + + + + + +
class="filter" name="" value=""/>
+ + + class="filter" name="" value=""/> + + + : class="filter" name="" value="" size="5" />
+ : class="filter" name="" value="" size="5" />
+ + + class="filter" name="" value="" size="5" />
+ class="filter" name="" value="" size="5" />
+ + + + class="filter" name="" id="" value="" size="15" datepickerIcon="img/calendar_icon.gif"/>
+ class="filter" name="" id="" value="" size="15" datepickerIcon="img/calendar_icon.gif"/>
+ + + $Menus[''+'_sorting_menu'].addMenuItem('','direct_sort_grid("","","", null, );','2'); + + + + $Menus[''+'_filter_menu'].addMenuItem('','',''); + + + + $Menus[''+'_filter_menu'].addMenuSeparator(); + + + + + + nobottomnotop"> + + + +
+ +
+ + + + + + + + + + + +
+ : ( - ) + + + + +
+ + + + + + + nobottomnotop"> + + + +
+ +
+ + + + ','', );" + class="columntitle_small">.gif" border="0" align="absmiddle"> + + + + + + " id=""> + + + + + + + + + '', + + + + '', + + + + '', + + + + + + + + + + + + + + + + + + + + + _Sort1" name="_Sort1" value=""> + _Sort1_Dir" name="_Sort1_Dir" value="asc"> + + + + + Grids[''] = new Grid('', '', ':original', edit, a_toolbar); + Grids[''].AddItemsByIdMask('', /^_([\d\w-]+)/, '[$$ID$$][]'); + Grids[''].InitItems(); + + + + + $ViewMenus = new Array(''); + + + + + + nobottomnotop"> + + + +
+ +
+ + + + +
+ + + %">  + + + + + +
+ + + + + + + + + + + + + + + + + + _Sort1" name="_Sort1" value=""> + _Sort1_Dir" name="_Sort1_Dir" value="asc"> + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid.js =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid.js (.../grid.js) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid.js (.../grid.js) (revision 7027) @@ -62,6 +62,14 @@ else this.class_off = class_off; this.HTMLelement = an_element; + + if (document.getElementById('left_'+an_element.id)) { + this.LeftElement = document.getElementById('left_'+an_element.id); + } + else { + this.LeftElement = false; + } + this.CheckBox = cb; this.value = this.ItemId; @@ -77,6 +85,15 @@ this.HTMLelement.ondblclick = function(ev) { this.GridItem.DblClick(ev); } + if ( this.LeftElement ) { + this.LeftElement.GridItem = this; + this.LeftElement.onclick = function(ev) { + this.GridItem.Click(ev); + }; + this.LeftElement.ondblclick = function(ev) { + this.GridItem.DblClick(ev); + } + } if ( isset(this.CheckBox) ) { this.CheckBox.GridItem = this; this.CheckBox.onclick = function(ev) { @@ -96,6 +113,14 @@ this.HTMLelement.ondblclick = function(ev) { return false; } + if ( this.LeftElement ) { + this.LeftElement.onclick = function(ev) { + return false; + }; + this.LeftElement.ondblclick = function(ev) { + return false; + } + } if ( isset(this.CheckBox) ) { this.CheckBox.onclick = function(ev) { return false; @@ -108,6 +133,9 @@ if (this.selected) return; this.selected = true; this.HTMLelement.className = this.class_on; + if ( this.LeftElement ) { + this.LeftElement.className = this.class_on; + } if ( isset(this.CheckBox) ) { this.CheckBox.checked = true; } @@ -126,6 +154,9 @@ if ( !this.selected && !force) return; this.selected = false; this.HTMLelement.className = this.class_off; + if ( this.LeftElement ) { + this.LeftElement.className = this.class_off; + } if ( isset(this.CheckBox) ) { this.CheckBox.checked = false; } Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -r7010 -r7027 --- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7010) +++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7027) @@ -14,15 +14,15 @@ - img/logo_bg.gif) no-repeat top right;"> - img/logo_bg.gif) no-repeat top right; height: 65px;"> +
+
img/icons/.gif" align="absmiddle" title=""> 
- +
@@ -39,6 +39,9 @@ + + +
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/email_messages_edit.tpl =================================================================== diff -u -r6932 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 6932) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 7027) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl =================================================================== diff -u -r6786 -r7027 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 6786) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export_step2.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export_step2.tpl (.../languages_export_step2.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export_step2.tpl (.../languages_export_step2.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl =================================================================== diff -u -r6912 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 6912) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl =================================================================== diff -u -r6935 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl (.../column_picker.tpl) (revision 6935) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl (.../column_picker.tpl) (revision 7027) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r7018 -r7027 --- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7018) +++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7027) @@ -145,12 +145,12 @@ $block_params['field'] = $field; $block_params['sort_field'] = isset($options['sort_field']) ? $options['sort_field'] : $field; $block_params['filter_field'] = isset($options['filter_field']) ? $options['filter_field'] : $field; - + $field_options = $this->Application->getUnitOption($this->Prefix.'.'.$field, 'Fields'); if (isset($field_options['use_phrases'])) { $block_params['use_phrases'] = $field_options['use_phrases']; } - + $block_params['is_last'] = ($i == count($grid_config)); $block_params = array_merge($std_params, $block_params, $options); $o.= $this->Application->ParseBlock($block_params, 1); @@ -1214,7 +1214,7 @@ unset($params[$tp_name]); } } - + $tag_params = Array(); foreach($prefixes as $prefix_special) { @@ -1291,6 +1291,22 @@ } } + function GridInfo($params) { + $object =& $this->getObject($params); + /* @var $object kDBList */ + switch ($params['type']) + { + case 'filtered': + return $object->RecordsCount; + case 'total': + return $object->NoFilterCount; + case 'from': + return $object->Offset+1; //0-based + case 'to': + return min($object->Offset + $object->PerPage, $object->RecordsCount); + } + } + /** * Parses block depending on its element type. * For radio and select elements values are taken from 'value_list_field' in key1=value1,key2=value2 Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import.tpl (.../languages_import.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import.tpl (.../languages_import.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl =================================================================== diff -u -r6734 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 7027) @@ -1,7 +1,7 @@ - + Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js =================================================================== diff -u -r7014 -r7027 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7014) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7027) @@ -4,6 +4,14 @@ this.CheckTitleModule(); this.Alt = RemoveTranslationLink(alt || ''); + if (this.Alt.match(/(.*)::(.*)/)) { + this.Alt = RegExp.$1; + this.Label = RegExp.$2 + } + else { + this.Label = this.Alt; + } + if (typeof(onclick) == 'function') { this.onClick = onclick; } @@ -47,17 +55,24 @@ } ToolBarButton.prototype.GetHTML = function() { - return ''; + var o = '
' + o += ''; + o += '
'+this.Label; + o += '
' + return o; } -ToolBarButton.prototype.GetToolID = function() { - return this.Prefix == '' ? 'tool_' + this.Title : 'tool_['+this.Prefix+'][' + this.Title+']' +ToolBarButton.prototype.GetToolID = function(item) { + if (!item) item = 'tool' + return this.Prefix == '' ? item+'_' + this.Title : item+'_['+this.Prefix+'][' + this.Title+']' } ToolBarButton.prototype.Init = function() { img = document.getElementById(this.GetToolID()); this.imgObject = img; + this.Container = document.getElementById(this.GetToolID('div')) ? document.getElementById(this.GetToolID('div')) : false; + this.Container.btn = this; img.btn = this; this.SetOnMouseOver(); this.SetOnMouseOut(); @@ -66,24 +81,24 @@ } ToolBarButton.prototype.SetOnMouseOver = function() { - this.imgObject.onmouseover = function() { - this.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '_f2.gif'; + this.Container.onmouseover = function() { + this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '_f2.gif'; }; } ToolBarButton.prototype.SetOnMouseOut = function() { - this.imgObject.onmouseout = function() { - this.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif'; + this.Container.onmouseout = function() { + this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif'; }; } ToolBarButton.prototype.SetOnClick = function() { - this.imgObject.onmouseout = function() { - this.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif'; + this.Container.onmouseout = function() { + this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif'; }; - this.imgObject.inClick = false; + this.Container.inClick = false; if (typeof(this.onClick) != 'function') { - this.imgObject.onclick = function() { + this.Container.onclick = function() { if (this.inClick) return; this.inClick = true; if (eval('typeof('+this.btn.Title+')') == 'function') @@ -92,7 +107,7 @@ } } else { - this.imgObject.onclick = function() { + this.Container.onclick = function() { if (this.inClick) return; this.inClick = true; this.btn.onClick(); @@ -103,7 +118,7 @@ // the following lines are correct, as long as mozilla understands 'pointer', but IE 'hand', // do not change the order of these lines! if (is.ie6up || is.gecko) { - this.imgObject.style.cursor = 'pointer'; + this.Container.style.cursor = 'pointer'; } else { // somehow set cursor hand for IE 5/ 5.5 @@ -114,10 +129,10 @@ ToolBarButton.prototype.Disable = function() { if ( !this.Enabled ) return; this.imgObject.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '_f3.gif'; - this.imgObject.onmouseover = null; - this.imgObject.onmouseout = null; - this.imgObject.onclick = null; - this.imgObject.style.cursor = 'default'; + this.Container.onmouseover = null; + this.Container.onmouseout = null; + this.Container.onclick = null; + this.Container.style.cursor = 'default'; this.Enabled = false; } @@ -131,12 +146,12 @@ } ToolBarButton.prototype.Hide = function() { - this.imgObject.style.display = 'none'; + this.Container.style.display = 'none'; this.Hidden = true; } ToolBarButton.prototype.Show = function() { - this.imgObject.style.display = ''; + this.Container.style.display = ''; this.Hidden = false; } @@ -149,7 +164,7 @@ ToolBarSeparator.prototype = new ToolBarButton; ToolBarSeparator.prototype.GetHTML = function() { - return ''; + return '
'; } ToolBarSeparator.prototype.Init = function() { Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl =================================================================== diff -u -r6935 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 6935) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 7027) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl =================================================================== diff -u -r6918 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl (.../root_edit_password.tpl) (revision 6918) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl (.../root_edit_password.tpl) (revision 7027) @@ -3,7 +3,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl =================================================================== diff -u -r6935 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 6935) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 7027) @@ -2,7 +2,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl =================================================================== diff -u -r6935 -r7027 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl (.../phrases_edit.tpl) (revision 6935) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl (.../phrases_edit.tpl) (revision 7027) @@ -2,7 +2,7 @@ - +