From: Laurent Bobelin <lbobelin@mintcar.lip.ens-lyon.fr>
Date: Tue, 6 Sep 2011 14:27:23 +0000 (+0200)
Subject: Simgrid website documentation should be OK now. It's now separated totally from the... 
X-Git-Tag: v3_6_2~145
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d2bf78ef3304878995a537b02d90c8f598a5817f

Simgrid website documentation should be OK now. It's now separated totally from the doc generation
---

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index bbcd09790e..ef9d8b9f0d 100644
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -262,16 +262,24 @@ file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/tmp.curtoc)
 #Website
 
 configure_file(${CMAKE_HOME_DIRECTORY}/website/Doxyfile_website.in ${CMAKE_HOME_DIRECTORY}/website/Doxyfile_website @ONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/website/index.php.in ${CMAKE_HOME_DIRECTORY}/website/html/index.php @ONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/website/documentation.php.in ${CMAKE_HOME_DIRECTORY}/website/html/documentation.php @ONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/website/download.php.in ${CMAKE_HOME_DIRECTORY}/website/html/download.php @ONLY)
 
 ADD_CUSTOM_TARGET(simgrid_website
 	COMMENT "Generating the SimGrid Website..."	
 	DEPENDS ${WEBSITE_SOURCES} ${CMAKE_HOME_DIRECTORY}/website/all.bib
-	COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/toc_create.pl FAQ.doc contrib.doc history.doc
-    COMMAND ${CMAKE_COMMAND} -E echo "XX Doxygen website pass"
+	COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/toc_create.pl FAQ.doc contrib.doc history.doc  	    			
+	COMMAND ${CMAKE_COMMAND} -E echo "XX Doxygen website pass"
 	COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile_website
 		
 	COMMAND ${CMAKE_COMMAND} -E echo "XX Post-processing Doxygen website result"
-	#COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/doxygen_postprocesser_website.pl
+	COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/doxygen_postprocesser_website.pl
+
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/stylesheets/ ${CMAKE_HOME_DIRECTORY}/website/html/
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/logos/ ${CMAKE_HOME_DIRECTORY}/website/html/
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/img/ ${CMAKE_HOME_DIRECTORY}/website/html/
+
 	WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/website/
 )
 
@@ -289,7 +297,6 @@ ADD_CUSTOM_TARGET(bib_files
 	COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_wrapper.pl publis_core
 	COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_wrapper.pl publis_extern
 	COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/bibtex2html_wrapper.pl publis_intra
-	
 	WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/website/
 )
 
