*** empty log message ***

13 files changed, 28 insertions, 16 deletions

diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile
index 0fc970d4528..12a6d0cc2dc 100644
--- a/cpp/doc/Makefile
+++ b/cpp/doc/Makefile
@@ -22,9 +22,15 @@ SLICEFILES	= $(wildcard ../slice/Ice/*.ice) \
 
 include $(top_srcdir)/config/Make.rules
 
+IMAGES		= images
+JAVASCRIPT	= symboltree.js
+
 reference/index.html: $(SLICEFILES)
-	rm -rf reference
-	slice2html --ice -I../slice --hdr=htmlHeader --output-dir=reference --index=3 --summary=120 $(SLICEFILES)
+	make clean
+	slice2html --ice -I../slice --hdr=htmlHeader --indexhdr=indexHeader --indexftr=indexFooter --output-dir=reference --index=3 --summary=120 $(SLICEFILES)
+	mkdir reference/$(IMAGES)
+	cp $(IMAGES)/*.gif reference/$(IMAGES)
+	cp $(JAVASCRIPT) reference
 
 clean::
 	rm -rf reference
@@ -40,11 +46,11 @@ install::
 	    echo "Installing HTML..." ; \
 	    $(call installdata,README.html,$(install_docdir)) ; \
 	    $(call installdata,reference/*.html,$(install_docdir)/reference) ; \
-	    if test ! -d $(install_docdir)/reference/stylesheet-images ; \
+	    if test ! -d $(install_docdir)/reference/$(IMAGES) ; \
 	    then \
-		echo "Creating $(install_docdir)/reference/stylesheet-images..." ; \
-		$(call mkdir,$(install_docdir)/reference/stylesheet-images) ; \
+		echo "Creating $(install_docdir)/reference/$(IMAGES)... ; \
+		$(call mkdir,$(install_docdir)/reference/$(IMAGES)) ; \
 	    fi ; \
 	    echo "Installing images..." ; \
-	    $(call installdata,images/*.gif,$(install_docdir)/reference/stylesheet-images) ; \
+	    $(call installdata,$(IMAGES)/*.gif,$(install_docdir)/reference/$(IMAGES)) ; \
 	fi
diff --git a/cpp/doc/images/closed.gif b/cpp/doc/images/closed.gif
new file mode 100644
index 00000000000..c8abc54667b
--- /dev/null
+++ b/cpp/doc/images/closed.gif
diff --git a/cpp/doc/images/collapseAll.gif b/cpp/doc/images/collapseAll.gif
new file mode 100644
index 00000000000..2bb131d5922
--- /dev/null
+++ b/cpp/doc/images/collapseAll.gif
diff --git a/cpp/doc/images/expandAll.gif b/cpp/doc/images/expandAll.gif
new file mode 100644
index 00000000000..4e6fdbfdd72
--- /dev/null
+++ b/cpp/doc/images/expandAll.gif
diff --git a/cpp/doc/images/opened.gif b/cpp/doc/images/opened.gif
new file mode 100644
index 00000000000..5201b3678e7
--- /dev/null
+++ b/cpp/doc/images/opened.gif
diff --git a/cpp/doc/images/toc-blank.gif b/cpp/doc/images/toc-blank.gif
deleted file mode 100644
index 6c65e3a194c..00000000000
--- a/cpp/doc/images/toc-blank.gif
+++ /dev/null
diff --git a/cpp/doc/images/toc-minus.gif b/cpp/doc/images/toc-minus.gif
deleted file mode 100644
index 40ebe61e46a..00000000000
--- a/cpp/doc/images/toc-minus.gif
+++ /dev/null
diff --git a/cpp/doc/images/toc-plus.gif b/cpp/doc/images/toc-plus.gif
deleted file mode 100644
index 3e9e7d55a3d..00000000000
--- a/cpp/doc/images/toc-plus.gif
+++ /dev/null
diff --git a/cpp/doc/indexFooter b/cpp/doc/indexFooter
new file mode 100644
index 00000000000..9c917d0c9dc
--- /dev/null
+++ b/cpp/doc/indexFooter
@@ -0,0 +1,4 @@
+	<script type="text/javascript" src="symboltree.js">
+	    symboltree.main();
+	</script>
+    </body>
diff --git a/cpp/doc/indexHeader b/cpp/doc/indexHeader
index 752e0e4da4d..92f0666cae2 100644
--- a/cpp/doc/indexHeader
+++ b/cpp/doc/indexHeader
@@ -32,7 +32,10 @@ TITLE
 	    }
 	    .ExpandCollapseButtons {
 	    }
-	    .ECButton {
+	    #ExpandAllButton {
+		cursor: pointer;
+	    }
+	    #CollapseAllButton {
 		cursor: pointer;
 	    }
 	</style>
diff --git a/cpp/doc/symboltree.js b/cpp/doc/symboltree.js
index 0659456d4b8..e6d773d9579 100644
--- a/cpp/doc/symboltree.js
+++ b/cpp/doc/symboltree.js
@@ -85,7 +85,7 @@ symboltree.main = function()
     }
 
     //
-    // Save expanded list indexes in cookie on page unload.
+    // Save expanded list indexes in cookie when page unloads.
     //
     window.addEventListener('unload', symboltree.save, false);
 
@@ -95,7 +95,7 @@ symboltree.main = function()
     symboltree.restore();
 
     //
-    // Set image and handler for the "expand all" and "collapse" all buttons.
+    // Set handler for the "Expand All" and "Collapse All" buttons.
     //
     var expandAll = document.getElementById('ExpandAllButton');
     expandAll.addEventListener('click', symboltree.expandAll, false);
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 716ff89de6a..f6c477687ed 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -1363,12 +1363,12 @@ TOCGenerator::TOCGenerator(const Files& files, const string& header, const strin
 
     start("td");
     _out << "<button type=\"button\" id=\"ExpandAllButton\">Expand All"
-	 << "<img class=\"ExpandAllButtonImage\"/></button>";
+	 << "<img id=\"ExpandAllButtonImage\"/></button>";
     end();
 
     start("td");
     _out << "<button type=\"button\" id=\"CollapseAllButton\">Collapse All"
-	 << "<img class=\"ExpandAllButtonImage\"/></button>";
+	 << "<img id=\"ExpandAllButtonImage\"/></button>";
     end();
 
     end();
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 00adcdf6460..36b0f96c0e8 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -47,7 +47,8 @@ protected:
     void printMetaData(const ContainedPtr&);
     void printSummary(const ContainedPtr&, const ContainerPtr&, bool);
 
-    ::std::string toString(const SyntaxTreeBasePtr&, const ContainerPtr&, bool = true, bool = false, unsigned* = 0);
+    ::std::string toString(const SyntaxTreeBasePtr&, const ContainerPtr&, bool = true, bool = false, unsigned* = 0,
+	                   bool = false);
     ::std::string toString(const ::std::string&, const ContainerPtr&, bool = true, bool = false, unsigned* = 0);
     ::std::string getComment(const ContainedPtr&, const ContainerPtr&, bool, bool = false);
 
@@ -65,7 +66,7 @@ private:
 
     static ::std::string containedToId(const ContainedPtr&, bool);
     static StringList getTagged(const ::std::string&, ::std::string&);
-    static ::std::string getScopedMinimized(const ContainedPtr&, const ContainerPtr&);
+    static ::std::string getScopedMinimized(const ContainedPtr&, const ContainerPtr&, bool = false);
     static StringList getContained(const SyntaxTreeBasePtr&);
     static StringList getContainer(const SyntaxTreeBasePtr&);
     static StringList toStringList(const ContainedPtr&);
@@ -75,15 +76,13 @@ private:
     static void getHeaders(const ::std::string&, ::std::string&, ::std::string&);
     static ::std::string getFooter(const ::std::string&);
 
+    ::std::string _indexFooter;
     const Files& _files;
 
     static ::std::string _dir;
     static ::std::string _header1;
     static ::std::string _header2;
     static ::std::string _footer;
-    static ::std::string _indexHeader1;
-    static ::std::string _indexHeader2;
-    static ::std::string _indexFooter;
 };
 
 class StartPageGenerator : private GeneratorBase