pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] r4113 - trunk/htdocs


From: grumbel at BerliOS
Subject: [Pingus-CVS] r4113 - trunk/htdocs
Date: Mon, 12 Apr 2010 16:30:20 +0200

Author: grumbel
Date: 2010-04-12 16:30:20 +0200 (Mon, 12 Apr 2010)
New Revision: 4113

Modified:
   trunk/htdocs/default.css
   trunk/htdocs/default.xsl
   trunk/htdocs/faq.xml
   trunk/htdocs/press.xml
   trunk/htdocs/screenshots.xml
Log:
Some layout improvements


Modified: trunk/htdocs/default.css
===================================================================
--- trunk/htdocs/default.css    2010-04-12 13:52:58 UTC (rev 4112)
+++ trunk/htdocs/default.css    2010-04-12 14:30:20 UTC (rev 4113)
@@ -1,33 +1,70 @@
-/* */
-
 h1,h2,h3,h4
 {
-  font-family: Sans-Serif;
+  font-family: sans;
   margin-top: 0px;
 }
 
+h2,h3,h4
+{ 
+  border-bottom-style: solid;
+  border-bottom-width: thin;
+  border-bottom-color: lightgrey;
+  padding-left: 0.5em;
+}
+
 h1
 {
+  -moz-border-radius:    0.5em 0.5em 0em 0em;
+  -webkit-border-radius: 0.5em 0.5em 0em 0em;
   background: #607f9b;
   color: white;
-  border-style: solid;
+  border-style: solid solid none solid;
   border-color: black;
+  border-width: thin;
   padding-left: 1em;
-  margin-top: 0px;
-  margin-bottom: .5em;
+  margin-top: 1em;
+  margin-bottom: 0em;
 }
 
-div.menu
+p { 
+  text-indent: 1em;
+}
+
+div.nav
 {
   width: 205px;
   margin-top: 10px;
 }
 
-div.menu a
+div.nav a
 {
   text-decoration: none;
 }
 