diff --git a/tools/doxygen/doxygen_postprocesser_website.pl b/tools/doxygen/doxygen_postprocesser_website.pl
new file mode 100755
index 0000000000..1c47f1d779
--- /dev/null
+++ b/tools/doxygen/doxygen_postprocesser_website.pl
@@ -0,0 +1,465 @@
+#! /usr/bin/perl
+
+use strict;
+
+# Add here the pages of the documentation generated by a @page doxygen macro
+my @extra_files = qw(html/faq.html html/history.html html/contrib.html html/people.html
+                     html/publis.html html/publis_core.html html/publis_extern.html html/publis_intra.html);
+
+
+my %debug;
+$debug{'parse'} = 0; # show how we parse the module tree
+$debug{'input'} = 0; # display the resulting tree
+$debug{'handle'}= 0; # Be verbose on the post-processing
+$debug{'rename'}= 0; # do not overwrite the files (allows several debuging runs without rerunning doxygen)
+
+my @allfiles;
+###
+### Get the module definitions
+###
+
+open IN, "html/modules.html" || die "Cannot parse html/modules.html. Did you really run doxygen?\n";
+
+# pass headers
+while (<IN>) {
+  last if /group__SimGrid__API.html/;
+}
+
+# Parse the tree
+my $top;
+my $current;
+my $entry;
+
+# $current->{'label'}="ROOT";
+# push @{$top->{'down'}},$current;
+# print "Push $current '".($current->{'label'})."' as child of $top '".($top->{'label'})."'\n" if $debug{'parse'};
+# $current=$top;
+$top->{'label'}="ROOT";
+print "Create ROOT $top\n" if $debug{'parse'};
+$current=$top;
+
+
+# Read the whole data to postprocess it a bit
+my $in;
+while (<IN>) {
+    $in .= $_;
+}
+$in =~ s/<ul>/\n<ul>\n/sg;
+foreach $_ (split(/\n/,$in)) {
+    next unless length($_);
+    next if ($_ =~ m|^</li>$|);
+    print "  Seen '$_'\n" if $debug{'parse'};
+  if (/<ul>/) {
+    print "DOWN: $current '$current->{'label'}' -> " if $debug{'parse'};
+    $current = $current->{'down'}[scalar @{$current->{'down'}} - 1];
+    print "$current '$current->{'label'}'\n" if $debug{'parse'};
+    next;
+  }
+  if (/<\/ul>/) {
+    $current = $current->{'up'};
+    print "UP to $current '$current->{'label'}'\n" if $debug{'parse'};
+    next;
+  }
+  if (/<p>/) {
+    last;
+  }
+  
+  m|href="([^"]*)">([^<]*)</a>|; #"
+  
+  $entry = {};
+  $entry->{'file'} = $1;  
+  $entry->{'label'} = $2;
+  $entry->{'up'} = $current;
+  push @{$current->{'down'}},$entry;
+  print "Push file:$1 label:'$2' as child of $current '$current->{'label'}'\n" if $debug{'parse'};
+  push @allfiles,"html/$1";
+}
+close IN;
+
+# Check each file for extra information (short name, extra childs)
+sub extra_info {
+  my $current=shift;
+
+  if (defined($current->{'file'})) {
+    open IN, "html/$current->{'file'}";
+    while (<IN>) {
+      if (/DOXYGEN_NAVBAR_LABEL/) {
+        if (/DOXYGEN_NAVBAR_LABEL="([^"]*)"/) {#"
+          print "Extra info from $current->{'file'}: label=$1, not $current->{'label'}\n" if $debug{'parse'};
+          $current->{'label'}=$1;
+        } else {
+          die "Malformated DOXYGEN_NAVBAR_LABEL line in $current->{'file'}";
+        }
+      }
+      if (/DOXYGEN_NAVBAR_CHILD/) {
+        if (/DOXYGEN_NAVBAR_CHILD *"([^"]*)"=([^ ]*)/) {#"
+          $entry = {};
+          $entry->{'label'} = $1;
+          $entry->{'file'} = $2;
+          chomp($entry->{'file'});
+          $entry->{'up'} = $current;
+          push @{$current->{'down'}},$entry;
+          print "Extra info from $current->{'file'}: New child $entry->{'label'}=$entry->{'file'}\n"  if $debug{'parse'};
+        } else {
+          die "Malformated DOXYGEN_NAVBAR_CHILD line in $current->{'file'}";
+        }
+      }
+    }
+  }
+  
+  foreach my $entry (@{$current->{'down'}}) {
+    extra_info($entry);
+  }  
+}
+extra_info($top);
+
+## debug function
+sub display {
+  my $current=shift;
+  my $level=shift;
+  print "  " x $level;
+  print "$current: ".$current->{'label'}." ($current->{'file'})\n";
+  foreach my $entry (@{$current->{'down'}}) {
+    display($entry,$level+1);
+  }
+}
+
+display($top,0) if $debug{'input'};
+
+###
+### Generate the navbar
+###
+
+# the root deserves some special handling
+open IN,"html/modules.html" || die;
+open OUT,">html/modules.new.html" || die;
+my $line;
+while ($line = <IN>) {
+  last if $line =~ /<h1>SimGrid Modules</;
+  print OUT $line;
+}
+
+print OUT "<div class=\"tabs\">\n  <ul class=\"tablist\">\n";
+foreach $current (@{ ${$top->{'down'}}[0]->{'down'} }) {
+  print OUT "   <li><a href=\"$current->{'file'}\"><span>$current->{'label'}</span></a></li>\n";
+}
+print OUT "  </ul></div>\n";
+print OUT $line;
+while (<IN>) {
+  print OUT $_;
+}
+
+close OUT;
+close IN;
+rename("html/modules.new.html","html/modules.html") unless $debug{'rename'};
+
+# the publication pages deserves some special handling too
+my %pub_tabs = ("publis.html"       =>"Reference publications",
+                "publis_core.html"  =>"Other publication about SimGrid",
+                "publis_extern.html"=>"External papers using SimGrid",
+                "publis_intra.html"=>"Internal papers using SimGrid");
+# force ordering
+my @pub_titles = ("publis.html", "publis_core.html", "publis_extern.html", "publis_intra.html");
+sub handle_pub{
+    my $oldname = shift;
+    my $newname = $oldname;
+    $newname =~ s/\.html$/.new.html/;
+ 
+#    print "Handle_pub($oldname -> $newname)\n";
+    
+    open IN,"html/$oldname" || die "Cannot open $oldname";
+    open OUT,">html/$newname" || die "Cannot open $newname";
+    my $line;
+# BIG FAT WARNING : THIS HACK IS DEPENDANT OF THE DOXYGEN VERSION AND OUR TEXT (because of the string we are looking for, that is changing with doxygen version, either h1 or div class="title" ... So we're forced to use titles defined in doc files...
+    while ($line = <IN>) {
+	last if (($line =~ /Reference publications about SimGrid/) or ($line =~  /Publications about the SimGrid framework/) or ($line =~  /Papers that use SimGrid-generated results/) or ($line =~  /Our own papers that use SimGrid-generated results/));
+	print OUT $line;
+    }
+
+    print OUT "<div class=\"tabs\" align=\"center\">\n<ul class=\"tablist\">\n";
+    foreach my $page (@pub_titles) {
+	print OUT "         <li".($page eq $oldname? " class=\"current\"":"" )."> <a href=\"$page\"><span>".($pub_tabs{$page})."</span></a></li>\n";
+    }
+
+    print OUT "  </ul></div>\n";
+    print OUT $line;
+    while ($line = <IN>) {
+	print OUT $line;
+    }
+    close OUT;
+    close IN;
+    rename("html/$newname","html/$oldname") unless $debug{'rename'};
+}
+map {handle_pub($_)} @pub_titles;
+
+
+# Operate the recursion
+sub handle_page {
+  my $current=shift;
+  my $level=shift;
+
+  print "Handle $current->{'file'} at level $level\n" if $debug{'handle'};
+    
+  # we generate the tabs bottom up begining from where we are in the tree
+  # and display them top down, as it should in a file
+  my @tabs = ();
+  my $found_div_tabs=0;
+  
+  if (defined ($current->{'label'}) and $current->{'label'} ne 'ROOT') {
+#    print "handle $current->{'file'}, at level $level\n";
+    # generate the tabs
+    my $iterator = $current;
+    my $lvl_it=$level;
+    while ($lvl_it >= 0) {
+      my $father = $iterator->{'up'};
+      $tabs[$lvl_it] = "<div class=\"tabs2\">\n<ul class=\"tablist\">\n";
+      foreach my $bro (@{$father->{'down'}}) {
+        $tabs[$lvl_it] .= "  <li".($bro==$iterator?" class=\"current\"":"")."> <a href=\"$bro->{'file'}\"><span>$bro->{'label'}</span></a></li>\n";      
+      }
+      $tabs[$lvl_it] .= "  </ul></div>\n";
+      $iterator = $father;
+      $lvl_it--;
+    }
+    if (defined $current->{'down'}) { # there's some kid. Display them too
+      $tabs[$level+1] = "<div class=\"tabs2\">\n  <ul class=\"tablist\">\n";
+      foreach my $kid (@{$current->{'down'}}) {
+        $tabs[$level+1] .= "  <li> <a href=\"$kid->{'file'}\"><span>$kid->{'label'}</span></a></li>\n";      
+      }
+      $tabs[$level+1] .= "  </ul></div>\n";      
+    }
+    
+    # put them in place
+    open FROM,"html/$current->{'file'}" || die;
+    my $newname="html/$current->{'file'}";
+    $newname =~ s/.html/.handlepage.html/;
+    open TO,">$newname" || die;
+#    print "XXX Deal with html/$current->{'file'}  ->  $newname\n";
+    while (<FROM>) {
+#      print "--Read  $_";
+      # add "current" to the module API granfather page
+      s|<li><a href="modules.html"><span>[^<]*</span></a></li>|<li class="current"><a href="modules.html"><span>Modules&nbsp;API</span></a></li>|;
+#      print "++Write $_";
+	  $found_div_tabs=1 if m/div.*class="tabs"/;	
+      print TO "$_";
+      last if ((m|</div>|)&&($found_div_tabs));
+    }
+      
+    print TO "\n<!-- POST-PROCESSED TABS -->\n";
+    foreach (@tabs) {
+#      print "TAB: $_";
+      print TO "$_";
+    }
+    print TO "\n<!-- END OF POST-PROCESSED TABS -->\n";
+      
+    if ($current->{'file'} =~ m/^class/) {
+	  while (<FROM>) {
+	 	last if (m|</div>|);
+	  }
+      print TO "$_";	
+    }
+    while (<FROM>) {
+      if (m/POST-PROCESSED TABS/) {
+	    while (<FROM>) {
+	      last if (m/END OF POST-PROCESSED TABS/);
+	    }
+	    next;
+      }
+
+      if (m/The documentation for/) {
+	    while (<FROM>) {
+	      last if (m/<p>/);
+	    }
+      }
+      print TO "$_";
+    }
+    close FROM;
+    close TO;
+    rename("$newname","html/$current->{'file'}") unless $debug{'rename'};
+  } 
+  
+  # recurse on childs
+  foreach my $entry (@{$current->{'down'}}) {
+    handle_page($entry,$level+1);
+  }
+}
+
+###
+### Launch the modules navbar reworking
+###
+handle_page($top,-1);# skip roots (we have 2 roots) in level counting
+
+###
+### Add the modules navbar reworking to the modules.html file
+###
+sub add_tabs_to_module_html {
+  my $found_div_tabs=0;
+  my $module_tabs = "<div class=\"tabs2\">\n<ul class=\"tablist\">\n";
+  foreach my $entry (@{$top->{'down'}}) {
+      $module_tabs .= "  <li> <a href=\"$entry->{'file'}\"><span>$entry->{'label'}</span></a></li>\n";
+  }
+  $module_tabs .= "  </ul></div>\n";      
+  
+  my $oldname = "html/modules.html";
+  open FROM,$oldname || die;
+  my $newname=$oldname;
+  $newname =~ s/.html/.handlepage.html/;
+  open TO,">$newname" || die;
+  while (<FROM>) {
+    $found_div_tabs=1 if m/div.*class="tabs"/;	
+	print TO "$_";
+	last if ((m|</div>|)&&($found_div_tabs));
+  }
+  
+  print TO "\n<!-- POST-PROCESSED TABS -->\n";
+  print TO $module_tabs;
+  print TO "\n<!-- END OF POST-PROCESSED TABS -->\n";
+
+  while (<FROM>) {
+	print TO "$_";
+  }  
+  close FROM;
+  close TO;
+  rename($newname, $oldname) unless $debug{'rename'};
+  
+  # die;
+}   
+
+add_tabs_to_module_html;
+
+###
+### Post-processsing common to all pages
+###
+map {push @allfiles,$_} @extra_files;
+print "All files: ".(join(", ",@allfiles))."\n" if $debug{'parse'};
+
+my $tabs;
+
+foreach my $file (@allfiles) {
+    $file =~ s/.html/.handlepage.html/ if $debug{'rename'}; # Take right name if debugging
+	
+    open FROM,"$file" || die;
+    my $outfile = "$file";
+    $outfile =~ s/.(html|php)$/.new.$1/;
+    open TO,">$outfile" || die;
+#    print "POSTPROCESSING $file (tmp=$outfile)\n";
+    while (<FROM>) {
+	
+
+
+	  if($tabs){
+		  if($file =~ /^html\/index\..*/){
+		  	$_ =~ s/<li class="current">/<li>/g;
+		  	$_ =~ s/<li><a href="index.html">/<li class="current"><a href="index.html">/g;
+		  }		  
+		  $_ =~ s/<li class="current"><a href="pages.html">/<li><a href="pages.html">/g;
+		  
+		  if($file =~ /^html\/pages\..*/){
+		  	$_ =~ s/<li><a href="pages.html">/<li class="current"><a href="pages.html">/g;
+		  }
+	  }
+	  
+	  if($file =~ /^html\/publis.*/){
+		  	$_ =~ s/<div class="header">/<div>/g;
+		  	$_ =~ s/<div class="headertitle">/<div>/g;
+	 }
+	
+	  # Add the FAQ PUBLIS PEOPLE HISTORY and CONTRIB to the top navbar.
+      if( $_ =~ /<div.*class="tabs">/){
+      	$tabs = 1;
+      }
+      if( $_ =~ /<\/div>/){
+      	$tabs = 0;
+      }
+      if( $_ =~ /<\/ul>/ && $tabs){
+      		my $tmp_buff="";
+		
+			# LBO : ugly way to separate doc in 2 separate stuff ...
+			$tmp_buff .= '      <li><a href="https://gforge.inria.fr/frs/?group_id=12"><span>Download</span></a></li>'."\n";
+	      		$tmp_buff .= '      <li><a href="documentation.php"><span>Online documentation</span></a></li>'."\n";
+	      		$tmp_buff .= '      <li><a href="publis.html"><span>Publications</span></a></li>'."\n";
+	      		$tmp_buff .= '      <li><a href="people.html"><span>People</span></a></li>'."\n";
+	      		$tmp_buff .= '      <li><a href="history.html"><span>History</span></a></li>'."\n";
+	      		$tmp_buff .= '      <li><a href="contrib.html"><span>Contrib</span></a></li>'."\n";
+			$tmp_buff .= '      <li><a href="faq.html"><span>FAQ&#160;Page</span></a></li>'."\n";
+		
+		
+      		$tmp_buff .= '      <li><a href="http://gforge.inria.fr/projects/simgrid"><span>SimGrid&#160;Forge</span></a></li>'."\n";
+      				
+		
+      	  	$tmp_buff .= $_;
+      	  	$tabs = 0;
+
+	      # Rework the navbar and add menu for use.html
+	      # Fix the current "button" of buggy Doxygen tabs  
+	      if($file =~ /^html\/use.*/
+	      || $file =~ /^html\/installSimgrid.*/
+	      || $file =~ /^html\/options.*/ 
+	      || $file =~ /^html\/bindings.*/
+	      || $file =~ /^html\/gtnets.*/
+	      || $file =~ /^html\/ns3.*/
+	      || $file =~ /^html\/modules.*/
+	      || $file =~ /^html\/annotated.*/)
+	      {
+				$tmp_buff .= '      <div class="tabs_group_use">'."\n";
+				$tmp_buff .= '      	<ul class="tablist">'."\n";
+				$tmp_buff .= '        	<li><a href="installSimgrid.html"><span>Install SimGrid</span></a></li>'."\n";
+				$tmp_buff .= '        	<li><a href="modules.html"><span>Modules&#160;API</span></a></li>'."\n";
+      			$tmp_buff .= '        	<li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>'."\n";
+				$tmp_buff .= '        	<li><a href="options.html"><span>Options & configurations</span></a></li>'."\n";
+				$tmp_buff .= '        	<li><a href="bindings.html"><span>Bindings</span></a></li>'."\n";
+				$tmp_buff .= '        	<li><a href="gtnets.html"><span>GTNets</span></a></li>'."\n";
+				$tmp_buff .= '        	<li><a href="ns3.html"><span>NS3</span></a></li>'."\n";
+				$tmp_buff .= '      	</ul></div>'."\n";
+				$tmp_buff .= '      </div>'."\n";
+				
+				my $filename = $file;
+		        $filename =~ s/html\///g;
+		        $filename =~ s/\.html//g;
+		        $filename =~ s/publis_.*/publis/g;
+		        $tmp_buff =~ s/<li class="current">/<li>/g;
+		        $tmp_buff =~ s/<li><a href="$filename.html">/<li class="current"><a href="$filename.html">/g;
+		        $tmp_buff =~ s/<li><a href="use.html">/<li class="current"><a href="use.html">/g; 
+				
+	      }
+	
+	      # Rework the navbar
+	      # Fix the current "button" of buggy Doxygen tabs   
+	      if($file =~ /^html\/publis.*/ 
+	      || $file =~ /^html\/faq.*/
+	      || $file =~ /^html\/people.*/ 
+	      || $file =~ /^html\/history.*/ 
+	      || $file =~ /^html\/contrib.*/
+	      || $file =~ /^html\/pages.*/)
+	      {
+		      my $filename = $file;
+		      $filename =~ s/html\///g;
+		      $filename =~ s/\.html//g;
+		      $filename =~ s/publis_.*/publis/g;
+		      $tmp_buff =~ s/<li class="current">/<li>/g;
+		      $tmp_buff =~ s/<li><a href="$filename.html">/<li class="current"><a href="$filename.html">/g;     
+	      }
+	      
+
+	      print TO $tmp_buff;	      
+	      next;
+    }
+      	
+      s|<li><a href="index.html"><span>Main&#160;Page</span>|<li><a href="index.php"><span>Home</span>|g;			
+     s|<span>Main&#160;Page</span>|<span>Home</span>|g;	
+      s|<span>Modules</span>|<span>Modules&#160;API</span>|g;
+      s|<li.*><a href="pages.html"><span>Related&#160;Pages</span></a></li>\n||g;
+      s|<li><a href="modules.html"><span>Modules&#160;API</span></a></li>\n||g;
+      s|<li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>\n||g;
+      s|<li class="current"><a href="modules.html"><span>Modules&#160;API</span></a></li>\n||g;
+      s|<li class="current"><a href="annotated.html"><span>Data&#160;Structures</span></a></li>\n||g;
+      s|Related Pages<|Documentation&nbsp;Index<|g;
+      s|<div id="navrow|<div align="center" id="navrow|g;
+      print TO $_;
+    }
+    close FROM;
+    close TO;
+    rename("$outfile", "$file") unless $debug{'rename'};
+}
+
+
+
diff --git a/website/Doxyfile_website.in b/website/Doxyfile_website.in
index 9b47b74880..306e62ded0 100644
--- a/website/Doxyfile_website.in
+++ b/website/Doxyfile_website.in
@@ -843,7 +843,7 @@ HTML_FILE_EXTENSION    = .html
 # that header. Note that the header is subject to change so you typically
 # have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW!
 
