[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4122 - trunk/htdocs
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4122 - trunk/htdocs |
|
Date: |
Tue, 13 Apr 2010 01:30:18 +0200 |
Author: grumbel
Date: 2010-04-13 01:30:17 +0200 (Tue, 13 Apr 2010)
New Revision: 4122
Added:
trunk/htdocs/default.css.sed
trunk/htdocs/desert.css.sed
Modified:
trunk/htdocs/Makefile
trunk/htdocs/default.css
trunk/htdocs/default.xsl
trunk/htdocs/levelbuilding-tutorial.xml
trunk/htdocs/manual.xml
trunk/htdocs/news_old.xml
Log:
Some experimentation with different themes for the page
Modified: trunk/htdocs/Makefile
===================================================================
--- trunk/htdocs/Makefile 2010-04-12 19:08:16 UTC (rev 4121)
+++ trunk/htdocs/Makefile 2010-04-12 23:30:17 UTC (rev 4122)
@@ -1,5 +1,7 @@
OUTPUTFILES = \
build/default.css \
+ build/desert.css \
+ build/snow.css \
build/index.html \
build/welcome.html \
build/news.html \
@@ -33,16 +35,24 @@
clean :
rm -vf $(OUTPUTFILES)
-build/default.css : default.css
- cp -v $< $@
+build/default.css : default.css default.css.sed
+ sed -f "default.css.sed" $< > $@
+build/snow.css : default.css default.css.sed
+ sed -f "default.css.sed" $< > $@
+
+build/desert.css : default.css desert.css.sed
+ sed -f "desert.css.sed" $< > $@
+
build/index.html : index.html
cp -v $< $@
build/%.html :: %.xml default.xsl Makefile
+ @echo
"----------------------------------------------------------------------------"
FILENAME=$<; \
echo $${FILENAME%%.xml}; \
- xsltproc -param filename "'$${FILENAME%%.xml}'" --output $@ default.xsl
$<
+ xsltproc -param filename "'$${FILENAME%%.xml}'" --output $@ default.xsl
$<; \
+ tidy -modify -quiet -ashtml $@
upload: all
rsync --checksum --exclude "old/" --cvs-exclude -rv build/ \
Modified: trunk/htdocs/default.css
===================================================================
--- trunk/htdocs/default.css 2010-04-12 19:08:16 UTC (rev 4121)
+++ trunk/htdocs/default.css 2010-04-12 23:30:17 UTC (rev 4122)
@@ -1,16 +1,15 @@
body
{
- font-family: sans;
+ font-family: sans-serif;
background-position: left top;
- background-image: url("images/snow_background.jpg");
+ background-image: url($BACKGROUND-IMAGE$);
background-repeat: repeat-x;
- background-color: black;
+ background-color: $COLOR-BACKGROUND$;
background-attachment:fixed;
color: black;
- /* desert #cdb09e; */
}
-#title
+#logo
{
text-align: center;
padding: 0;
@@ -19,11 +18,32 @@
#pagebody
{
- width: 70em;
+ width: 60em;
margin-left: auto;
margin-right: auto;
}
+#footer {
+ color: black;
+ font-size: smaller;
+ font-family: sans-serif;
+
+ text-align: right;
+ background: $COLOR-PAGEHEADER$;
+ padding: 5px;
+ border-style: none solid solid solid;
+ border-color: COLOR-BACKGROUND;
+ border-width: 1px;
+ margin-top: 0;
+
+ -moz-border-radius: 0em 0em 0.5em 0.5em;
+ -webkit-border-radius: 0em 0em 0.5em 0.5em;
+}
+
+#footer a {
+ text-decoration: none;
+}
+
ul.screenshotmenu
{
font-weight: bold;
@@ -32,11 +52,12 @@
margin: 0 auto 1.5em auto;
padding: 0.25em 0em;
text-align: center;
- background-color: #809fbb;
+ background-color: $COLOR-PAGEHEADER$;
border-style: solid;
border-width: 1px;
-moz-border-radius: 1em;
-webkit-border-radius: 1em;
+ border-radius: 1em;
}
ul.screenshotmenu li
@@ -56,11 +77,12 @@
background-color: white;
-moz-border-radius: 1em;
-webkit-border-radius: 1em;
+ border-radius: 1em;
}
h1,h2,h3,h4
{
- font-family: sans;
+ font-family: sans-serif;
margin-top: 0px;
}
@@ -72,16 +94,19 @@
padding-left: 0.5em;
}
-h1
+#pagetitle
{
+ border-radius: 0.5em 0.5em 0em 0em;
-moz-border-radius: 0.5em 0.5em 0em 0em;
-webkit-border-radius: 0.5em 0.5em 0em 0em;
- background: #809fbb;
+ background: $COLOR-PAGEHEADER$;
color: white;
border-style: solid solid none solid;
border-color: black;
border-width: 1px;
padding-left: 3em;
+ padding-top: 0.125em;
+ padding-bottom: 0.125em;
position: relative;
margin-top: 0;
margin-bottom: 0;
@@ -131,14 +156,14 @@
font-size: 1em;
font-weight: bold;
- font-family: sans;
+ font-family: sans-serif;
text-align: center;
border-color: black;
border-style: solid solid none solid;
border-width: 1px;
- background-color: #607f9b;
+ background-color: $COLOR-PAGEHEADER-DIMMED$;
display: inline-block;
position: relative;
@@ -147,15 +172,15 @@
a.menuitem:hover
{
- background-color: #E0FfFF;
+ background-color: $COLOR-PAGEHEADER-LIGHT$;
}
a.menuitemcurrent
{
- background-color: #809fbb;
+ background-color: $COLOR-PAGEHEADER$;
border-bottom-style: solid;
- border-bottom-color: #809fbb;
+ border-bottom-color: $COLOR-PAGEHEADER$;
border-bottom-width: 1px;
position: relative;
@@ -194,7 +219,7 @@
font-size: 1.5em;
color: red;
background-color: black;
- font-family: Sans-Serif;
+ font-family: sans-serif;
border-style: solid;
border-color: red;
padding: .3em;
@@ -252,25 +277,4 @@
color: rgb(50,50,200);
}
-div.footer {
- color: black;
- font-size: smaller;
- font-family: sans;
-
- text-align: right;
- background: #607f9b;
- padding: 5px;
- border-style: none solid solid solid;
- border-color: black;
- border-width: 1px;
- margin-top: 0;
-
- -moz-border-radius: 0em 0em 0.5em 0.5em;
- -webkit-border-radius: 0em 0em 0.5em 0.5em;
-}
-
-div.footer a {
- text-decoration: none;
-}
-
/* EOF */
Added: trunk/htdocs/default.css.sed
===================================================================
--- trunk/htdocs/default.css.sed 2010-04-12 19:08:16 UTC (rev 4121)
+++ trunk/htdocs/default.css.sed 2010-04-12 23:30:17 UTC (rev 4122)
@@ -0,0 +1,5 @@
+s/\$BACKGROUND-IMAGE\$/"images\/snow_background.jpg"/g;
+s/\$COLOR-BACKGROUND\$/black/g;
+s/\$COLOR-PAGEHEADER\$/\#809fbb/g;
+s/\$COLOR-PAGEHEADER-DIMMED\$/\#607f9b/g;
+s/\$COLOR-PAGEHEADER-LIGHT\$/\#E0FfFF/g;
Modified: trunk/htdocs/default.xsl
===================================================================
--- trunk/htdocs/default.xsl 2010-04-12 19:08:16 UTC (rev 4121)
+++ trunk/htdocs/default.xsl 2010-04-12 23:30:17 UTC (rev 4122)
@@ -11,9 +11,6 @@
<xsl:param name="filename"/>
- <!-- <xsl:template match="processing-instruction()">
- </xsl:template> -->
-
<!-- Copy all html4 elements over to the resulting html page -->
<xsl:template match=" a | abbr | acronym | address | applet | area | b |
base | basefont |
bdo | big | blockquote | body | br | button | caption
| center | cite | code | col |
@@ -71,38 +68,44 @@
<head>
<title>Pingus - <xsl:value-of select="@title" /></title>
<link rel="stylesheet" type="text/css" href="default.css" />
+ <link rel="alternate stylesheet" title="Desert Theme" type="text/css"
href="desert.css" />
+ <link rel="alternate stylesheet" title="Snow Theme" type="text/css"
href="snow.css" />
<link rel="shortcut icon" href="images/favicon.png" type="image/png" />
</head>
<body>
- <div id="pagebody">
- <div id="title">
- <div style="display: inline; float: right; margin: 0; padding: 0;
position: absolute; right: 16px; top: 16px;">
- <form action="https://www.paypal.com/cgi-bin/webscr";
method="post">
- <div style="margin: 0px; padding: 0px;">
- <input type="hidden" name="cmd" value="_xclick" />
- <input type="hidden" name="business" value="address@hidden"
/>
- <input type="hidden" name="item_name" value="Pingus
donation" />
- <input type="hidden" name="no_note" value="1" />
- <input type="hidden" name="currency_code" value="EUR" />
- <input type="hidden" name="tax" value="0" />
- <input type="image"
src="http://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"; name="submit"
alt="donate via PayPal" />
- </div>
- </form>
+ <div style="display: inline; float: right; margin: 0; padding: 0;
position: absolute; right: 16px; top: 16px;">
+ <form action="https://www.paypal.com/cgi-bin/webscr"; method="post">
+ <div style="margin: 0px; padding: 0px;">
+ <input type="hidden" name="cmd" value="_xclick" />
+ <input type="hidden" name="business" value="address@hidden" />
+ <input type="hidden" name="item_name" value="Pingus donation" />
+ <input type="hidden" name="no_note" value="1" />
+ <input type="hidden" name="currency_code" value="EUR" />
+ <input type="hidden" name="tax" value="0" />
+ <input type="image"
src="http://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"; name="submit"
alt="donate via PayPal" />
</div>
+ </form>
+ </div>
- <a href="http://pingus.seul.org";><img src="images/logo_pingus.png"
alt="Pingus" /></a>
- </div>
+ <div id="logo">
+ <a href="http://pingus.seul.org";><img src="images/logo_pingus.png"
alt="Pingus" /></a>
+ </div>
+ <div id="pagebody">
<div class="nav">
<xsl:apply-templates select="document('menu.xml')" />
</div>
- <h1><xsl:value-of select="@title"/></h1>
+ <h1 id="pagetitle"><xsl:value-of select="@title"/></h1>
+
<div class="mainbody">
<xsl:apply-templates />
</div>
- <div class="footer">
- Copyright © 1998-2010 <a
href="http://pingus.seul.org/~grumbel/";>Ingo Ruhnke</a>, <<a
href="mailto:address@hidden";>address@hidden</a>>
+
+ <div id="footer">
+ Copyright © 1998-2010
+ <a href="http://pingus.seul.org/~grumbel/";>Ingo Ruhnke</a>
+ <<a href="mailto:address@hidden";>address@hidden</a>>
</div>
</div>
</body>
@@ -148,7 +151,6 @@
</tr>
</xsl:if>
-
<xsl:if test="count(item)>6">
<tr>
<td align="center">
@@ -162,7 +164,6 @@
</td>
</tr>
</xsl:if>
-
</table>
</xsl:template>
@@ -183,28 +184,6 @@
</ul>
</xsl:template>
- <xsl:template match="netstat-image">
- <div style="text-align: right;">
- <!-- Begin Nedstat Basic code -->
- <!-- Title: Pingus -->
- <!-- URL: http://dark.x.dtu.dk/~grumbel/pingus/index.html -->
- <script type="text/javascript" language="JavaScript"
src="http://m1.nedstatbasic.net/basic.js";>
- </script>
-
- <script type="text/javascript" language="JavaScript">
- <xsl:comment>
- nedstatbasic("AAG6CQE7r43v+PiFyrKmmmG/C9Lg", 0);
- // </xsl:comment>
- </script>
- <noscript>
- <a target="_blank"
href="http://v1.nedstatbasic.net/stats?AAG6CQE7r43v+PiFyrKmmmG/C9Lg";><img
-
src="http://m1.nedstatbasic.net/n?id=AAG6CQE7r43v+PiFyrKmmmG/C9Lg";
-
border="0" width="18" height="18" alt="" /></a>
- </noscript>
- <!-- End Nedstat Basic code -->
- </div>
- </xsl:template>
-
<xsl:template match="section-toc">
<ul>
<xsl:for-each select="section">
Added: trunk/htdocs/desert.css.sed
===================================================================
--- trunk/htdocs/desert.css.sed 2010-04-12 19:08:16 UTC (rev 4121)
+++ trunk/htdocs/desert.css.sed 2010-04-12 23:30:17 UTC (rev 4122)
@@ -0,0 +1,5 @@
+s/\$BACKGROUND-IMAGE\$/"images\/desert_background.jpg"/g;
+s/\$COLOR-BACKGROUND\$/#cdb09e/g;
+s/\$COLOR-PAGEHEADER\$/#cdb09e/g;
+s/\$COLOR-PAGEHEADER-DIMMED\$/#bda08e/g;
+s/\$COLOR-PAGEHEADER-LIGHT\$/#cdb09e/g;
Modified: trunk/htdocs/levelbuilding-tutorial.xml
===================================================================
--- trunk/htdocs/levelbuilding-tutorial.xml 2010-04-12 19:08:16 UTC (rev
4121)
+++ trunk/htdocs/levelbuilding-tutorial.xml 2010-04-12 23:30:17 UTC (rev
4122)
@@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="default.xsl"?>
<page title="Building a pingus level">
<p>
- <img src="images/editor.jpg" align="right" />
+ <img src="images/editor.jpg" align="right" alt="" />
</p>
<section title="Introduction">
Modified: trunk/htdocs/manual.xml
===================================================================
--- trunk/htdocs/manual.xml 2010-04-12 19:08:16 UTC (rev 4121)
+++ trunk/htdocs/manual.xml 2010-04-12 23:30:17 UTC (rev 4122)
@@ -1,9 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/xsl" href="default.xsl"?>
<page title="User Manual">
<section title="The Story">
</section>
-
<section title="Starting the Game">
</section>
@@ -210,4 +209,4 @@
<section title="Credits">
[FIXME: insert Free Software yada yada here]
</section>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/htdocs/news_old.xml
===================================================================
--- trunk/htdocs/news_old.xml 2010-04-12 19:08:16 UTC (rev 4121)
+++ trunk/htdocs/news_old.xml 2010-04-12 23:30:17 UTC (rev 4122)
@@ -1,14 +1,17 @@
<?xml version="1.0" ?>
<page title="Archived News">
- <section title="2002">
+ <section title="2007">
<news>
<item date="15. Jan 2007">
Porting Pingus to SDL is in progress, some spelling fixes for the FAQ
</item>
-
+ </news>
+ </section>
+
+ <section title="2006">
+ <news>
<item date="11. Feb 2006">
Time for some news, current plans for Pingus look like this:
-
<ul>
<li>Jave27 is currently trying to get the latest version in a
release ready state</li>
@@ -18,7 +21,11 @@
</li>
</ul>
</item>
+ </news>
+ </section>
+ <section title="2004">
+ <news>
<item date="09. Apr 2004">
It's been a long time without any updates, so there's a couple of news
to note here.
<ul>
@@ -28,7 +35,11 @@
<li>We've got now a <a
href="http://pingus.seul.org/level_comment_tool/index.php";>Level Comment
Tool</a> where you can rate all levels which are delivered with Pingus.</li>
</ul>
</item>
+ </news>
+ </section>
+ <section title="2003">
+ <news>
<item date="14. Sep 2003">
A added little button in the bottom left corner of the webpage
that allows you to <a
@@ -66,14 +77,18 @@
<item date="26. Feb 2003">
IRC Meeting planed for the next Saturday. For details see below and
the <a href="contact.html">Contact Section</a> of this site.<br/><br/>
- <table>
+ <table summary="">
<tr><td>Server:</td><td><a
href="http://freenode.net";>irc.freenode.net</a> 6667</td></tr>
<tr><td>Channel:</td><td>#pingus</td></tr>
<tr><td>Date:</td><td>Saturday, 1. March 2003</td></tr>
<tr><td>Time:</td><td>21:00 <a
href="http://greenwichmeantime.com/";>GMT</a></td></tr>
</table>
</item>
+ </news>
+ </section>
+ <section title="2002">
+ <news>
<item date="22. Dec 2002">
Rumour is that a new, finally playable, release will come out in
the next days... even so this isn't officially confirmed you
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4122 - trunk/htdocs,
grumbel at BerliOS <=