[webdoc] make the tooltip its own plugin

6 files changed, 31 insertions, 21 deletions

diff --git a/webdoc/Makefile.am b/webdoc/Makefile.am
index b2676f74..314cd416 100644
--- a/webdoc/Makefile.am
+++ b/webdoc/Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST = \
 	$(wildcard plugins/iframe-plugin/*.js) \
         $(wildcard plugins/iframe-plugin/*.css) \
         $(wildcard plugins/iframe-plugin/*.html) \
+	$(wildcard plugins/tooltip-plugin/*.js) \
 	$(wildcard plugins/sidebar-plugin/*.js) \
         $(wildcard plugins/sidebar-plugin/*.css) \
 	$(wildcard plugins/sidebar-plugin/dependencies/ptree/*.css) \
@@ -59,6 +60,7 @@ dist-hook:
 	mkdir -p $(distdir)/views/images
 	mkdir -p $(distdir)/skins/mono-external/images
 	mkdir -p $(distdir)/plugins/iframe-plugin
+        mkdir -p $(distdir)/plugins/tooltip-plugin
 	mkdir -p $(distdir)/plugins/sidebar-plugin/dependencies/ptree
 	mkdir -p $(distdir)/plugins/sidebar-plugin/dependencies/xtree/images/msdn
 	mkdir -p $(distdir)/plugins/sidebar-plugin/dependencies/xtree/images/msdn2
@@ -83,6 +85,7 @@ dist-hook:
         cp $(srcdir)/plugins/iframe-plugins/*css                                  $(distdir)/plugins/iframe-plugin
         cp $(srcdir)/plugins/iframe-plugin/*js                                    $(distdir)/plugins/iframe-plugin
         cp $(srcdir)/plugins/iframe-plugin/*html                                  $(distdir)/plugins/iframe-plugin
+        cp $(srcdir)/plugins/tooltip-plugin/*js                                    $(distdir)/plugins/tooltip-plugin
 	cp $(srcdir)/plugins/sidebar-plugin/*css                                  $(distdir)/plugins/sidebar-plugin
         cp $(srcdir)/plugins/sidebar-plugin/*js                                   $(distdir)/plugins/sidebar-plugin	
         cp $(srcdir)/plugins/sidebar-plugin/dependencies/ptree/*css               $(distdir)/plugins/sidebar-plugin/dependencies/ptree	
@@ -108,6 +111,7 @@ install-data-hook:
 	-$(mkinstalldirs) $(DESTDIR)$(webdir)/views/images
 	-$(mkinstalldirs) $(DESTDIR)$(webdir)/skins/mono-external/images
 	-$(mkinstalldirs) $(DESTDIR)$(webdir)/plugins/iframe-plugin
+        -$(mkinstalldirs) $(DESTDIR)$(webdir)/plugins/tooltip-plugin
 	-$(mkinstalldirs) $(DESTDIR)$(webdir)/plugins/sidebar-plugin/dependencies/ptree
 	-$(mkinstalldirs) $(DESTDIR)$(webdir)/plugins/sidebar-plugin/dependencies/xtree/images/msdn
 	-$(mkinstalldirs) $(DESTDIR)$(webdir)/plugins/sidebar-plugin/dependencies/xtree/images/msdn2
@@ -131,6 +135,7 @@ install-data-hook:
          $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugins/*css                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
          $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/iframe-plugin
          $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*html                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
+         $(INSTALL_DATA) $(srcdir)/plugins/tooltip-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/tooltip-plugin
          $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*css                                  $(DESTDIR)$(webdir)/plugins/sidebar-plugin
          $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*js                                   $(DESTDIR)$(webdir)/plugins/sidebar-plugin
          $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/dependencies/ptree/*css               $(DESTDIR)$(webdir)/plugins/sidebar-plugin/dependencies/ptree
diff --git a/webdoc/index.aspx b/webdoc/index.aspx
index a5125054..772c6bb8 100644
--- a/webdoc/index.aspx
+++ b/webdoc/index.aspx
@@ -36,21 +36,21 @@ string nQueryString=monodocUrl+"?";
     
 <asp:Content ID="CustomTree" ContentPlaceHolderID="CustomTreeGenerator" Runat="Server">
 <script type="text/javascript">
-        //create a container for the sidebar to sit in
-        var container = $("#sidebar_container");
-        container.append("<div id=\"side\"><div id=\"contents\" class=\"activeTab\"><div id=\"contentList\"></div></div></div>");
+		//create a container for the sidebar to sit in
+        	var container = $("#sidebar_container");
+        	container.append("<div id=\"side\"><div id=\"contents\" class=\"activeTab\"><div id=\"contentList\"></div></div></div>");
 
-        //populate the sidebar with our data
-        var tree = new PTree ();
-        tree.strSrcBase = 'monodoc.ashx?tree=';
-        tree.strActionBase = '?link=';
-        tree.strImagesBase = 'plugins/sidebar-plugin/dependencies/xtree/images/msdn2/';
-        tree.strImageExt = '.gif';
-        tree.onClickCallback = function (url) { change_page (url); };
-        var content = document.getElementById ('contentList');
-        var root = tree.CreateItem (null, '', 'root:', '', true);
-        content.appendChild (root);
-<% = Global.CreateTreeBootFragment () %>
+        	//populate the sidebar with our data
+        	var tree = new PTree ();
+        	tree.strSrcBase = 'monodoc.ashx?tree=';
+        	tree.strActionBase = '?link=';
+        	tree.strImagesBase = 'plugins/sidebar-plugin/dependencies/xtree/images/msdn2/';
+        	tree.strImageExt = '.gif';
+        	tree.onClickCallback = function (url) { change_page (url); };
+        	var content = document.getElementById ('contentList');
+        	var root = tree.CreateItem (null, '', 'root:', '', true);
+        	content.appendChild (root);
+		<% = Global.CreateTreeBootFragment () %>
 </script>
 </asp:Content>
 
diff --git a/webdoc/plugins.def b/webdoc/plugins.def
index 2bff8003..f4c60a1c 100644
--- a/webdoc/plugins.def
+++ b/webdoc/plugins.def
@@ -1,10 +1,13 @@
 #####SKIN (pick ONE)#####
-skins/xamarin-external
+<<<<<<< HEAD
+#skins/xamarin-external
 #skins/mono-external
 #skins/xamarin-new
+skins/mono-external
 
 ######PLUGINS######
 plugins/search-plugin/fastsearch
 plugins/search-plugin/fullsearch
 plugins/iframe-plugin
 plugins/sidebar-plugin
+#plugins/tooltip-plugin
diff --git a/webdoc/plugins/sidebar-plugin/dependencies/ptree/tree.js b/webdoc/plugins/sidebar-plugin/dependencies/ptree/tree.js
index 3ee03efc..389be0dd 100755
--- a/webdoc/plugins/sidebar-plugin/dependencies/ptree/tree.js
+++ b/webdoc/plugins/sidebar-plugin/dependencies/ptree/tree.js
@@ -25,10 +25,12 @@ function PTree ()
 
 
 	this.Tooltip = function() {
-                $('.tree-label').tooltip({
-                        selector: 'a[rel=tooltip]',
-                        placement: 'right'
-                });
+		if($.isFunction(window.tooltip)) {
+			$('.tree-label').tooltip({
+                        	selector: 'a[rel=tooltip]',
+                        	placement: 'right'
+                	});
+		}
         }
 
 	this.CreateItemFromXML = function (oNode, fLast, eltParent)
diff --git a/webdoc/plugins/sidebar-plugin/make-tree.js b/webdoc/plugins/sidebar-plugin/make-tree.js
index 27b42db8..47ce72a3 100644
--- a/webdoc/plugins/sidebar-plugin/make-tree.js
+++ b/webdoc/plugins/sidebar-plugin/make-tree.js
@@ -1,4 +1,4 @@
-$(function() {
+$(document).ready(function() {
 	var content_frame = $('#content_frame');
 	var page_link = $('#pageLink');
 
@@ -32,4 +32,4 @@ $(function() {
 
 	content_frame.load (update_tree);
 	content_frame.load (add_native_browser_link);
-})
+});
diff --git a/webdoc/plugins/sidebar-plugin/dependencies/ptree/bootstrap.tooltip.js b/webdoc/plugins/tooltip-plugin/bootstrap.tooltip.js
index 3c2d4de9..3c2d4de9 100644
--- a/webdoc/plugins/sidebar-plugin/dependencies/ptree/bootstrap.tooltip.js
+++ b/webdoc/plugins/tooltip-plugin/bootstrap.tooltip.js