Changes from updating jQuery & jQuery UI to latest versions

This commit is contained in:
Nathan Gray 2013-07-18 15:26:41 +00:00
parent ba0fd9fa22
commit 14ebff54c9
2 changed files with 3 additions and 1 deletions

View File

@ -39,7 +39,7 @@ class etemplate_et2_widgets
// Include the jQuery-UI CSS - many more complex widgets use it // Include the jQuery-UI CSS - many more complex widgets use it
$theme = 'redmond'; $theme = 'redmond';
egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.8.21.custom.css"); egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.10.3.custom.css");
egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css'); egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');

View File

@ -303,6 +303,7 @@ var et2_dataview = Class.extend({
// right (collapsed) border of the row differently // right (collapsed) border of the row differently
var subBorder = 0; var subBorder = 0;
var subHBorder = 0; var subHBorder = 0;
/*
if ($j.browser.mozilla) if ($j.browser.mozilla)
{ {
var maj = $j.browser.version.split(".")[0]; var maj = $j.browser.version.split(".")[0];
@ -322,6 +323,7 @@ var et2_dataview = Class.extend({
{ {
subBorder = -1; subBorder = -1;
} }
*/
// Make the last columns one pixel smaller, to prevent a horizontal // Make the last columns one pixel smaller, to prevent a horizontal
// scrollbar from showing up // scrollbar from showing up