-HTML_HEADER            =
+HTML_HEADER            = header.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
diff --git a/website/documentation.php.in b/website/documentation.php.in
index 1763ca7f55..2428bc6c8c 100644
--- a/website/documentation.php.in
+++ b/website/documentation.php.in
@@ -1,214 +1,87 @@
-<?php 
-
-$domain=ereg_replace('[^\.]*\.(.*)$','\1',$_SERVER['HTTP_HOST']);
-$group_name=ereg_replace('([^\.]*)\..*$','\1',$_SERVER['HTTP_HOST']);
+<?php
+
+
+function list_files($dir){
+        $hidden = ".";
+        if (is_dir($dir)) {
+                if ($dh = opendir($dir)) {
+                        echo "<ul>\n";
+                        while (($file = readdir($dh)) !== false) {
+                                if (is_dir($file) && preg_match("/^[0-9]/", $file)){
+                                        echo "<li><a href=\"" . $dir . "/" . $file . "/doc/\"> Simgrid version " . $file . "</a></li>";
+                                }				
+                        }
+                        closedir($dh);
+                        echo "</ul>";
+                }
+        }
+        else {
+                echo "No version now.\n";
+        }
+}
 
-echo '<?xml version="1.0" encoding="UTF-8"?>';
 ?>
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en   ">
-<link href="doc/doxygen.css" rel="stylesheet" type="text/css">
-<link href="doc/tabs.css" rel="stylesheet" type="text/css">
-
-  <head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems</title>
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsite.css" />
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsitetabs.css" />
+ 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>SimGrid - Online documentation</title>
 	<meta name="keywords" content="Scalable, simulation, distributed systems, grid, peer-to-peer" /> 
