Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5 -r094d165248768ab19f66d75424a6a13ec968b829 --- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5) +++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 094d165248768ab19f66d75424a6a13ec968b829) @@ -64,10 +64,11 @@ } ); - } + } + // avoid name clash between bootstrap and jQuery UI + $.fn.bootstrapTooltip = $.fn.tooltip.noConflict(); - Index: lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp =================================================================== diff -u -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 -r094d165248768ab19f66d75424a6a13ec968b829 --- lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp (.../statisticpart.jsp) (revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02) +++ lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp (.../statisticpart.jsp) (revision 094d165248768ab19f66d75424a6a13ec968b829) @@ -5,6 +5,8 @@