[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4126 - trunk/htdocs
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4126 - trunk/htdocs |
|
Date: |
Wed, 14 Apr 2010 02:14:35 +0200 |
Author: grumbel
Date: 2010-04-14 02:14:35 +0200 (Wed, 14 Apr 2010)
New Revision: 4126
Added:
trunk/htdocs/compatibility.sed
Modified:
trunk/htdocs/Makefile
trunk/htdocs/default.css
trunk/htdocs/default.xsl
trunk/htdocs/development.xml
trunk/htdocs/menu.xml
trunk/htdocs/news.xml
Log:
Some cleanup in the markup/page-structure
Modified: trunk/htdocs/Makefile
===================================================================
--- trunk/htdocs/Makefile 2010-04-13 10:16:21 UTC (rev 4125)
+++ trunk/htdocs/Makefile 2010-04-14 00:14:35 UTC (rev 4126)
@@ -36,14 +36,14 @@
clean :
rm -vf $(OUTPUTFILES)
-build/default.css : default.css default.css.sed
- sed -f "default.css.sed" $< > $@
+build/default.css : default.css default.css.sed compatibility.sed
+ sed -f "compatibility.sed" -f "default.css.sed" $< > $@
-build/snow.css : default.css default.css.sed
- sed -f "default.css.sed" $< > $@
+build/snow.css : default.css default.css.sed compatibility.sed
+ sed -f "compatibility.sed" -f "default.css.sed" $< > $@
-build/desert.css : default.css desert.css.sed
- sed -f "desert.css.sed" $< > $@
+build/desert.css : default.css desert.css.sed compatibility.sed
+ sed -f "compatibility.sed" -f "desert.css.sed" $< > $@
build/index.html : index.html
cp -v $< $@
Added: trunk/htdocs/compatibility.sed
===================================================================
--- trunk/htdocs/compatibility.sed 2010-04-13 10:16:21 UTC (rev 4125)
+++ trunk/htdocs/compatibility.sed 2010-04-14 00:14:35 UTC (rev 4126)
@@ -0,0 +1 @@
+s/border-radius:\(.*\);/border-radius: \1;\n -moz-border-radius: \1;\n
-webkit-border-radius: \1;/;
Modified: trunk/htdocs/default.css
===================================================================
--- trunk/htdocs/default.css 2010-04-13 10:16:21 UTC (rev 4125)
+++ trunk/htdocs/default.css 2010-04-14 00:14:35 UTC (rev 4126)
@@ -16,135 +16,93 @@
margin: 0;
}
-#pagebody
+#page
{
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;
-}
-
-div.screenshotmenu-center {
+#nav
+{
text-align: center;
+ margin-bottom: 0;
+ padding: 0;
+ border-width: 0;
}
-ul.screenshotmenu
+#header
{
- font-weight: bold;
- display: inline-block;
- margin: 0 auto 1.5em auto;
- padding: 0.25em 0em;
- background-color: $COLOR-PAGEHEADER$;
- border-style: solid;
- border-width: 1px;
- -moz-border-radius: 1em;
- -webkit-border-radius: 1em;
- border-radius: 1em;
-}
+ border-radius: 0.5em 0.5em 0em 0em;
-ul.screenshotmenu li
-{
- display: inline;
- list-style-type: none;
-}
+ background: $COLOR-PAGEHEADER$;
-ul.screenshotmenu li a
-{
- padding: 0.25em 1em;
- text-decoration: none;
+ border-style: solid solid none solid;
+ border-color: black;
+ border-width: 1px;
+
+ position: relative;
}
-ul.screenshotmenu li a:hover
-{
+#body
+{
background-color: white;
- -moz-border-radius: 1em;
- -webkit-border-radius: 1em;
- border-radius: 1em;
+ color: black;
+ border-color: black;
+ border-style: none solid none solid;
+ border-width: 1px;
+ padding: 2em 4em 2em 4em;
}
-h1,h2,h3,h4
+#footer
{
+ color: black;
+ font-size: smaller;
font-family: sans-serif;
- margin-top: 0px;
-}
-h2,h3,h4
-{
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-bottom-color: lightgray;
- padding-left: 0.5em;
+ text-align: right;
+ background: $COLOR-PAGEHEADER$;
+ padding: 5px;
+ border-style: none solid solid solid;
+ border-color: COLOR-BACKGROUND;
+ border-width: 1px;
+ margin-top: 0;
+
+ border-radius: 0em 0em 0.5em 0.5em;
}
-#pagetitle
+#header h1
{
- 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: $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;
-}
-p {
- text-indent: 1em;
+ margin: 0 3em;
+ padding: 0.125em 0;
}
-div.nav
-{
- text-align: center;
- margin-bottom: 0;
- padding: 0;
- border-width: 0;
+#footer a
+{
+ text-decoration: none;
}
-div.nav ul
+#nav ul
{
list-style-type: none;
margin: 0;
padding: 0;
}
-div.nav ul li
+#nav ul>li
{
display: inline;
margin: 0;
padding: 0;
}
-a.menuitem:visited {
+#nav a.menuitem:visited {
color: black;
}
-a.menuitem
+#nav a.menuitem
{
text-decoration: none;
margin: 0.25em 0.25em 0 0.25em;
@@ -152,8 +110,7 @@
color: black;
- -moz-border-radius: 0.5em 0.5em 0 0;
- -webkit-border-radius: 0.5em 0.5em 0 0;
+ border-radius: 0.5em 0.5em 0 0;
font-size: 1em;
font-weight: bold;
@@ -172,12 +129,12 @@
top: 0.25em;
}
-a.menuitem:hover
+#nav a.menuitem:hover
{
background-color: $COLOR-PAGEHEADER-LIGHT$;
}
-a.menuitemcurrent
+#nav a.menuitemcurrent
{
background-color: $COLOR-PAGEHEADER$;
@@ -190,6 +147,57 @@
z-index: 1;
}
+div.screenshotmenu-center
+{
+ text-align: center;
+}
+
+ul.screenshotmenu
+{
+ font-weight: bold;
+ display: inline-block;
+ margin: 0 auto 1.5em auto;
+ padding: 0.25em 0em;
+ background-color: $COLOR-PAGEHEADER$;
+ border-style: solid;
+ border-width: 1px;
+ border-radius: 1em;
+}
+
+ul.screenshotmenu>li
+{
+ display: inline;
+ list-style-type: none;
+}
+
+ul.screenshotmenu>li a
+{
+ padding: 0.25em 1em;
+ text-decoration: none;
+}
+
+ul.screenshotmenu>li a:hover
+{
+ background-color: white;
+ border-radius: 1em;
+}
+
+
+h2,h3,h4
+{
+ font-family: sans-serif;
+ margin-top: 0px;
+
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-color: lightgray;
+ padding-left: 0.5em;
+}
+
+p {
+ text-indent: 1em;
+}
+
div.newsitem {
margin-bottom: 1.5em;
}
@@ -207,30 +215,6 @@
padding-left: 1em;
}
-div.mainbody
-{
- background-color: white;
- color: black;
- border-color: black;
- border-style: none solid none solid;
- border-width: 1px;
- padding: 2em 4em 2em 4em;
-}
-
-p.warning {
- font-size: 1.5em;
- color: red;
- background-color: black;
- font-family: sans-serif;
- border-style: solid;
- border-color: red;
- padding: .3em;
-}
-
-p.warning a {
- color: red;
-}
-
div.answer {
margin-bottom: 1.5em;
}
@@ -261,12 +245,10 @@
border-color: gray;
}
-
a:hover img.screenshot {
border-color: white;
}
-
a:visited {
color: rgb(0,0,100);
}
Modified: trunk/htdocs/default.xsl
===================================================================
--- trunk/htdocs/default.xsl 2010-04-13 10:16:21 UTC (rev 4125)
+++ trunk/htdocs/default.xsl 2010-04-14 00:14:35 UTC (rev 4126)
@@ -4,10 +4,10 @@
<xsl:output
method="html"
- indent="yes"
- doctype-public="-//W3C//DTD HTML 4.01//EN"
- doctype-system="http://www.w3.org/TR/html4/strict.dtd";
- encoding="ISO-8859-1" />
+ indent="no"
+ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+ doctype-system="http://www.w3.org/TR/html4/loose.dtd";
+ encoding="utf-8" />
<xsl:param name="filename"/>
@@ -91,14 +91,16 @@
<a href="http://pingus.seul.org";><img src="images/logo_pingus.png"
alt="Pingus" /></a>
</div>
- <div id="pagebody">
- <div class="nav">
+ <div id="page">
+ <div id="nav">
<xsl:apply-templates select="document('menu.xml')" />
</div>
- <h1 id="pagetitle"><xsl:value-of select="@title"/></h1>
+ <div id="header">
+ <h1><xsl:value-of select="@title"/></h1>
+ </div>
- <div class="mainbody">
+ <div id="body">
<xsl:apply-templates />
</div>
Modified: trunk/htdocs/development.xml
===================================================================
--- trunk/htdocs/development.xml 2010-04-13 10:16:21 UTC (rev 4125)
+++ trunk/htdocs/development.xml 2010-04-14 00:14:35 UTC (rev 4126)
@@ -27,11 +27,5 @@
<p>
<tt>svn co svn://svn.berlios.de/pingus/trunk/pingus/</tt><br/>
</p>
-
-<!--
- <p class="warning" style="text-align: center">
- <a href="http://www.cmhousing.net/pingus/wiki/";>Enter Development
Section!</a>
- </p>
--->
</section>
</page>
Modified: trunk/htdocs/menu.xml
===================================================================
--- trunk/htdocs/menu.xml 2010-04-13 10:16:21 UTC (rev 4125)
+++ trunk/htdocs/menu.xml 2010-04-14 00:14:35 UTC (rev 4126)
@@ -2,9 +2,9 @@
<menu>
<item name="welcome">Welcome</item>
<item name="news">News</item>
+ <item name="screenshots">Screenshots</item>
<item name="download">Download</item>
<item name="faq">FAQ</item>
<item name="contact">Contact</item>
- <item name="screenshots">Screenshots</item>
<item name="links">Links</item>
</menu>
Modified: trunk/htdocs/news.xml
===================================================================
--- trunk/htdocs/news.xml 2010-04-13 10:16:21 UTC (rev 4125)
+++ trunk/htdocs/news.xml 2010-04-14 00:14:35 UTC (rev 4126)
@@ -1,76 +1,81 @@
<?xml version="1.0" ?>
<?xml-stylesheet type="text/xsl" href="default.xsl"?>
<page title="News">
- <news>
- <item date="12. Apr 2010">
- The webpage got a little relayout.
- </item>
+ <section title="2010">
+ <news>
+ <item date="12. Apr 2010">
+ The webpage got a little relayout.
+ </item>
- <item date="18. Mar 2010">
- Pingus 0.7.3 is released, nothing new in terms of gameplay, just
- some fixes to make it work with newer incarnations of GCC.
- </item>
+ <item date="18. Mar 2010">
+ Pingus 0.7.3 is released, nothing new in terms of gameplay, just
+ some fixes to make it work with newer incarnations of GCC.
+ </item>
+ </news>
+ </section>
- <item date="31. Oct 2007">
- Pingus 0.7.2 is released, this release features 8 brand new
- Halloween levels along with numerous smaller bug fixes.
+ <section title="2007">
+ <news>
+ <item date="31. Oct 2007">
+ Pingus 0.7.2 is released, this release features 8 brand new
+ Halloween levels along with numerous smaller bug fixes.
- <ul>
- <li>added support for levelsets</li>
- <li>added 8 new levels in the form of a halloween levelset</li>
- <li>added window resize support to the editor (use --allow-resize)</li>
- <li>added minimap to the editor</li>
- <li>scroll wheel support to change the actions</li>
- <li>right and middle button now both scroll</li>
- <li>'jumper dying on landing' bug fixed</li>
- <li>numerous other small bug fixes</li>
- </ul>
- </item>
+ <ul>
+ <li>added support for levelsets</li>
+ <li>added 8 new levels in the form of a halloween levelset</li>
+ <li>added window resize support to the editor (use
--allow-resize)</li>
+ <li>added minimap to the editor</li>
+ <li>scroll wheel support to change the actions</li>
+ <li>right and middle button now both scroll</li>
+ <li>'jumper dying on landing' bug fixed</li>
+ <li>numerous other small bug fixes</li>
+ </ul>
+ </item>
- <item date="23. Sep 2007">
- Pingus 0.7.1 is released, this is the second release based on
- SDL and among some small bug fixes, it also contains a brand new
- level editor rewritten from scratch. Other new things in this
- release:
+ <item date="23. Sep 2007">
+ Pingus 0.7.1 is released, this is the second release based on
+ SDL and among some small bug fixes, it also contains a brand new
+ level editor rewritten from scratch. Other new things in this
+ release:
- <ul>
- <li>faster sprite drawing, so more overall fps</li>
- <li>level editor rewritten from scratch</li>
- <li>level loading from command line fixed</li>
- <li>numerous other command line parsing bugs fixed</li>
- <li>separate images for gfx and colmap are used again</li>
- <li>input subsystem rewritten from scratch, supports now gamepads,
- usbmice, wiimote (some of those might unfinished and not enabled by
- default)</li>
- </ul>
- </item>
+ <ul>
+ <li>faster sprite drawing, so more overall fps</li>
+ <li>level editor rewritten from scratch</li>
+ <li>level loading from command line fixed</li>
+ <li>numerous other command line parsing bugs fixed</li>
+ <li>separate images for gfx and colmap are used again</li>
+ <li>input subsystem rewritten from scratch, supports now gamepads,
+ usbmice, wiimote (some of those might unfinished and not enabled by
+ default)</li>
+ </ul>
+ </item>
- <item date="25. Aug 2007">
- Pingus 0.7.0 is released, this is the first working version of
- Pingus that is based on SDL. New things in this release:
-
- <ul>
- <li>switch from ClanLib to SDL</li>
- <li>new anti-aliased fonts</li>
- <li>better support for resolutions larger then 800x600 (see --geometry
WxH option)</li>
- <li>s-expression based file format (converter scripts are
available)</li>
- <li>PPC and 64bit support</li>
- <li>language support for Czech, German, Finish, Italian, Norwegian,
- Serbian, Turkish, Danish, Dutch, Spanish, Fench and Polish</li>
- <li>level editor temporarly removed</li>
- <li>a little less fps then the ClanLib version</li>
- <li>no new levels or other main features</li>
- </ul>
- </item>
+ <item date="25. Aug 2007">
+ Pingus 0.7.0 is released, this is the first working version of
+ Pingus that is based on SDL. New things in this release:
+
+ <ul>
+ <li>switch from ClanLib to SDL</li>
+ <li>new anti-aliased fonts</li>
+ <li>better support for resolutions larger then 800x600 (see
--geometry WxH option)</li>
+ <li>s-expression based file format (converter scripts are
available)</li>
+ <li>PPC and 64bit support</li>
+ <li>language support for Czech, German, Finish, Italian, Norwegian,
+ Serbian, Turkish, Danish, Dutch, Spanish, Fench and Polish</li>
+ <li>level editor temporarly removed</li>
+ <li>a little less fps then the ClanLib version</li>
+ <li>no new levels or other main features</li>
+ </ul>
+ </item>
- <item date="25. Jun 2007">
- Pingus goes multi-touch, some people at the RWTH Aachen used
- Pingus gfx in the creation of their Table Lemmings game, you can find
screenshots
- at <a href="http://www.flickr.com/photos/davidh/567995242/";>Flickr</a>
and at their page at the
- <a
href="http://media.informatik.rwth-aachen.de/tiki-index.php?page=table-lemmings";>RWTH
- Aachen</a>.
- </item>
- </news>
-
+ <item date="25. Jun 2007">
+ Pingus goes multi-touch, some people at the RWTH Aachen used
+ Pingus gfx in the creation of their Table Lemmings game, you can find
screenshots
+ at <a href="http://www.flickr.com/photos/davidh/567995242/";>Flickr</a>
and at their page at the
+ <a
href="http://media.informatik.rwth-aachen.de/tiki-index.php?page=table-lemmings";>RWTH
+ Aachen</a>.
+ </item>
+ </news>
+ </section>
<p style="text-align: right"><a href="news_old.html">Older News...</a></p>
</page>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4126 - trunk/htdocs,
grumbel at BerliOS <=