From: Laurent Bobelin <lbobelin@mintcar.lip.ens-lyon.fr>
Date: Sat, 12 Nov 2011 09:02:21 +0000 (+0100)
Subject: Added the new logo to the unstable doc, so that Lucas and Fred can show a webpage... 
X-Git-Tag: exp_20120216~311
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3e9550feddc792474634cc1d0056bff3bf900b13

Added the new logo to the unstable doc, so that Lucas and Fred can show a webpage and at least one doc with the same logo at SC
---

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 1e152f7bc8..56acede8dd 100644
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -36,6 +36,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
 
 	set(DOC_PNGS 
 		${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo.png
+		${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
 		${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_small.png
 		${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
 		${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
diff --git a/doc/index.doc b/doc/index.doc
index 9a2d9b8e85..07a91f4dbf 100644
--- a/doc/index.doc
+++ b/doc/index.doc
@@ -2,11 +2,21 @@
 
 <center>
 \htmlonly
-<a href="http://simgrid.gforge.inria.fr" border="0"><img align=center src="simgrid_logo.png" alt="SimGrid"></a><br>
+<table width="100%"> 
+	<tr> 
+		<td valign="middle" align="left">			
+				<img src="simgrid_logo_2011.png" alt="SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems" />		
+		</td> 
+		<td valign="middle" align="left"> 
+\endhtmlonly
+\htmlinclude .index.doc.toc			
+\htmlonly
+		</td> 
+	</tr> 
+</table> 
 \endhtmlonly
 </center>
 
-\htmlinclude .index.doc.toc
 SimGrid is a toolkit that provides core functionalities for the simulation
 of distributed applications in heterogeneous distributed environments.
 \htmlonly <!-- ______BODY_BEGIN______ --!> \endhtmlonly
diff --git a/doc/webcruft/simgrid_logo_2011.png b/doc/webcruft/simgrid_logo_2011.png
new file mode 100644
index 0000000000..1fdf138256
Binary files /dev/null and b/doc/webcruft/simgrid_logo_2011.png differ