Minor fixes in board name for the screenshot site.

Fixed screenshot web site generator

7 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 5bb99ef..0c849d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+	*** RELEASE 7.3 ***
+
+2006-02-18  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	* configure.in: Release 7.3 Final
+
 2006-02-17  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	* docs/spip_screenshot_remove.pl: new tool to remove old screenshots article
diff --git a/boards/tangram.xml.in b/boards/tangram.xml.in
index c24fd39..7c8cfbd 100644
--- a/boards/tangram.xml.in
+++ b/boards/tangram.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
   <Board 
-	 name="gtans"
+	 name="tangram"
 	 type="gtans" 
 	 section="/puzzle"
 	 mode="normal" 
diff --git a/configure.in b/configure.in
index e047caf..1bbf863 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 7.3RC1)
+AM_INIT_AUTOMAKE(gcompris, 7.3)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/docs/gcompris2spip.pl b/docs/gcompris2spip.pl
index d2baf75..a1095dd 100755
--- a/docs/gcompris2spip.pl
+++ b/docs/gcompris2spip.pl
@@ -324,7 +324,8 @@ foreach my $board (@files) {
     push(@sections, \@section);
   }
 
-  if($board_content =~ /difficulty=\"0\"/) {
+  # Skip experimental activities
+  if($board_content =~ /section=\"\/experimental\"/) {
     goto done;
   }
   # Some filtering
@@ -362,9 +363,11 @@ foreach my $onesection (@sections) {
     my $langstrip = $lang;
     $langstrip =~ s/\@/_/g;
 
-    my $output = `xsltproc --stringparam language $lang --stringparam langstrip $langstrip --stringparam date "${date}" --stringparam article_id ${article_id} --stringparam rubrique_id $rubriques{$lang} --stringparam section $section --stringparam name $name --stringparam section_id $sections{$lang} --stringparam traduction_id ${traduction_id} $xslfile $all_boards_file`;
+    my $cmd = "xsltproc --stringparam language $lang --stringparam langstrip $langstrip --stringparam date \"${date}\" --stringparam article_id ${article_id} --stringparam rubrique_id $rubriques{$lang} --stringparam section $section --stringparam name $name --stringparam section_id $sections{$lang} --stringparam traduction_id ${traduction_id} $xslfile $all_boards_file";
+    my $output = `$cmd`;
 
-    #print "xsltproc --stringparam language $lang --stringparam date \"${date}\" --stringparam article_id ${article_id} --stringparam rubrique_id $rubriques{$lang} --stringparam section $section --stringparam name $name --stringparam section_id $sections{$lang} --stringparam traduction_id ${traduction_id} $xslfile $all_boards_file\n";
+    # Uncomment to debug
+    #print "$cmd\n";
 
     if ($?>>8) {
       print "#\n";
@@ -404,8 +407,9 @@ foreach my $board (@files) {
   print "\nProcessing $board\nLang:";
 
   # Skip some boards
-  if($board eq "administration.xml") {
-    print " (administration is skipped)";
+  if($board eq "administration.xml" ||
+     $board eq "experimental.xml") {
+    print " ($board is skipped)";
     next;
   }
 
@@ -422,7 +426,7 @@ foreach my $board (@files) {
 
     print "$lang ";
 
-    # Remove @ from some langage to avoid non URL char
+    # Remove @ from some language to avoid non URL char
     my $langstrip = $lang;
     $langstrip =~ s/\@/_/g;
 
@@ -471,11 +475,11 @@ open(FILEWRITE, "> $output_file");
 my $line = 0;
 while (<FILEREAD>){
   my $line = $_;
-  m/href=\"(\w+:\w+\.xml)/g;
+  m/href=\"(\w+:[a-zA-Z0-9_-]+\.xml)/g;
   if(defined($articles{"$1"})) {
     print "Found article " . $articles{"$1"} . "\n";
     my $article = "article.php3?id_article=$articles{$1}";
-    my $r = s/(^.*)(href=\")(\w+:\w+\.xml)(.*)/$1$2$article$4/g;
+    my $r = s/(^.*)(href=\")(\w+:[a-zA-Z0-9_-]+\.xml)(.*)/$1$2$article$4/g;
   }
   print FILEWRITE;
 }
diff --git a/docs/screenshots/tangram.jpg b/docs/screenshots/tangram.jpg
new file mode 100644
index 0000000..fba4510
--- /dev/null
+++ b/docs/screenshots/tangram.jpg
diff --git a/docs/screenshots/tangram_small.jpg b/docs/screenshots/tangram_small.jpg
new file mode 100644
index 0000000..9ac7d36
--- /dev/null
+++ b/docs/screenshots/tangram_small.jpg
diff --git a/docs/spip_menuboard.xsl b/docs/spip_menuboard.xsl
index 450e290..bf30854 100644
--- a/docs/spip_menuboard.xsl
+++ b/docs/spip_menuboard.xsl
@@ -70,7 +70,7 @@
 
               <P class="flottante">
                 <A>
-                  <xsl:attribute name="href" align="center">
+                  <xsl:attribute name="href">
                     <xsl:value-of select="concat($language,':',@name,'.xml')"/>
                   </xsl:attribute>
                   <IMG border="0" align="top" alt="">