-	<script language="JavaScript" type="text/javascript">
-	<!--
-	function help_window(helpurl) {
-		HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
-	}
-	// -->
-		</script>
-
-<style type="text/css">
-	<!--
-	BODY {
-		margin-top: 3;
-		margin-left: 3;
-		margin-right: 3;
-		margin-bottom: 3;
-		background: #5651a1;
-	}
-	ol,ul,p,body,td,tr,th,form { font-family: verdana,arial,helvetica,sans-serif; font-size:small;
-		color: #333333; }
-
-	h1 { font-size: x-large; font-family: verdana,arial,helvetica,sans-serif; }
-	h2 { font-size: large; font-family: verdana,arial,helvetica,sans-serif; }
-	h3 { font-size: medium; font-family: verdana,arial,helvetica,sans-serif; }
-	h4 { font-size: small; font-family: verdana,arial,helvetica,sans-serif; }
-	h5 { font-size: x-small; font-family: verdana,arial,helvetica,sans-serif; }
-	h6 { font-size: xx-small; font-family: verdana,arial,helvetica,sans-serif; }
-
-	pre,tt { font-family: courier,sans-serif }
-
-	a:link { text-decoration:none }
-	a:visited { text-decoration:none }
-	a:active { text-decoration:none }
-	a:hover { text-decoration:underline; color:red }
-
-	.titlebar { color: black; text-decoration: none; font-weight: bold; }
-	a.tablink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tablink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tablink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
-	a.tabsellink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tabsellink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tabsellink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
-	-->
-</style>
 
 </head>
 
 <body>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
-	<tr>
-        <td style="text-align: left; vertical-align: top;"><a href="http://<?php echo $domain; ?>/projects/<?php echo $group_name; ?>"><img
-          src="simgrid_logo_small.png"
-          style="text-decoration: underline;" border="0" alt="SimGrid">
-          <?php if (date('m') == '04'  && date('d') == '01')  {echo '<img style="text-decoration: underline;" border="0" alt="SimGrid" src="fish.gif">';}?>
-          </a><br>
-        </td>
-         <td style="text-align: left; vertical-align: top;">
-        </td>
-		<td style="text-align: right; vertical-align: top;"><a href="http://<?php echo $domain; ?>"><img src="http://<?php echo $domain; ?>/themes/inria/images/logo.png" border="0" alt="gforge INRIA" width="198" height="52" /></a></td>
-	</tr>
+<div id="header" align="center">
+<p>
+<img src="logos/simgrid_logo.png"  alt="SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems" />
+</p>
+<h2 class="header"><i class="subtitle">Scalable simulation of distributed systems</i></h2>
+</div>
+<p/>
+<br/> 
+ <div id="navrow1" class="tabs" align="center">
+    <ul class="tablist">
+      <li><a href="index.php"><span>Home</span></a></li>
+                        <li><a href="https://gforge.inria.fr/frs/?group_id=12"><span>Download</span></a></li>
+
+      <li><a href="documentation.php"><span>Online documentation</span></a></li>
+      <li><a href="publis.html"><span>Publications</span></a></li>
+      <li><a href="people.html"><span>People</span></a></li>
+      <li><a href="history.html"><span>History</span></a></li>
+      <li><a href="contrib.html"><span>Contrib</span></a></li>
+      <li><a href="faq.html"><span>FAQ&#160;Page</span></a></li>
+
+      <li><a href="http://gforge.inria.fr/projects/simgrid"><span>SimGrid&#160;Forge</span></a></li>
+    </ul>
+  </div>
+<table width="80%" cellpadding="5" cellspacing="0" border="0" align="center">
+
+<tr><td width="75%" valign="top">
+The documentation for SimGrid is maintained for the latest versions. It contains informations on how to use SimGrid, some tutorial, and its inner component. Here is the list of available documentation version:
+<?php list_files("."); ?>
+</tr>
 </table>
-______ONGLETS______
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="3">
-
-
-		<!-- start tabs -->
-
-	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topleft.png" height="9" width="9" alt="" /></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="30" height="1" alt="" /></td>
-		<td bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="30" height="1" alt="" /></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topright.png" height="9" width="9" alt="" /></td>
-	</tr>
-
-	<tr>
-
-		<!-- Outer body row -->
-
-		<td bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="10" height="1" alt="" /></td>
-		<td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
-
-			<!-- Inner Tabs / Shell -->
-
-			<table border="0" width="100%" cellspacing="0" cellpadding="0">
-			<tr>
-				<td align="left" bgcolor="#ffffff" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-				<td align="right" bgcolor="#ffffff" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topright-inner.png" height="9" width="9" alt="" /></td>
-			</tr>
-
-			<tr>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="10" height="1" alt="" /></td>
-				<td valign="top" width="99%" bgcolor="white">
-
-	<!-- whole page table -->
-<table width="100%" cellpadding="5" cellspacing="0" border="0">
-<tr><td width="65%" valign="top">
-<?php if ($handle=fopen('http://'.$domain.'/export/projtitl.php?group_name='.$group_name,'r')){
-$contents = '';
-while (!feof($handle)) {
-	$contents .= fread($handle, 8192);
-}
-$contents=str_replace("Welcome to", "Welcome to the", $contents);
-fclose($handle);
-echo $contents; } ?>
-______BODY______
-
-</td>
-
-<td width="35%" valign="top">
-
-		<table cellspacing="0" cellpadding="1" width="100%" border="0" bgcolor="#d5d5d7">
-		<tr><td>
-			<table cellspacing="0" cellpadding="2" width="100%" border="0" bgcolor="#eaecef">
-				<tr style="background-color:#d5d5d7" align="center">
-					<td colspan="2"><span class="titlebar">Project Summary</span></td>
-				</tr>
-				<tr align="left">
-					<td colspan="2">
-
-<?php if($handle=fopen('http://'.$domain.'/export/projhtml.php?group_name='.$group_name,'r')){
-$contents = '';
-while (!feof($handle)) {
-	$contents .= fread($handle, 8192);
-}
-fclose($handle);
-$contents=str_replace('href="/','href="http://'.$domain.'/',$contents);
-$contents=str_replace('src="/','src="http://'.$domain.'/',$contents);
-echo $contents; } ?>
-<br>
-<hr>
-<br>
-<?php if ($handle=fopen('http://'.$domain.'/export/projnews.php?group_name='.$group_name,'r')){
-$contents = '';
-while (!feof($handle)) {
-	$contents .= fread($handle, 8192);
-}
-fclose($handle);
-$contents=str_replace('href="/','href="http://'.$domain.'/',$contents);
-echo $contents; } ?>
-
-
-					</td>
-				</tr>
-			</table>
-		</td></tr>
-		</table><p>&nbsp;</p>
-</td></tr>
-		<tr><td align=center>
-			<a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
-		</td></tr>
-</table>
-			&nbsp;<p>
-                        <center>
-                                Help: <a href="mailto:siteadmin-help@lists.gforge.inria.fr">siteadmin-help@lists.gforge.inria.fr</a> Webmaster: <a href="mailto:webmaster@gforge.inria.fr">webmaster@gforge.inria.fr</a>
-                        </center>
-			<!-- end main body row -->
-
-
-				</td>
-				<td width="10" bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="2" height="1" alt="" /></td>
-			</tr>
-			<tr>
-				<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-				<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
-			</tr>
-			</table>
-
-		<!-- end inner body row -->
-
-		</td>
-		<td width="10" bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="2" height="1" alt="" /></td>
-	</tr>
-	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomleft.png" height="9" width="9" alt="" /></td>
-		<td bgcolor="#E0E0E0" colspan="3"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomright.png" height="9" width="9" alt="" /></td>
-	</tr>
-</table>
-
-<!-- PLEASE LEAVE "Powered By Gforge" on your site -->
-<br />
-<center>
-<a href="http://gforge.org/"><img src="http://gforge.org/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0" /></a>
-</center>
-
-
+<div id="footer" align="center">
+<p>
+ Help: <a href="mailto:siteadmin-help@lists.gforge.inria.fr">siteadmin-help@lists.gforge.inria.fr</a> Webmaster: <a href="mailto:webmaster@gforge.inria.fr">webmaster@gforge.inria.fr</a>
+
+</p>
+<p>
+<ul class="footerlogos">
+	<li><a href="http://www.inria.fr/"><img align="left" src="logos/logo_INRIA.png" alt="INRIA"/></a>	
+	</li>
+	<li><a href="http://gforge.org/"><img src="http://gforge.org/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0"/></a>
+
+	</li>
+	<li><a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
+
+	</li>
+</ul>
+	
+</p>
+</div>
 </body>
 </html>
diff --git a/website/download.php.in b/website/download.php.in
index 1763ca7f55..47d5f94fbc 100644
--- a/website/download.php.in
+++ b/website/download.php.in
@@ -1,214 +1,71 @@
-<?php 
-
-$domain=ereg_replace('[^\.]*\.(.*)$','\1',$_SERVER['HTTP_HOST']);
-$group_name=ereg_replace('([^\.]*)\..*$','\1',$_SERVER['HTTP_HOST']);
-
-echo '<?xml version="1.0" encoding="UTF-8"?>';
-?>
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en   ">
-<link href="doc/doxygen.css" rel="stylesheet" type="text/css">
-<link href="doc/tabs.css" rel="stylesheet" type="text/css">
-
-  <head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems</title>
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsite.css" />
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsitetabs.css" />
+ 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>SimGrid - Downloads</title>
 	<meta name="keywords" content="Scalable, simulation, distributed systems, grid, peer-to-peer" /> 
-	<script language="JavaScript" type="text/javascript">
-	<!--
-	function help_window(helpurl) {
-		HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
-	}
-	// -->
-		</script>
-
-<style type="text/css">
-	<!--
-	BODY {
-		margin-top: 3;
-		margin-left: 3;
-		margin-right: 3;
-		margin-bottom: 3;
-		background: #5651a1;
-	}
-	ol,ul,p,body,td,tr,th,form { font-family: verdana,arial,helvetica,sans-serif; font-size:small;
-		color: #333333; }
-
-	h1 { font-size: x-large; font-family: verdana,arial,helvetica,sans-serif; }
-	h2 { font-size: large; font-family: verdana,arial,helvetica,sans-serif; }
-	h3 { font-size: medium; font-family: verdana,arial,helvetica,sans-serif; }
-	h4 { font-size: small; font-family: verdana,arial,helvetica,sans-serif; }
-	h5 { font-size: x-small; font-family: verdana,arial,helvetica,sans-serif; }
-	h6 { font-size: xx-small; font-family: verdana,arial,helvetica,sans-serif; }
-
-	pre,tt { font-family: courier,sans-serif }
-
-	a:link { text-decoration:none }
-	a:visited { text-decoration:none }
-	a:active { text-decoration:none }
-	a:hover { text-decoration:underline; color:red }
-
-	.titlebar { color: black; text-decoration: none; font-weight: bold; }
-	a.tablink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tablink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tablink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
-	a.tabsellink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tabsellink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tabsellink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
-	-->
-</style>
 
 </head>
 
 <body>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
-	<tr>
-        <td style="text-align: left; vertical-align: top;"><a href="http://<?php echo $domain; ?>/projects/<?php echo $group_name; ?>"><img
-          src="simgrid_logo_small.png"
-          style="text-decoration: underline;" border="0" alt="SimGrid">
-          <?php if (date('m') == '04'  && date('d') == '01')  {echo '<img style="text-decoration: underline;" border="0" alt="SimGrid" src="fish.gif">';}?>
-          </a><br>
-        </td>
-         <td style="text-align: left; vertical-align: top;">
-        </td>
-		<td style="text-align: right; vertical-align: top;"><a href="http://<?php echo $domain; ?>"><img src="http://<?php echo $domain; ?>/themes/inria/images/logo.png" border="0" alt="gforge INRIA" width="198" height="52" /></a></td>
-	</tr>
-</table>
-______ONGLETS______
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="3">
-
-
-		<!-- start tabs -->
-
-	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topleft.png" height="9" width="9" alt="" /></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="30" height="1" alt="" /></td>
-		<td bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="30" height="1" alt="" /></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topright.png" height="9" width="9" alt="" /></td>
-	</tr>
-
-	<tr>
-
-		<!-- Outer body row -->
-
-		<td bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="10" height="1" alt="" /></td>
-		<td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
-
-			<!-- Inner Tabs / Shell -->
-
-			<table border="0" width="100%" cellspacing="0" cellpadding="0">
-			<tr>
-				<td align="left" bgcolor="#ffffff" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-				<td align="right" bgcolor="#ffffff" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topright-inner.png" height="9" width="9" alt="" /></td>
-			</tr>
-
-			<tr>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="10" height="1" alt="" /></td>
-				<td valign="top" width="99%" bgcolor="white">
-
-	<!-- whole page table -->
-<table width="100%" cellpadding="5" cellspacing="0" border="0">
-<tr><td width="65%" valign="top">
-<?php if ($handle=fopen('http://'.$domain.'/export/projtitl.php?group_name='.$group_name,'r')){
+<div id="header" align="center">
+<p>
+<img src="logos/simgrid_logo.png"  alt="SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems" />
+</p>
+<h2 class="header"><i class="subtitle">Scalable simulation of distributed systems</i></h2>
+</div>
+<p/>
+<br/> 
+ <div id="navrow1" class="tabs" align="center">
+    <ul class="tablist">
+      <li><a href="index.php"><span>Home</span></a></li>
+                        <li><a href="https://gforge.inria.fr/frs/?group_id=12"><span>Download</span></a></li>
+
+      <li><a href="documentation.php"><span>Online documentation</span></a></li>
+      <li><a href="publis.html"><span>Publications</span></a></li>
+      <li><a href="people.html"><span>People</span></a></li>
+      <li><a href="history.html"><span>History</span></a></li>
+      <li><a href="contrib.html"><span>Contrib</span></a></li>
+      <li><a href="faq.html"><span>FAQ&#160;Page</span></a></li>
+
+      <li><a href="http://gforge.inria.fr/projects/simgrid"><span>SimGrid&#160;Forge</span></a></li>
+    </ul>
+  </div>
+<table width="80%" cellpadding="5" cellspacing="0" border="0" align="center">
+
+<tr><td width="75%" valign="top">
+
+<?php if ($handle=fopen('https://gforge.inria.fr/frs/?group_id=12','r')){
 $contents = '';
 while (!feof($handle)) {
 	$contents .= fread($handle, 8192);
 }
-$contents=str_replace("Welcome to", "Welcome to the", $contents);
 fclose($handle);
 echo $contents; } ?>
-______BODY______
-
-</td>
-
-<td width="35%" valign="top">
 
-		<table cellspacing="0" cellpadding="1" width="100%" border="0" bgcolor="#d5d5d7">
-		<tr><td>
-			<table cellspacing="0" cellpadding="2" width="100%" border="0" bgcolor="#eaecef">
-				<tr style="background-color:#d5d5d7" align="center">
-					<td colspan="2"><span class="titlebar">Project Summary</span></td>
-				</tr>
-				<tr align="left">
-					<td colspan="2">
-
-<?php if($handle=fopen('http://'.$domain.'/export/projhtml.php?group_name='.$group_name,'r')){
-$contents = '';
-while (!feof($handle)) {
-	$contents .= fread($handle, 8192);
-}
-fclose($handle);
-$contents=str_replace('href="/','href="http://'.$domain.'/',$contents);
-$contents=str_replace('src="/','src="http://'.$domain.'/',$contents);
-echo $contents; } ?>
-<br>
-<hr>
-<br>
-<?php if ($handle=fopen('http://'.$domain.'/export/projnews.php?group_name='.$group_name,'r')){
-$contents = '';
-while (!feof($handle)) {
-	$contents .= fread($handle, 8192);
-}
-fclose($handle);
-$contents=str_replace('href="/','href="http://'.$domain.'/',$contents);
-echo $contents; } ?>
-
-
-					</td>
-				</tr>
-			</table>
-		</td></tr>
-		</table><p>&nbsp;</p>
-</td></tr>
-		<tr><td align=center>
-			<a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
-		</td></tr>
+</tr>
 </table>
-			&nbsp;<p>
-                        <center>
-                                Help: <a href="mailto:siteadmin-help@lists.gforge.inria.fr">siteadmin-help@lists.gforge.inria.fr</a> Webmaster: <a href="mailto:webmaster@gforge.inria.fr">webmaster@gforge.inria.fr</a>
-                        </center>
-			<!-- end main body row -->
-
-
-				</td>
-				<td width="10" bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="2" height="1" alt="" /></td>
-			</tr>
-			<tr>
-				<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-				<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
-			</tr>
-			</table>
-
-		<!-- end inner body row -->
-
-		</td>
-		<td width="10" bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="2" height="1" alt="" /></td>
-	</tr>
-	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomleft.png" height="9" width="9" alt="" /></td>
-		<td bgcolor="#E0E0E0" colspan="3"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomright.png" height="9" width="9" alt="" /></td>
-	</tr>
-</table>
-
-<!-- PLEASE LEAVE "Powered By Gforge" on your site -->
-<br />
-<center>
-<a href="http://gforge.org/"><img src="http://gforge.org/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0" /></a>
-</center>
-
-
+<div id="footer" align="center">
+<p>
+ Help: <a href="mailto:siteadmin-help@lists.gforge.inria.fr">siteadmin-help@lists.gforge.inria.fr</a> Webmaster: <a href="mailto:webmaster@gforge.inria.fr">webmaster@gforge.inria.fr</a>
+
+</p>
+<p>
+<ul class="footerlogos">
+	<li><a href="http://www.inria.fr/"><img align="left" src="logos/logo_INRIA.png" alt="INRIA"/></a>	
+	</li>
+	<li><a href="http://gforge.org/"><img src="http://gforge.org/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0"/></a>
+
+	</li>
+	<li><a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
+
+	</li>
+</ul>
+	
+</p>
+</div>
 </body>
 </html>
diff --git a/website/footer.html b/website/footer.html
index b59f02c7ab..44f2311b49 100644
--- a/website/footer.html
+++ b/website/footer.html
@@ -1,22 +1,22 @@
+<div id="footer" align="center">
 <p>
-<hr>
+ Help: <a href="mailto:siteadmin-help@lists.gforge.inria.fr">siteadmin-help@lists.gforge.inria.fr</a> Webmaster: <a href="mailto:webmaster@gforge.inria.fr">webmaster@gforge.inria.fr</a>
 
-<table width=100%>
-<tr>
-<td align=left>
-<a href="index.html"><b>
-Back to the main Simgrid Documentation page</b></a>
-</td>
-<td align=middle>
-<small>The version of Simgrid documented here is v@release_version@.<br/>
-Documentation of other versions can be found in their respective
-archive files (directory doc/html).
-</td>
-<td align=right>
-<small>Generated for SimGridAPI by
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 
-width=110 height=53></a> </small>
-</td>
-</tr>
-</table>
+</p>
+<p>
+<ul class="footerlogos">
+	<li><a href="http://www.inria.fr/"><img align="left" src="logos/logo_INRIA.png" alt="INRIA"/></a>	
+	</li>
+
+	<li><a href="http://gforge.org/"><img src="http://gforge.org/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0"/></a>
+
+	</li>
+	<li><a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
+
+	</li>
+</ul>
+	
+</p>
+</div>
+</body>
+</html>
diff --git a/website/header.html b/website/header.html
new file mode 100644
index 0000000000..cc56b39f70
--- /dev/null
+++ b/website/header.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsite.css" />
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsitetabs.css" />
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgrid.css" />	
+ 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems</title>
+	<meta name="keywords" content="Scalable, simulation, distributed systems, grid, peer-to-peer" /> 
+
+</head>
+
+<body>
+<div id="header" align="center">
+<p>
+<img src="logos/simgrid_logo.png"  alt="SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems" />
+</p>
+<h2 class="header"><i class="subtitle">Scalable simulation of distributed systems</i></h2>
+</div>
+<p/>
+<br/> 
+
diff --git a/website/img/tab_a.png b/website/img/tab_a.png
new file mode 100644
index 0000000000..2d99ef23fe
Binary files /dev/null and b/website/img/tab_a.png differ
diff --git a/website/img/tab_b.png b/website/img/tab_b.png
new file mode 100644
index 0000000000..b2c3d2be3c
Binary files /dev/null and b/website/img/tab_b.png differ
diff --git a/website/img/tab_h.png b/website/img/tab_h.png
new file mode 100644
index 0000000000..c11f48f19b
Binary files /dev/null and b/website/img/tab_h.png differ
diff --git a/website/img/tab_s.png b/website/img/tab_s.png
new file mode 100644
index 0000000000..978943ac80
Binary files /dev/null and b/website/img/tab_s.png differ
diff --git a/website/index.php.in b/website/index.php.in
index 1763ca7f55..25dfe2d20b 100644
--- a/website/index.php.in
+++ b/website/index.php.in
@@ -1,159 +1,103 @@
 <?php 
-
-$domain=ereg_replace('[^\.]*\.(.*)$','\1',$_SERVER['HTTP_HOST']);
-$group_name=ereg_replace('([^\.]*)\..*$','\1',$_SERVER['HTTP_HOST']);
-
-echo '<?xml version="1.0" encoding="UTF-8"?>';
+$domain="gforge.inria.fr";
+$group_name="simgrid";
 ?>
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en   ">
-<link href="doc/doxygen.css" rel="stylesheet" type="text/css">
-<link href="doc/tabs.css" rel="stylesheet" type="text/css">
-
-  <head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsite.css" />
+	<link rel="stylesheet" type="text/css" href="stylesheets/simgridsitetabs.css" />
+ 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems</title>
 	<meta name="keywords" content="Scalable, simulation, distributed systems, grid, peer-to-peer" /> 
-	<script language="JavaScript" type="text/javascript">
-	<!--
-	function help_window(helpurl) {
-		HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
-	}
-	// -->
-		</script>
-
-<style type="text/css">
-	<!--
-	BODY {
-		margin-top: 3;
-		margin-left: 3;
-		margin-right: 3;
-		margin-bottom: 3;
-		background: #5651a1;
-	}
-	ol,ul,p,body,td,tr,th,form { font-family: verdana,arial,helvetica,sans-serif; font-size:small;
-		color: #333333; }
-
-	h1 { font-size: x-large; font-family: verdana,arial,helvetica,sans-serif; }
-	h2 { font-size: large; font-family: verdana,arial,helvetica,sans-serif; }
-	h3 { font-size: medium; font-family: verdana,arial,helvetica,sans-serif; }
-	h4 { font-size: small; font-family: verdana,arial,helvetica,sans-serif; }
-	h5 { font-size: x-small; font-family: verdana,arial,helvetica,sans-serif; }
-	h6 { font-size: xx-small; font-family: verdana,arial,helvetica,sans-serif; }
-
-	pre,tt { font-family: courier,sans-serif }
-
-	a:link { text-decoration:none }
-	a:visited { text-decoration:none }
-	a:active { text-decoration:none }
-	a:hover { text-decoration:underline; color:red }
-
-	.titlebar { color: black; text-decoration: none; font-weight: bold; }
-	a.tablink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tablink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tablink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
-	a.tabsellink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tabsellink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
-	a.tabsellink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
-	-->
-</style>
 
 </head>
 
 <body>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
-	<tr>
-        <td style="text-align: left; vertical-align: top;"><a href="http://<?php echo $domain; ?>/projects/<?php echo $group_name; ?>"><img
-          src="simgrid_logo_small.png"
-          style="text-decoration: underline;" border="0" alt="SimGrid">
-          <?php if (date('m') == '04'  && date('d') == '01')  {echo '<img style="text-decoration: underline;" border="0" alt="SimGrid" src="fish.gif">';}?>
-          </a><br>
-        </td>
-         <td style="text-align: left; vertical-align: top;">
-        </td>
-		<td style="text-align: right; vertical-align: top;"><a href="http://<?php echo $domain; ?>"><img src="http://<?php echo $domain; ?>/themes/inria/images/logo.png" border="0" alt="gforge INRIA" width="198" height="52" /></a></td>
-	</tr>
-</table>
-______ONGLETS______
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="3">
-
-
-		<!-- start tabs -->
-
-	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topleft.png" height="9" width="9" alt="" /></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="30" height="1" alt="" /></td>
-		<td bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="30" height="1" alt="" /></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topright.png" height="9" width="9" alt="" /></td>
-	</tr>
-
-	<tr>
-
-		<!-- Outer body row -->
-
-		<td bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="10" height="1" alt="" /></td>
-		<td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
-
-			<!-- Inner Tabs / Shell -->
-
-			<table border="0" width="100%" cellspacing="0" cellpadding="0">
-			<tr>
-				<td align="left" bgcolor="#ffffff" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-				<td align="right" bgcolor="#ffffff" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/topright-inner.png" height="9" width="9" alt="" /></td>
-			</tr>
-
-			<tr>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="10" height="1" alt="" /></td>
-				<td valign="top" width="99%" bgcolor="white">
-
-	<!-- whole page table -->
-<table width="100%" cellpadding="5" cellspacing="0" border="0">
-<tr><td width="65%" valign="top">
-<?php if ($handle=fopen('http://'.$domain.'/export/projtitl.php?group_name='.$group_name,'r')){
-$contents = '';
-while (!feof($handle)) {
-	$contents .= fread($handle, 8192);
-}
-$contents=str_replace("Welcome to", "Welcome to the", $contents);
-fclose($handle);
-echo $contents; } ?>
-______BODY______
-
+<div id="header" align="center">
+<p>
+<img src="logos/simgrid_logo.png"  alt="SimGrid - Scalable simulation of distributed systems, ranging from grids to peer-to-peer systems" />
+</p>
+<h2 class="header"><i class="subtitle">Scalable simulation of distributed systems</i></h2>
+</div>
+<p/>
+<br/> 
+ <div id="navrow1" class="tabs" align="center">
+    <ul class="tablist">
+      <li><a href="index.php"><span>Home</span></a></li>
+                        <li><a href="https://gforge.inria.fr/frs/?group_id=12"><span>Download</span></a></li>
+
+      <li><a href="documentation.php"><span>Online documentation</span></a></li>
+      <li><a href="publis.html"><span>Publications</span></a></li>
+      <li><a href="people.html"><span>People</span></a></li>
+      <li><a href="history.html"><span>History</span></a></li>
+      <li><a href="contrib.html"><span>Contrib</span></a></li>
+      <li><a href="faq.html"><span>FAQ&#160;Page</span></a></li>
+
+      <li><a href="http://gforge.inria.fr/projects/simgrid"><span>SimGrid&#160;Forge</span></a></li>
+    </ul>
+  </div>
+<table width="80%" cellpadding="5" cellspacing="0" border="0" align="center">
+
+<tr><td width="75%" valign="top">
+<h1>Welcome to the SimGrid project!</h1>
+<h1>SimGrid in a nutshell:</h1>
+<p>SimGrid is a toolkit that provides core functionalities for the simulation of distributed applications in heterogeneous distributed environments. The specific goal of the project is to facilitate research in the area of parallel and distributed large scale systems, such as Grids, P2P systems and clouds. Its use cases encompass heuristic evaluation, application prototyping or even real application development and tuning
+</p>
+<h2>What SimGrid can do for you ?</h2>
+<ul>
+
+<li>
+<b>SimGrid as a Grid Simulator</b>: Accurate yet fast simulation models
+</li>
+<li>
+<b>SimGrid as a P2P simulator</b>: Highly scalable simulations (we managed to simulate 2M hosts on a single machine (see <a href="http://hal.inria.fr/inria-00602216/">here for an example of it</a>)
+</li>
+<li>
+<b>SimGrid as a MPI simulator</b>: SimGrid provides an API to simulate reallisticaly MPI simulation
+</li>
+<li><b>And so much more</b>: SimGrid comes with a whole ecosystem of applications, for example tools to visualize and analyse your simulation results and traces, platform generation ..., and with so fancy features to help you to handle your platform dynamicity simulation (quantitative resource sharing or qualitative churn)
+</li>
+</ul>
+<h2>Main strengths</h2>
+<ul>
+
+<li><b>Scalable</b>: Fast, low memory footprint</li>
+<li><b>Sound simulation models</b>: theoretically and experimentally assessed</li>
+<li><b>Portable</b>: Unix/ Windows ; Numerous bindings (write your simulators in C, Lua or Java or Ruby)</li>
+<li><b>User interfaces</b>: models and API to simulate many different distributed systems, ranging from grid to peer-to-peer</li>
+</ul>
+
+
+<h2>Tool dissemination</h2>
+<ul>
+
+<li>Grounded experiments of +50 scientific papers</li>
+<li>+100 member of the simgrid-user mailing list</li>
+<li>+5 associated tools provided by the community</li>
+</ul>
+<h2>Would you like to know more? </h2>
+<ul>
+<li>The <a href="documentation.php">documentation</a> contains docs for the latests version of the tool. Each documentation contains examples, description of the different modules of the projects, and many more</li>
+<li>In case of trouble, try to ask the mailing list !</li>
+<li>A tutorial is also available <a href="http://www.loria.fr/~quinson/articles/simgrid-tutorial.pdf ">here</a></li>
+<li>Are you interested on the scientific ground of SimGrid ? Take a look at our <a href="publis.html">publications</a> !</li>
+<li>Do you want to know the whole story of SimGrid, since when it all began ? <a href="history.html">Here is the tale of SimGrid</a></li>
+<!--li>Is SimGrid is actually maintained ? So many other related projects have died due to a lack of resources or good scientific ground, but we're alive since more than 10 years.  Will SimGrid survive to next years ? Take a look at our <a href="IhaveToWriteIT.html">foundation section</a></li-->
+</ul>
+
+<h1></h1>
 </td>
-
-<td width="35%" valign="top">
-
-		<table cellspacing="0" cellpadding="1" width="100%" border="0" bgcolor="#d5d5d7">
+<td width="25%" valign="top">
+		<table cellspacing="0" cellpadding="1" width="100%" border="0">
 		<tr><td>
-			<table cellspacing="0" cellpadding="2" width="100%" border="0" bgcolor="#eaecef">
-				<tr style="background-color:#d5d5d7" align="center">
-					<td colspan="2"><span class="titlebar">Project Summary</span></td>
+			<table cellspacing="0" cellpadding="2" width="100%" border="0" class="tablecontent">
+				<tr  align="center">
+					<td colspan="2"></td>
 				</tr>
 				<tr align="left">
 					<td colspan="2">
-
-<?php if($handle=fopen('http://'.$domain.'/export/projhtml.php?group_name='.$group_name,'r')){
-$contents = '';
-while (!feof($handle)) {
-	$contents .= fread($handle, 8192);
-}
-fclose($handle);
-$contents=str_replace('href="/','href="http://'.$domain.'/',$contents);
-$contents=str_replace('src="/','src="http://'.$domain.'/',$contents);
-echo $contents; } ?>
-<br>
-<hr>
-<br>
 <?php if ($handle=fopen('http://'.$domain.'/export/projnews.php?group_name='.$group_name,'r')){
 $contents = '';
 while (!feof($handle)) {
@@ -168,47 +112,28 @@ echo $contents; } ?>
 				</tr>
 			</table>
 		</td></tr>
-		</table><p>&nbsp;</p>
-</td></tr>
-		<tr><td align=center>
-			<a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
-		</td></tr>
-</table>
-			&nbsp;<p>
-                        <center>
-                                Help: <a href="mailto:siteadmin-help@lists.gforge.inria.fr">siteadmin-help@lists.gforge.inria.fr</a> Webmaster: <a href="mailto:webmaster@gforge.inria.fr">webmaster@gforge.inria.fr</a>
-                        </center>
-			<!-- end main body row -->
-
-
-				</td>
-				<td width="10" bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="2" height="1" alt="" /></td>
-			</tr>
-			<tr>
-				<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
-				<td bgcolor="#ffffff"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-				<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
-			</tr>
-			</table>
-
-		<!-- end inner body row -->
-
-		</td>
-		<td width="10" bgcolor="#E0E0E0"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="2" height="1" alt="" /></td>
-	</tr>
-	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomleft.png" height="9" width="9" alt="" /></td>
-		<td bgcolor="#E0E0E0" colspan="3"><img src="http://<?php echo $domain; ?>/themes/inria/images/clear.png" width="1" height="1" alt="" /></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="http://<?php echo $domain; ?>/themes/inria/images/tabs/bottomright.png" height="9" width="9" alt="" /></td>
-	</tr>
+		</table>
+</td>
+</tr>
 </table>
-
-<!-- PLEASE LEAVE "Powered By Gforge" on your site -->
-<br />
-<center>
-<a href="http://gforge.org/"><img src="http://gforge.org/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0" /></a>
-</center>
-
-
+<div id="footer" align="center">
+<p>
+ Help: <a href="mailto:siteadmin-help@lists.gforge.inria.fr">siteadmin-help@lists.gforge.inria.fr</a> Webmaster: <a href="mailto:webmaster@gforge.inria.fr">webmaster@gforge.inria.fr</a>
+
+</p>
+<p>
+<ul class="footerlogos">
+	<li><a href="http://www.inria.fr/"><img align="left" src="logos/logo_INRIA.png" alt="INRIA"/></a>	
+	</li>
+	<li><a href="http://gforge.org/"><img src="http://gforge.org/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0"/></a>
+
+	</li>
+	<li><a href="http://creativecommons.org/licenses/LGPL/2.1/"><img alt="CC-GNU LGPL" border="0" src="http://creativecommons.org/images/public/cc-LGPL-a.png" /></a>
+
+	</li>
+</ul>
+	
+</p>
+</div>
 </body>
 </html>
diff --git a/website/logos/logo_INRIA.png b/website/logos/logo_INRIA.png
new file mode 100644
index 0000000000..06b9cf0228
Binary files /dev/null and b/website/logos/logo_INRIA.png differ
diff --git a/website/logos/logo_LGPL.png b/website/logos/logo_LGPL.png
new file mode 100644
index 0000000000..faeac30675
Binary files /dev/null and b/website/logos/logo_LGPL.png differ
diff --git a/website/logos/simgrid_logo.png b/website/logos/simgrid_logo.png
new file mode 100644
index 0000000000..2ff15a6e4f
Binary files /dev/null and b/website/logos/simgrid_logo.png differ
diff --git a/website/stylesheets/simgrid.css b/website/stylesheets/simgrid.css
new file mode 100644
index 0000000000..fbca276569
--- /dev/null
+++ b/website/stylesheets/simgrid.css
@@ -0,0 +1,19 @@
+/* Table Of Content styles, by Martin Quinson (but not original at all) */
+DIV.toc  {
+       background-color: #e8eef2;
+       border: 1px solid #84b0c7;
+       font-size: 120%;
+       display: block;
+       float: right;
+       margin: 10px;
+       padding: 10px;
+ 	padding-top: 0px;
+	padding-bottom: 0px;
+	width:40%;
+}
+
+DIV.tocTitle {
+	text-align: center;
+	font-weight: bold;	
+	font-size: 130%;
+}
diff --git a/website/stylesheets/simgridsite.css b/website/stylesheets/simgridsite.css
new file mode 100644
index 0000000000..23b68fc3fd
--- /dev/null
+++ b/website/stylesheets/simgridsite.css
@@ -0,0 +1,92 @@
+/**** page main layout ****/
+body {
+  margin: 0px;
+  padding: 0px 0px 10px 0px;  
+}
+/** Header layout ***/
+#header {text-align: center;
+padding:0;  margin:0 auto;
+list-style:none; 
+width:100%; height:150px; 
+font-size:16px; color:#888; font-weight:normal; margin-top:15px;
+ }
+h1 {
+color:#e33729; background:#fff;
+}
+
+/*** Main sections layout ***/
+#main {text-align: left;
+padding:0;  margin:0 auto;
+list-style:none; 
+width:1000px;  
+font-size:16px; color:#000; font-weight:normal; margin-top:15px;
+ }
+h1 {
+color:#e33729; background:#fff;
+}
+h2 {
+color:#e33729; background:#fff;
+}
+h3 {
+color:#e33729; background:#fff;
+}
+
+.subtitle {
+color:#000;
+}
+/*** hyperrefs ***/
+a {
+ text-decoration: none;
+}
+h4 a {
+color:#e33729; background:#fff;
+}
+
+/*** Courses special layout ***/
+div.course div.description {display:none}
+div.touch:hover + div.description {display:block}
+div.touch{font-size:12px; color:#888; font-weight:normal;}
+
+/** Footer layout ***/
+#footer {text-align: center;
+padding:0;  margin:0 auto;
+list-style:none; 
+width:1000px; height:200px; 
+font-size:12px; color:#888; font-weight:normal; margin-top:15px;
+ }
+/*** Footer logos ***/
+ul.footerlogos {padding:0; margin:0 auto; list-style:none; width:600px; height:100px; position:relative;}
+ul.footerlogos li {width:200px; height:100px; float:left;}
+
+ul.footerlogos li a {display:block; width:150px; height:50px; padding:25px; font-family:arial, sans-serif; color:#666; text-decoration:none; font-size:12px;
+-webkit-transition: 0.1s;
+-moz-transition: 0.1s;
+-o-transition: 0.1s;
+transition: 0.1s;
+}
+
+ul.footerlogos li:hover > a {text-align:center; height:64px; padding:18px; cursor:pointer;}
+/*** avoiding borders ***/
+a img
+{
+border: none;
+}
+/*** For the latest news ***/
+.tablecontent {background:#f6f6f6;
+}
+.titlebar {
+font-size:20px;
+}
+
+/*** For doc generated title div ***/
+div.title {
+text-align: center;
+color:#e33729; background:#fff;
+font-size:25px;
+}
+/*** For fitting with the 80 rule for blog-styling in doxy-generated pages ***/
+div.contents {
+  margin-left: auto;
+  margin-right: auto;
+width:70%;
+}
diff --git a/website/stylesheets/simgridsitetabs.css b/website/stylesheets/simgridsitetabs.css
new file mode 100644
index 0000000000..fe92655fea
--- /dev/null
+++ b/website/stylesheets/simgridsitetabs.css
@@ -0,0 +1,60 @@
+.tabs, .tabs2, .tabs3 {
+    background-image: url('../img/tab_b.png');
+    width: 100%;
+    z-index: 101;
+    font-size: 13px;
+    align:center;		
+}
+
+.tabs2 {
+    font-size: 10px;
+}
+.tabs3 {
+    font-size: 9px;
+}
+
+.tablist {
+    margin: 0;
+    padding: 0;
+    display: table;
+}
+
+.tablist li {
+    float: left;
+    display: table-cell;
+    background-image: url('../img/tab_b.png');
+    line-height: 36px;
+    list-style: none;
+}
+
+.tablist a {
+    display: block;
+    padding: 0 20px;
+    font-weight: bold;
+    background-image:url('../img/tab_s.png');
+    background-repeat:no-repeat;
+    background-position:right;
+    color: #283A5D;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+    text-decoration: none;
+    outline: none;
+}
+
+.tabs3 .tablist a {
+    padding: 0 10px;
+}
+
+.tablist a:hover {
+    background-image: url('../img/tab_h.png');
+    background-repeat:repeat-x;
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
+    text-decoration: none;
+}
+
+.tablist li.current a {
+    background-image: url('../img/tab_a.png');
+    background-repeat:repeat-x;
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
+}