diff --git a/fsfeurope.css b/fsfeurope.css new file mode 100644 index 0000000000..91613bc92b --- /dev/null +++ b/fsfeurope.css @@ -0,0 +1,192 @@ +/* ========================================================================= */ +/* Style sheet for fsfeurope.org */ +/* ========================================================================= */ + +/* Colors to use: + * #202D79 - fsfe blue (the letters "fsfe" in the logo) + * #3394CE - blue dark (the bottom star) + * #4AD2F0 - blue medium (the middle star) + * #6BB340 - green mix (the overlap of the middle and the top star) + * #D0F400 - green (the top star) + * */ + +/* ------------------------------------------------------------------------- */ +/* General definitions */ +/* ------------------------------------------------------------------------- */ + +body { + margin: 0; + padding: 1em 0; + background: #FDFDFD; + color: #151515; + font-family: Nimbus Sans L, Helvetica, Verdana, sans-serif; + font-size: 100.01%; /* FIXME: What does this do? */ +} + +a { + color: #202D79; +} + +a:visited { + color: #314C14; /* like green mix, but darker */ +} + +/* ------------------------------------------------------------------------- */ +/* Logo and Focus */ +/* ------------------------------------------------------------------------- */ + +td.focus-box { + border-left: thin solid #202D79; + width: 13em; +} + +/* ------------------------------------------------------------------------- */ +/* Language List */ +/* ------------------------------------------------------------------------- */ + +td.line { + border-top: thin solid #202D79; + border-bottom: thin solid #202D79; +} + +.line a { + text-decoration: none; +} + +.line a:visited { + color: #202D79; +} + +.line a:hover, .line a:active, .line a:focus { + background: #D0F400; +} + +/* ------------------------------------------------------------------------- */ +/* Menu */ +/* ------------------------------------------------------------------------- */ + +td.menu { + border-left: thin solid #202D79; + width: 13em; + padding: 1em; + vertical-align: top; +} + +a.menu { + text-decoration: none; + font-size: 15px; + font-weight: bold; +} + +a.submenu { + text-decoration: none; + font-size: 13px; + padding-left: 2em; +} + +a.menu:visited, a.submenu:visited { + color: #202D79; +} + +a.menu:hover, a.menu:active, a.menu:focus, a.submenu:hover, a.submenu:active, a.submenu:focus { + background: #D0F400; +} + +/* ------------------------------------------------------------------------- */ +/* Content */ +/* ------------------------------------------------------------------------- */ + +td.body { + padding: 0 1.5em; + width: 99%; + vertical-align: top; +} + +.body { + margin-left 20px; + margin-right 20px; +} + +.body h1 { + text-align: center; + color: #202D79; +} + +.body h2 { + margin-left 0px; + color: #202D79; +} + +.body h3 { + margin-left 0px; + color: #202D79; +} + +/* ------------------------------------------------------------------------- */ +/* Styles used only on some pages */ +/* ------------------------------------------------------------------------- */ + +/* News and event items */ + +table.news { + margin: 0px; + border-spacing: 0px; + padding: 4px; +} + +td.newstitle { + margin: 0px; + border-bottom: thin solid #202D79; + border-left: thin solid #202D79; + padding: 4px; + text-align: left; + font-weight: bold; +} + +td.newsdate { + margin: 0px; + border-bottom: thin solid #202D79; + padding: 4px; + text-align: right; + font-weight: bold; +} + +/* Project list */ + +th.projects { + width: 20%; +} + +td.projects { + vertical-align: top; +} + +/* Other stuff */ + +/* FIXME: replace with something else! */ +.indent { + margin-right: 30px; + margin-left: 40px; +} + +/* FIXME: Use blockquote instead for real quotations */ +.quote { + font-style:italic; + margin-right: 40px; + margin-left: 50px; +} + +p.footnote { + margin-right: 30px; + margin-left: 40px; +} + +/* FIXME: this is probably not really code... */ +code.footnote { + font-weight: bold; +} + +/* FIXME: Use instead */ +span.emph { + font-weight: bold; +} diff --git a/fsfeurope.xsl b/fsfeurope.xsl new file mode 100644 index 0000000000..551d6dc1ad --- /dev/null +++ b/fsfeurope.xsl @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + DO NOT MODIFY THIS DOCUMENT. IT WAS GENERATED BY XSLT PROCESSING + AND YOUR MODIFICATIONS WILL BE LOST. THE SOURCE OF THE DOCUMENT + IS IN THE .xml FILE USE make all TO REGENERATE + + + + + + + + + + + + + + + + + +
+ [FSFE Logo] + + + + + + +
+
+
+

+ + +
+
+
+
+
+ + + + + + + + + ..html + + + + + + +
+ + +
+ + +
+
+ + + + + + + +
+ + + + + +
+ + + + +
+ Join the Fellowship +
+ + + +
+
+ + + + + + + + + + + + + + + + + () + + + + + + /source + + . + + .xhtml + + [XHTML] + + + + + + + + + + + + .en.html + + + + + + +
+ + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/logo.png b/graphics/logo.png new file mode 100644 index 0000000000..ddbc76657a Binary files /dev/null and b/graphics/logo.png differ diff --git a/tools/build.pl b/tools/build.pl index 1e03b6517d..02a8ba349c 100644 --- a/tools/build.pl +++ b/tools/build.pl @@ -37,6 +37,7 @@ use POSIX qw(strftime); # our %countries = ( global => 'en', + test => 'en', de => 'de', es => 'es', it => 'it', @@ -140,6 +141,9 @@ my $xslt_parser = XML::LibXSLT->new(); my $global_style_doc = $parser->parse_file($opts{i}."/fsfe-new.xsl"); my $global_stylesheet = $xslt_parser->parse_stylesheet($global_style_doc); +my $test_style_doc = $parser->parse_file($opts{i}."/fsfeurope.xsl"); +my $test_stylesheet = $xslt_parser->parse_stylesheet($test_style_doc); + # # First topic of today: create all directories we need. Instead of creating # these as they are used, we create them in a batch at the beginning of each @@ -472,7 +476,11 @@ while (my ($file, $langs) = each %bases) { # # Do the actual transformation. # - my $results = $global_stylesheet->transform($dom); + if ($dir eq "test") { + my $results = $test_stylesheet->transform($dom); + } else { + my $results = $global_stylesheet->transform($dom); + } # # In post-processing, we replace links pointing back to ourselves diff --git a/tools/build.sh b/tools/build.sh index 86c24ef883..12fab325d8 100644 --- a/tools/build.sh +++ b/tools/build.sh @@ -88,15 +88,6 @@ echo "$(date) Obfuscating email addresses." # files to operate on to those files that actually contain an '@'. find ${TMP} -type f -name "*.html" | xargs grep -l '@' | xargs sed -i 's/@/\@/g' -# ----------------------------------------------------------------------------- -echo "$(date) Creating test site." -# ----------------------------------------------------------------------------- - -cp -rf ${TMP}/global ${TMP}/test -for file in $(find ${TMP}/test -name "*.test.*"); do - ln -sf $(basename ${file}) ${file/.test/} -done - # ----------------------------------------------------------------------------- echo "$(date) Activating new output." # -----------------------------------------------------------------------------