Index: branches/RC/core/admin_templates/incs/style.css =================================================================== diff -u -N -r10885 -r10911 --- branches/RC/core/admin_templates/incs/style.css (.../style.css) (revision 10885) +++ branches/RC/core/admin_templates/incs/style.css (.../style.css) (revision 10911) @@ -14,9 +14,12 @@ } body { - font-family: Verdana, Arial, Helvetica, Sans-serif; + font-family: verdana,arial,helvetica,sans-serif; font-size: 12px; color: #000000; + overflow-x: auto; overflow-y: auto; + margin: 0px 0px 0px 0px; + text-decoration: none; /*scrollbar-3dlight-color: #333333; scrollbar-arrow-color: #ffffff; @@ -25,9 +28,6 @@ scrollbar-highlight-color: #009ffd; scrollbar-shadow-color: #009ffd; scrollbar-face-color: #009ffd;*/ - - height: 100%; - margin: 0px 8px; } A { Index: branches/RC/core/admin_templates/incs/menu_blocks.tpl =================================================================== diff -u -N -r10832 -r10911 --- branches/RC/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 10832) +++ branches/RC/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 10911) @@ -1,5 +1,5 @@ - - $Menus[''+'_sorting_menu'].addItem(rs('.sort.'), '','javascript:direct_sort_grid("","","", null, );',['img/menu_dot.gif']); + + $Menus[''+'_sorting_menu'].addItem(rs('.sort.'), '','javascript:direct_sort_grid("","","", null, );',['img/menu_dot.gif']); @@ -14,7 +14,7 @@ $Menus[''].addSeparator(); - + // define ViewMenu @@ -46,11 +46,11 @@ $Menus[''+'_sorting_menu'].applyBorder(false, false, false, false); $Menus[''+'_sorting_menu'].dropShadow("none"); $Menus[''+'_sorting_menu'].showIcon = true; - $Menus[''+'_sorting_menu'].addItem(rs('.sort.asc'), '','javascript:direct_sort_grid("","","asc",null,);',['img/menu_dot.gif']); - $Menus[''+'_sorting_menu'].addItem(rs('.sort.desc'), '','javascript:direct_sort_grid("","","desc",null,);',['img/menu_dot.gif']); + $Menus[''+'_sorting_menu'].addItem(rs('.sort.asc'), '','javascript:direct_sort_grid("","","asc",null,);',['img/menu_dot.gif']); + $Menus[''+'_sorting_menu'].addItem(rs('.sort.desc'), '','javascript:direct_sort_grid("","","desc",null,);',['img/menu_dot.gif']); $Menus[''+'_sorting_menu'].addSeparator(); $Menus[''+'_sorting_menu'].addItem(rs('.sort.def'), '','javascript:reset_sorting("");'); - + Index: branches/RC/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r10902 -r10911 --- branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 10902) +++ branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 10911) @@ -1610,7 +1610,7 @@ case 'from': return $object->RecordsCount ? $object->Offset+1 : 0; //0-based case 'to': - return min($object->Offset + $object->PerPage, $object->RecordsCount); + return $object->PerPage > 0 ? min($object->Offset + $object->PerPage, $object->RecordsCount) : $object->RecordsCount; case 'total_pages': return $object->GetTotalPages(); case 'needs_pagination': Index: branches/RC/core/admin_templates/js/grid_scroller.js =================================================================== diff -u -N -r10885 -r10911 --- branches/RC/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 10885) +++ branches/RC/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 10911) @@ -778,6 +778,11 @@ GridScroller.prototype.RefreshPos = function() { var dot = document.getElementById('my_measure_'+this.GridId); this.pos = findPos(dot); + + if (is.ie) { + // measure div is moved left for 1 pixel in IE during resize (nothing strange, it's IE) + this.pos[0] += 1; + } } GridScroller.prototype.Resize = function(w,h) Index: branches/RC/core/admin_templates/js/ajax.js =================================================================== diff -u -N -r10631 -r10911 --- branches/RC/core/admin_templates/js/ajax.js (.../ajax.js) (revision 10631) +++ branches/RC/core/admin_templates/js/ajax.js (.../ajax.js) (revision 10911) @@ -109,10 +109,12 @@ if (!document.getElementById(p_id + '_progress')) { document.body.appendChild(Request.getProgressObject(p_id)); } - else { + else if (document.getElementById(p_id).clientHeight > 0) { + // show progress, only when target div is visible var $progress_div = document.getElementById(p_id + '_progress'); $progress_div.style.top = getRealTop(p_id) + 'px'; - $progress_div.style.height = document.getElementById(p_id).clientHeight; + $progress_div.style.zIndex = 500; + $progress_div.style.height = document.getElementById(p_id).clientHeight + 'px'; $progress_div.style.display = 'block'; } // document.getElementById(p_id).innerHTML = Request.getProgressHtml(); @@ -151,8 +153,7 @@ $div.style.top = getRealTop($parent_div) + 'px'; $div.style.position = 'absolute'; - /*$div.style.border = '1px solid green'; - $div.style.backgroundColor = '#FF0000';*/ + $div.style.display = getRealTop($parent_div)/*document.getElementById($id).clientHeight*/ > 0 ? 'block' : 'none'; $div.innerHTML = '
'+Request.progressText+'
'+escape(Request.progressText)+'
'; return $div;