+div.nav ul
+{ 
+  padding: 0;
+  margin:  0;
+  list-style-type: none
+}
+
+div.newsitem { 
+  margin-bottom: 1.5em;
+}
+
+div.newsdate { 
+  font-weight: bold;
+  border-bottom-style: solid;
+  border-bottom-width: thin;
+  border-bottom-color: lightgrey;
+  padding-bottom: 0.25em;
+}
+
+div.newsbody {
+  padding-top: 0.5em;
+  padding-left: 1em;
+}
+
 a.menuitem:hover
 {
   color: black;
@@ -41,13 +78,13 @@
 
 a.currentmenuitem:hover
 {
-  color:black;
+  color: black;
 }
 
 
 a.currentmenuitem:visited
 {
-  color:black;
+  color: black;
 }
 
 
@@ -69,8 +106,11 @@
 
 a.menuitem
 {
-  -moz-border-radius: 0.5em;
+  color: black;        
 
+  -moz-border-radius:    0.5em;
+  -webkit-border-radius: 0.5em;
+
   font-size: 18px;
   font-family: Sans-Serif;
   text-align: center;
@@ -81,7 +121,6 @@
   background-color: #607f9b;
   /*   background-image: url(images/menubackground.png);*/
   background-repeat: repeat-y;
-  color: black;        
   padding: 5px 0px 5px 0px;
   display: block;
   margin: 10px 15px 10px 15px;
@@ -89,10 +128,11 @@
 
 div.mainbody
 {
-  background-color: silver;
+  background-color: white;
   color: black;
   border-color: black;
-  border-style: solid;
+  border-style: none solid none solid;
+  border-width: thin;
   padding: 1em;
 }
 
@@ -161,16 +201,37 @@
 }
 
 a:hover {
-  color: white;
+  color: black;
 }
 
 a {
   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: thin; 
+  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;
+}
+
 body
 {
+  font-family: sans;
   background-position: left top;
   background-image: url(images/snow_background.jpg);
   background-repeat: repeat-x;
@@ -178,3 +239,5 @@
   color: black;
   /* desert #cdb09e; */
 }
+
+/* EOF */

Modified: trunk/htdocs/default.xsl
===================================================================
--- trunk/htdocs/default.xsl    2010-04-12 13:52:58 UTC (rev 4112)
+++ trunk/htdocs/default.xsl    2010-04-12 14:30:20 UTC (rev 4113)
@@ -66,10 +66,7 @@
       <head>
         <title>Pingus - <xsl:value-of select="@title" /></title>
         <link rel="stylesheet" type="text/css" href="default.css" />
-        <link rel="icon" href="images/favicon.png" type="image/png" />
-        <!--<link REL="help" HREF="faq.html" title="FAQ"/>
-            <link REL="section" HREF="faq.html" title="Intro"/>
-            <link REL="shortcut icon" href="/favicon.ico" type="image/x-icon" 
/>-->
+        <link rel="shortcut icon" href="images/favicon.png" type="image/png" />
       </head>
       <body style="margin:0px;">
         <table summary="" cellpadding="0" cellspacing="0" border="0" 
width="100%">
@@ -78,18 +75,20 @@
             <td valign="top" align="center">
               <a href="http://pingus.seul.org";><img 
src="images/logo_pingus.png" alt="Pingus" /></a>
 
-              <div class="menu">
-                <div><a class="menuitem" href="news.html">News</a></div>
-                <div><a class="menuitem" href="welcome.html">Welcome</a></div>
-                <div><a class="menuitem" 
href="download.html">Download</a></div>
-                <div><a class="menuitem" href="faq.html">FAQ</a></div>
-                <div><a class="menuitem" href="contact.html">Contact</a></div>
-                <div><a class="menuitem" 
href="screenshots.html">Screenshots</a></div>
-                <!--           <div><a class="menuitem" 
href="level_comment_tool/index.php">Level Comment Tool</a></div> -->
-                <div><a class="menuitem" 
href="development.html">Development</a></div>
-                <div><a class="menuitem" href="press.html">Press</a></div>
-                <br /> 
-                <div><a class="menuitem" 
href="http://savannah.nongnu.org/projects/pingus/";>Savannah Project 
Page</a></div>
+              <div class="nav">
+                <ul>
+                  <li><a class="menuitem" href="news.html">News</a></li>
+                  <li><a class="menuitem" href="welcome.html">Welcome</a></li>
+                  <li><a class="menuitem" 
href="download.html">Download</a></li>
+                  <li><a class="menuitem" href="faq.html">FAQ</a></li>
+                  <li><a class="menuitem" href="contact.html">Contact</a></li>
+                  <li><a class="menuitem" 
href="screenshots.html">Screenshots</a></li>
+                  <!-- <li><a class="menuitem" 
href="level_comment_tool/index.php">Level Comment Tool</a></li> -->
+                  <!-- <li><a class="menuitem" 
href="development.html">Development</a></li> -->
+                  <li><a class="menuitem" href="press.html">Press</a></li>
+                  <br /> 
+                  <li><a class="menuitem" 
href="http://savannah.nongnu.org/projects/pingus/";>Savannah Project 
Page</a></li>
+                </ul>
 
                 <form action="https://www.paypal.com/cgi-bin/webscr"; 
method="post">
                   <div style="margin: 0px; padding: 0px;">
@@ -109,27 +108,27 @@
                 <a href="http://jigsaw.w3.org/css-validator/";>css2</a>
 
                 <!-- <img
-                     src="http://www.w3.org/Icons/valid-html401";
-                     alt="Valid HTML 4.01!" height="31" width="88" /> -->
+                        src="http://www.w3.org/Icons/valid-html401";
+                        alt="Valid HTML 4.01!" height="31" width="88" /> -->
                 <!-- <img style="border:0;width:88px;height:31px"
-                     src="http://jigsaw.w3.org/css-validator/images/vcss"; 
-                     alt="Valid CSS!" /> -->
+                          src="http://jigsaw.w3.org/css-validator/images/vcss"; 
+                          alt="Valid CSS!" /> -->
 
               </p>
             </td>
             <td valign="top" style="padding:20px;">
               <!--
-                  <table  summary="" border="0" width="100%" cellpadding="0" 
cellspacing="0">
-                    <tr>
-                      <td align="left" valign="bottom">
-                        <h1><xsl:value-of select="@title"/></h1>
-                      </td><td align="right">
-                        <img alt="" src="images/walking.png"/>
-                      </td>
-                    </tr>
-                  </table>
-                  <br />
-                  -->
+                 <table  summary="" border="0" width="100%" cellpadding="0" 
cellspacing="0">
+                   <tr>
+                     <td align="left" valign="bottom">
+                       <h1><xsl:value-of select="@title"/></h1>
+                     </td><td align="right">
+                       <img alt="" src="images/walking.png"/>
+                     </td>
+                   </tr>
+                 </table>
+                 <br />
+                 -->
               
               <h1><xsl:value-of select="@title"/></h1>
 
@@ -137,8 +136,8 @@
                 <xsl:apply-templates />
               </div>
               
-              <div style="font-size: smaller; text-align: right; 
background-color: gray; padding: 5px; border-style: solid; border-color: black; 
border-width: thin; margin-top: 8px;">
-                Copyright &#169; 1998-2007 <a 
href="http://pingus.seul.org/~grumbel/";>Ingo Ruhnke</a>, &lt;<a 
href="mailto:address@hidden";>address@hidden</a>&gt;
+              <div class="footer">
+                Copyright &#169; 1998-2010 <a 
href="http://pingus.seul.org/~grumbel/";>Ingo Ruhnke</a>, &lt;<a 
href="mailto:address@hidden";>address@hidden</a>&gt;
               </div>
             </td>
           </tr>
@@ -209,7 +208,7 @@
   </xsl:template>
 
   <xsl:template match="screenshot-menu">
-    <p style="text-align: center;">
+    <p style="text-align: center; margin-top: 0em;">
       [ 
       <a href="screenshots.html">0.7</a>
       |
@@ -296,20 +295,14 @@
   </xsl:template>
 
   <xsl:template match="news">
-    <table border="0" width="100%" cellpadding="5" cellspacing="5">
-      <colgroup width="*"/>
-      <xsl:apply-templates/>
-    </table>
+    <xsl:apply-templates/>
   </xsl:template>
 
   <xsl:template match="news/item">
-    <tr>
-      <td style="border-style: solid; border-width: thin; white-space: 
nowrap;" align="right" valign="top">
-        <tt><xsl:value-of select="@date"/></tt>
-      </td>
-      
-      <td style="background-color: rgb(180,180,180); color: 
black;"><xsl:apply-templates/></td>
-    </tr>
+    <div class="newsitem">
+      <div class="newsdate"><xsl:value-of select="@date"/></div>
+      <div class="newsbody"><xsl:apply-templates/></div>
+    </div>
   </xsl:template>
 
   <xsl:template match="german-flag">

Modified: trunk/htdocs/faq.xml
===================================================================
--- trunk/htdocs/faq.xml        2010-04-12 13:52:58 UTC (rev 4112)
+++ trunk/htdocs/faq.xml        2010-04-12 14:30:20 UTC (rev 4113)
@@ -14,30 +14,30 @@
   <div id="faqtoc"/>
   <section title="FAQs - Frequently Asked Questions (and Answers)">
     <faq-list>
-         <faq date="14 Jan 2007">
+      <faq date="14 Jan 2007">
         <question>What is Pingus?</question>
         <answer>
-        The <a href="welcome.html">Welcome</a> page answers this question.
+          The <a href="welcome.html">Welcome</a> page answers this question.
         </answer>
       </faq>
 
       <faq date="14 Jan 2007">
         <question>How much does it cost?</question>
         <answer>
-        We believe that you should answer this question for yourself.  If you
-        think this game is worth some amount of money, you can <a
-        
href="https://www.paypal.com/xclick/business=grumbel%40gmx.de&amp;item_name=Pingus+donation&amp;no_note=1&amp;tax=0&amp;currency_code=EUR";>donate
-        to Pingus via Paypal</a>. Otherwise, you can get the game for no
-        monetary cost.  Pingus is <a
-        href="http://www.gnu.org/philosophy/free-sw.html";>Free Software</a> and
-        you are not forced to pay any amount of money for this game.
+          We believe that you should answer this question for yourself.  If you
+          think this game is worth some amount of money, you can <a
+                                                                    
href="https://www.paypal.com/xclick/business=grumbel%40gmx.de&amp;item_name=Pingus+donation&amp;no_note=1&amp;tax=0&amp;currency_code=EUR";>donate
+            to Pingus via Paypal</a>. Otherwise, you can get the game for no
+          monetary cost.  Pingus is <a
+                                       
href="http://www.gnu.org/philosophy/free-sw.html";>Free Software</a> and
+          you are not forced to pay any amount of money for this game.
         </answer>
       </faq>           
 
       <faq date="14 Jan 2007">
         <question>Where can I get Pingus?</question>
         <answer>
-        You can get Pingus from the <a href="download.html">download</a> 
section.
+          You can get Pingus from the <a href="download.html">download</a> 
section.
         </answer>
       </faq>
 
@@ -45,8 +45,8 @@
         <question>Where can I find more levels?</question>
         <answer>
           <em>Foreword: Every level that isn't reachable via the GUI in Pingus
-          is unsupported and might be completely broken. If you want to try
-          them you are on your own.</em> <br /><br />
+            is unsupported and might be completely broken. If you want to try
+            them you are on your own.</em> <br /><br />
 
           Besides the 22 tested and cleaned up levels of the first island that
           come with Pingus. There are also around 120 levels that might be
@@ -72,15 +72,15 @@
         <question>What does it mean for Pingus to be Free Software?</question>
         <answer>
           Pingus is licensed under a <a
-          href="http://www.gnu.org/philosophy/free-sw.html";>Free/Libre
-          Software</a> license called <a
-          href="http://www.gnu.org/licenses/gpl.html";>GNU GPL</a>.
+                                        
href="http://www.gnu.org/philosophy/free-sw.html";>Free/Libre
+            Software</a> license called <a
+                                           
href="http://www.gnu.org/licenses/gpl.html";>GNU GPL</a>.
           Basically, this means that everybody is free to download,
           distribute, and modify it. Moreover, anyone can distribute
           modified works of Pingus, as long as those works are
           disributed under a <a
-          
href="http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses";>GPL
-          compatible license</a>. In other words, Pingus respects your
+                                
href="http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses";>GPL
+            compatible license</a>. In other words, Pingus respects your
           software freedoms.
         </answer>
       </faq>
@@ -90,7 +90,7 @@
         <answer>
           Technically, this isn't a question. You have to be more specific. A
           general suggestion is to search the <a
-          href="http://savannah.nongnu.org/bugs/?group=pingus";>Bug Tracker</a>
+                                                 
href="http://savannah.nongnu.org/bugs/?group=pingus";>Bug Tracker</a>
           for similar problems.
         </answer>
       </faq>
@@ -115,8 +115,8 @@
             <li>Writing stories</li>
             <li>Programming
               <ul>
-              <li>debugging the editor</li>
-              <li>allowing for cygwin/mingw compilation</li>
+                <li>debugging the editor</li>
+                <li>allowing for cygwin/mingw compilation</li>
               </ul>
             </li>
             <li>Play testing</li>
@@ -184,7 +184,6 @@
          <br /><br />
         </answer>
       </faq>
-      </faq>
     </faq-list>
   </section>
 </page>

Modified: trunk/htdocs/press.xml
===================================================================
--- trunk/htdocs/press.xml      2010-04-12 13:52:58 UTC (rev 4112)
+++ trunk/htdocs/press.xml      2010-04-12 14:30:20 UTC (rev 4113)
@@ -1,37 +1,24 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="default.xsl"?>
 <page title="Press">
-    <p>
-      The following is a collection of articles about Pingus from
-      different sources and in different languages. Some might be a
-      bit out dated since they apply to an older version. If you have
-      found an article not listed here, please write a short mail to
-      <a href="mailto:address@hidden";>Ingo Ruhnke</a>.
-    </p>
+  <p>
+    The following is a collection of articles about Pingus from
+    different sources and in different languages. Some might be a
+    bit out dated since they apply to an older version. If you have
+    found an article not listed here, please write a short mail to
+    <a href="mailto:address@hidden";>Ingo Ruhnke</a>.
+  </p>
 
-    <ul>
-
+  <ul>
+    <li><a href="http://pingvinus.ru/game/pingus";>Pingus (Russian)</a></li>
+    <li><a 
href="http://www.idealsoftblog.it/2009/04/pingus-voglia-di-lemmings-eccovi-i.html";>Pingus
 – Voglia di Lemmings ? Eccovi i pinguini ! (Italian)</a></li>
     <li><a href="http://www.happypenguin.org/show?Pingus#comments";>User 
comments at Happypenguin.org</a> <english-flag/></li>
-
     <li><a 
href="http://www.retrothing.com/2008/04/pingus-lemmings.html";>Pingus: Lemmings 
Goes Open Source</a></li>
-
-      <li><a
-          href="http://www.pl-forum.de/spiele/pingus.html";>ProLinux:
-          Pingus</a> <german-flag/></li>
-
-    <!-- <li><a
-      
href="http://www.linuxdoos.com/~linux/linux_artikelen.php?sid=30&amp;mode=flatX";>Pingus
-      - Oh no, More penguins</a>  <dutch-flag/></li> -->
-
-      <li><a
-      href="http://www.gnu.org/brave-gnu-world/issue-36.en.html";>Brave
-      GNU World</a> (multilanguage)</li>
-
+    <li><a href="http://www.pl-forum.de/spiele/pingus.html";>ProLinux: 
Pingus</a> <german-flag/></li>
+    <li><a href="http://www.gnu.org/brave-gnu-world/issue-36.en.html";>Brave 
GNU World</a> (multilanguage)</li>
     <li><a 
href="http://ubuntugame.blogspot.com/2007/04/pingus.html";>UbuntuGame: Pingus 
(italian)</a></li>
-
-<!--      <li><a 
href="http://www.linux-user.de/ausgabe/2000/01/Gamezone/Gamezone.html";>Brot und 
Spiele</a> <german-flag/></li> -->
-
-<li><a href="http://techgage.com/article/top_10_free_linux_games/4";>Techgage - 
Top 10 Free Linux Games</a> <english-flag/></li>
-
-    </ul>
+    <li><a 
href="http://techgage.com/article/top_10_free_linux_games/4";>Techgage - Top 10 
Free Linux Games</a> <english-flag/></li>
+    <!-- <li><a 
href="http://www.linuxdoos.com/~linux/linux_artikelen.php?sid=30&amp;mode=flatX";>Pingus
 - Oh no, More penguins</a>  <dutch-flag/></li> -->
+    <!-- <li><a 
href="http://www.linux-user.de/ausgabe/2000/01/Gamezone/Gamezone.html";>Brot und 
Spiele</a> <german-flag/></li> -->
+  </ul>
 </page>

Modified: trunk/htdocs/screenshots.xml
===================================================================
--- trunk/htdocs/screenshots.xml        2010-04-12 13:52:58 UTC (rev 4112)
+++ trunk/htdocs/screenshots.xml        2010-04-12 14:30:20 UTC (rev 4113)
@@ -1,8 +1,7 @@
 <?xml version="1.0" ?>
 <?xml-stylesheet type="text/xsl" href="default.xsl"?>
 <page title="Screenshots of Version 0.7">
-  <screenshot-menu/>
-  
+  <screenshot-menu/> 
   <screenshots>
     <item file="screen_0.7.0-1">The Main Menu</item>
     <item file="screen_0.7.0-2">The Story</item>
@@ -11,5 +10,4 @@
     <item file="screen_0.7.0-5">The Level Start Screen</item>
     <item file="screen_0.7.0-6">Another Level</item>
   </screenshots>
-
 </page>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]