From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 4 Apr 2006 15:39:11 +0000 (+0000)
Subject: Using brand new logo.
X-Git-Tag: v3.3~3276
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/68fcf941103f800b3170fab73a1c2dfdb0ffd4a7

Using brand new logo.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2082 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/Makefile.am b/Makefile.am
index eece4fd2f6..f93456f03c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ sync-gforge:
 	    --recursive --links --perms --times --omit-dir-times  \
 	    doc/html/ scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/doc/ || true
 	scp doc/index.php scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
-	scp doc/simgrid_logo_small2.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+	scp doc/simgrid_modules.png doc/simgrid_logo.png doc/simgrid_logo_small.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
 	ssh scm.gforge.inria.fr "chgrp -R simgrid /var/lib/gforge/chroot/home/groups/simgrid/htdocs/"
 	ssh scm.gforge.inria.fr "chmod g+rw -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7e1b73eaff..21f3cd3fc7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \
  $(shell find @srcdir@ -name "*.doc")
 FIGS=simgrid_modules.fig amok_bw_test.fig
-PNGS=$(patsubst %.fig,%.png,$(FIGS)) simgrid_logo.png
+PNGS=$(patsubst %.fig,%.png,$(FIGS)) simgrid_logo.png simgrid_logo_small.png
 
 EXTRA_DIST = html Doxyfile \
  modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html \
@@ -14,7 +14,7 @@ MAINTAINERCLEANFILES = html
 
 if MAINTAINER_MODE
 simgrid_modules.map: fig/simgrid_modules.fig
-	fig2dev -Lmap simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
+	fig2dev -Lmap fig/simgrid_modules.fig | grep -e IMG -e MAP -e AREA | \
 	sed 's/imagemap/simgrid_modules/g' | sed 's/\.gif/.png/' | \
 	sed 's/<IMG /<IMG style="border:0px "/g' | sed 's/\.gif/.png/' \
 	> simgrid_modules.map
diff --git a/doc/index.php.in b/doc/index.php.in
index 045ac3d856..4c200145e7 100644
--- a/doc/index.php.in
+++ b/doc/index.php.in
@@ -67,8 +67,8 @@ echo '<?xml version="1.0" encoding="UTF-8"?>';
 
 	<tr>
 		<td style="text-align: left; vertical-align: top;"><a href="http://<?php echo $domain; ?>/projects/<?php echo $group_name; ?>"><img
-		  src="simgrid_logo_small2.png"
-		  style="width: 220px; height: 54px; text-decoration: underline;" border="0" alt="SimGrid"></a><br>
+		  src="simgrid_logo_small.png"
+		  style="text-decoration: underline;" border="0" alt="SimGrid"></a><br>
 		</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>
diff --git a/doc/simgrid_logo.png b/doc/simgrid_logo.png
index 118e761486..2ff15a6e4f 100644
Binary files a/doc/simgrid_logo.png and b/doc/simgrid_logo.png differ
diff --git a/doc/simgrid_logo_small.png b/doc/simgrid_logo_small.png
new file mode 100644
index 0000000000..a95374a6dd
Binary files /dev/null and b/doc/simgrid_logo_small.png differ
diff --git a/doc/simgrid_modules.jpg b/doc/simgrid_modules.jpg
deleted file mode 100644
index 3d3456ff8e..0000000000
Binary files a/doc/simgrid_modules.jpg and /dev/null differ