Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp =================================================================== diff -u -r18723aa5eb1e383e6a2932c42a509c29ed88c18c -r8652b5ecbab0c7546c20a032d03371b4a9c91a0f --- lams_tool_scratchie/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 18723aa5eb1e383e6a2932c42a509c29ed88c18c) +++ lams_tool_scratchie/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 8652b5ecbab0c7546c20a032d03371b4a9c91a0f) @@ -68,9 +68,9 @@ // end optional tab controller stuff selectTab(tabId); } - $(document).ready(function(){ - $('[data-toggle="tooltip"]').tooltip(); - }); + + // avoid name clash between bootstrap and jQuery UI + $.fn.bootstrapTooltip = $.fn.tooltip.noConflict(); Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp =================================================================== diff -u -r18723aa5eb1e383e6a2932c42a509c29ed88c18c -r8652b5ecbab0c7546c20a032d03371b4a9c91a0f --- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision 18723aa5eb1e383e6a2932c42a509c29ed88c18c) +++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision 8652b5ecbab0c7546c20a032d03371b4a9c91a0f) @@ -38,6 +38,10 @@ if (qbMessage) { alert(qbMessage); } + + $(document).ready(function(){ + $('[data-toggle="tooltip"]').bootstrapTooltip(); + });