* doc/Makefile.am, * doc/header.html, * doc/mainpage.dox: Fix paths and disable the use of installdox (deprecated) * doc/doxygen.css, * doc/footer.html: Fix footer. --- ChangeLog | 12 ++++++++++++ doc/Makefile.am | 8 ++------ doc/doxygen.css | 5 +++++ doc/footer.html | 3 ++- doc/header.html | 2 +- doc/mainpage.dox | 10 ++++------ 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5593360..e4ae60d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-02-28 Guillaume Lazzara <z@lrde.epita.fr> + + Fix links and location of documentation. + + * doc/Makefile.am, + * doc/header.html, + * doc/mainpage.dox: Fix paths and disable the use of installdox + (deprecated) + + * doc/doxygen.css, + * doc/footer.html: Fix footer. + 2012-01-30 Guillaume Lazzara <z@lrde.epita.fr> * build-aux/texi2dvi: Fix Dash incompatibility. diff --git a/doc/Makefile.am b/doc/Makefile.am index f5ff45d..2c9e81b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -118,6 +118,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(MAKE) $(AM_MAKE_FLAGS) $(DOXYFILE_USER) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) +## Fix path to the main page of the documentation. + sed -i -e "s,\@relcommondocpath\@,,g" $(USER_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -204,12 +206,6 @@ install-data-local: # # rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) -# Update paths to milena documentation directory - $(DESTDIR)$(htmldir)/$(USER_REFMAN)/installdox \ - -l milena.tag@$(DESTDIR)$(htmldir)/$(USER_REFMAN)/milena \ - `find $(DESTDIR)$(htmldir)/$(USER_REFMAN)/ -name '*.html'` \ - -l scribo.tag@$(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo \ - `find $(DESTDIR)$(htmldir)/$(USER_REFMAN)/ -name '*.html'` ## Try GNU chmod's X mode before resorting to something slower but ## more standard. chmod -R a+rX $(DESTDIR)$(htmldir) || \ diff --git a/doc/doxygen.css b/doc/doxygen.css index bed4d81..83f13a4 100644 --- a/doc/doxygen.css +++ b/doc/doxygen.css @@ -861,3 +861,8 @@ table.itable td font-size: 17px; vertical-align: top; } + +address.div +{ + font-size: 10px; +} \ No newline at end of file diff --git a/doc/footer.html b/doc/footer.html index d0e98ec..e09f03e 100644 --- a/doc/footer.html +++ b/doc/footer.html @@ -1,5 +1,6 @@ <hr class="footer"/><address class="footer"><small> -<span style="position:absolute;text-align:left;">Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE)</span><span align='right'>Olena 2.0</span> +<div style="position:absolute;text-align:left;">Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE)</div> +<div align='right'>Olena 2.0</div> </small></address> </body> </html> diff --git a/doc/header.html b/doc/header.html index a94502d..6c5cf96 100644 --- a/doc/header.html +++ b/doc/header.html @@ -17,7 +17,7 @@ $mathjax <tbody> <tr style="height: 56px;"> <!--BEGIN PROJECT_LOGO--> - <td id="projectlogo"><a href="$relpath$index.html"><img alt="Logo" src="$relpath$$projectlogo"></a></td> + <td id="projectlogo"><a href="@relcommondocpath@$relpath$index.html"><img alt="Logo" src="$relpath$$projectlogo"></a></td> <!--END PROJECT_LOGO--> <!--BEGIN PROJECT_NAME--> <td style="padding-left: 0.5em;"> diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 0f682c7..e293b4c 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -1,10 +1,9 @@ -/** \mainpage Documentation of Olena +/** \mainpage Olena Reference Documentation + <center> - <h1>Olena Reference Documentation</h1> <table class="doxtable itable"> - <tr> <th>General Presentation</th> <th>Modules</th> @@ -20,8 +19,8 @@ </td> <td> \li \ref moduleslist - \li <a class="el" doxygen="milena.tag:../../../milena/doc/user-refman/html" href="../../../milena/doc/user-refman/html/index.html">Milena</a> - \li <a class="el" doxygen="scribo.tag:../../../scribo/doc/user-refman/html" href="../../../scribo/doc/user-refman/html/index.html">Scribo</a> + \li <a class="el" href="../../milena/user-refman/html/index.html">Milena</a> + \li <a class="el" href="../../scribo/user-refman/html/index.html">Scribo</a> \li Swilena </td> <td> @@ -54,7 +53,6 @@ \li Olena Powered Programs </td> </tr> - </table> </center> -- 1.7.2.5