updated
authorMatt Lee <mattl@gnu.org>
Wed, 3 Mar 2010 20:09:04 +0000 (20:09 +0000)
committerMatt Lee <mattl@gnu.org>
Wed, 3 Mar 2010 20:09:04 +0000 (20:09 +0000)
index-normal.php [deleted file]
index.php
join.php
screen.css

diff --git a/index-normal.php b/index-normal.php
deleted file mode 100644 (file)
index cc4efb7..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-   <title>LibrePlanet &mdash; a place for free software users, developers and activists connect and share information and resources.</title>
-   <style type="text/css" media="screen">
-     
-     @import url('/reset.css');
-     @import url('/base.css');
-     @import url('/screen.css');
-
-
-
-   </style>
-</head>
-<body id="<?php 
-
-$p = $_GET['p'];
-
-if ($p=='s') { $f="signup.php"; echo "tab-join"; }
-
-if ($p=='p') { $f="projects.php"; echo "tab-projects"; }
-if ($p=='g') { $f="groups.php"; echo "tab-groups"; }
-if ($p=='e') { $f="events.php"; echo "tab-events"; }
-if ($p=='n') { $f="news.php"; echo "tab-news"; } elseif ($p=='') { $f="join.php"; echo "tab-join"; }
-
- ?>">
-<div id="doc2" class="yui-t7">
-   <div id="hd" role="banner">
-
-     <ul>
-       <li class="netscape4"><a href="#bd">Skip navigation</a></li>
-       <li id="tab-join-link"><a href="/">Join</a></li>
-       <li id="tab-groups-link"><a href="?p=g">Groups</a></li>
-       <li id="tab-projects-link"><a href="?p=p">Projects</a></li>
-       <li id="tab-events-link"><a href="?p=e">Events</a></li>
-       <li id="tab-news-link"><a href="?p=n">News</a></li>
-     </ul>
-
-<div id="searchbox">
-
-  <form action="http://groups.fsf.org/wiki/Special:Search" id="searchform"><div>
-      <input id="searchInput" name="search" type="text" title="Search LibrePlanet [f]" accesskey="f" value="" />
-      <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="Search" title="Search the pages for this text" />
-      </div></form>
-
-<p><a href="http://groups.fsf.org/wiki/Special:UserLogin">Log in</a></p>
-
-</div>
-
-
-
-   </div>
-   <div id="bd" role="main">
-
-       <div class="yui-g" id="content">
-
-<p><img src="big-logo.png" alt="LibrePlanet"></p>
-
-
-     <?php require($f); ?>
-
-<div class="yui-gb" id="featured-boxes">
-        <div class="yui-u first">
-<h3>Mailing list</h3>
-
-<p><a href="http://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the LibrePlanet discussion mailing list</a>, and keep up to date with the project.</p>
-
-
-</div>
-        <div class="yui-u">
-<h3>IRC channel</h3>
-
-<p>Join us on IRC, in #libreplanet on irc.gnu.org, part of the Freenode network.</p>
-
-
-</div>
-        <div class="yui-u">
-<h3>Follow us on identi.ca</h3>
-
-<p>Join the <a href="http://identi.ca/group/libreplanet">LibrePlanet group</a> and <a href="http://identi.ca/libreplanet">follow us on Identi.ca</a>, the free software microblogging site.</p>
-
-</div>
-    </div>
-
-   </div>
-
-   <div id="ft" role="contentinfo">
-
-
-<div id="fsfcopyright">Copyright 2009, <a href="http://www.fsf.org/">Free Software Foundation</a>, Inc.</div>
-
-     <p><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"></a></p>
-
-         <p id="feedback">Your feedback on our new website is welcome. <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a></p>
-
-
-</div>
-</div>
-
-</body>
-</html>
index a94573a1a101a0ba9946e1a05cef90cbe2cb7224..cc4efb7e730a5024b7f3c970e894bd5e25db3236 100644 (file)
--- a/index.php
+++ b/index.php
-<!DOCTYPE html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-   <title>LibrePlanet 2010</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
+   <title>LibrePlanet &mdash; a place for free software users, developers and activists connect and share information and resources.</title>
    <style type="text/css" media="screen">
+     
+     @import url('/reset.css');
+     @import url('/base.css');
+     @import url('/screen.css');
 
-   @import url('http://static.fsf.org/combo.css');
 
-html {background-image: url('i/stripe.png');}
 
-body,html { margin: 0 !important; padding: 0 !important;}
+   </style>
+</head>
+<body id="<?php 
 
-   #hd, #bd, #ft {background-color: black;}
+$p = $_GET['p'];
 
-   #hd, #ft {text-align: center; text-transform: uppercase; font-weight: bold; color: white;}
+if ($p=='s') { $f="signup.php"; echo "tab-join"; }
 
-   h1{margin: 0; padding: 0;}
+if ($p=='p') { $f="projects.php"; echo "tab-projects"; }
+if ($p=='g') { $f="groups.php"; echo "tab-groups"; }
+if ($p=='e') { $f="events.php"; echo "tab-events"; }
+if ($p=='n') { $f="news.php"; echo "tab-news"; } elseif ($p=='') { $f="join.php"; echo "tab-join"; }
 
-   #ft p {line-height: 56px; margin: 0; padding: 0; font-size: 30px;}
+ ?>">
+<div id="doc2" class="yui-t7">
+   <div id="hd" role="banner">
 
-   #bd {margin: 24px 0;}
+     <ul>
+       <li class="netscape4"><a href="#bd">Skip navigation</a></li>
+       <li id="tab-join-link"><a href="/">Join</a></li>
+       <li id="tab-groups-link"><a href="?p=g">Groups</a></li>
+       <li id="tab-projects-link"><a href="?p=p">Projects</a></li>
+       <li id="tab-events-link"><a href="?p=e">Events</a></li>
+       <li id="tab-news-link"><a href="?p=n">News</a></li>
+     </ul>
 
-   #days {text-align: center;}
+<div id="searchbox">
 
-   #days div {min-height: 600px;}
+  <form action="http://groups.fsf.org/wiki/Special:Search" id="searchform"><div>
+      <input id="searchInput" name="search" type="text" title="Search LibrePlanet [f]" accesskey="f" value="" />
+      <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="Search" title="Search the pages for this text" />
+      </div></form>
 
-   #days h3{text-transform: uppercase; font-size: 26px;}
+<p><a href="http://groups.fsf.org/wiki/Special:UserLogin">Log in</a></p>
 
-   #days ul{text-align: center; margin: 0; padding: 0; }
+</div>
 
-   #days li{list-style: none; font-size: 18px; text-transform: uppercase; margin: 0 20px 20px 20px; font-weight: bold;}
 
-   h2 {margin: -5px 0 !important; padding: -5px !important;}
 
-#signup {background-color: black; color: white; text-align: center; font-size: 48px; text-transform: uppercase; font-weight: bold; padding-top: 1em;}
+   </div>
+   <div id="bd" role="main">
 
-#signup a:link, #signup a:visited{color: yellow;}
+       <div class="yui-g" id="content">
 
-#signup a:active, #signup a:hover{color: red;}
+<p><img src="big-logo.png" alt="LibrePlanet"></p>
 
-#womens, #wiki {background-color: orange; font-size: 24px; padding: 24px; text-align: center; text-transform: uppercase; font-weight: bold; margin-top: 1em;}
 
-#wiki {margin-top: 0; margin-bottom: 1em;}
+     <?php require($f); ?>
 
-#friday {background-color: #eec73e;}
+<div class="yui-gb" id="featured-boxes">
+        <div class="yui-u first">
+<h3>Mailing list</h3>
 
-#saturday {background-color: #aaccee;}
+<p><a href="http://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the LibrePlanet discussion mailing list</a>, and keep up to date with the project.</p>
 
-#sunday {background-color: #98fc66;}  
 
-   </style>
-</head>
-<body>
-<div id="wiki">
+</div>
+        <div class="yui-u">
+<h3>IRC channel</h3>
 
-<p><a href="http://groups.fsf.org/">Continue to LibrePlanet wiki...</a></p>
+<p>Join us on IRC, in #libreplanet on irc.gnu.org, part of the Freenode network.</p>
 
-</div>
 
-<div id="doc2" class="yui-t7"> 
-<div id="hd">
-<h1><img src="i/lp2010.png" alt="LibrePlanet" /></h1>
 </div>
+        <div class="yui-u">
+<h3>Follow us on identi.ca</h3>
 
-<div id="bd">
-
-
-
-       <div class="yui-g">
-<h2><img src="i/threedays.png" alt="Three days of free software activism"/></h2>
-         
-       </div>
-    <div class="yui-gb" id="days">
-        <div class="yui-u first" id="friday">
-
-         <h3>Friday</h3>
-<ul>
-<li>Intro to the<br />command line</li>
-<li>Web workshop</li>
-<li>Inkscape/GIMP</li>
-<li>Free Network Services</li>
-<li>Phones workshop</li>
-<li>Hackspace</li>
-<li>GNU Hackers Meeting</li>
-</ul>
-
-               </div>
-        <div class="yui-u" id="saturday">
-
-         <h3>Saturday</h3>
-
-        <ul>
-<li>John Gilmore (GNU/EFF)</li>
-<li>Karen Sandler (SFLC)</li>
-<li>Louis Suarez-Potts (OpenOffice.org)</li>
-<li>Walter Bender (OLPC/Sugar Labs)</li>
-<li>Max Shinn/Steve DuBois (GNU Generation)</li>
-<li>Marina Zhurakhinskaya (GNOME shell)</li>
-<li>Richard Stallman</li>
-</ul> 
-         
-               </div>
-        <div class="yui-u" id="sunday">
-
-         <h3>Sunday</h3>
-
-         <ul>
-<li>GNU Hackers</li>
-<li>Bradley M. Kuhn (SFLC)</li>
-<li>Free Software Mentoring Workshop</li>
-<li><a href="https://my.fsf.org/associate/support_freedom/donate?benefit_of=womenscaucus">Increase women's participation in free sw</a></li>
-<li>Free BIOS</li>
-<li>Software Licensing</li>
-<li>Ogg Vorbis/Theora</li>
-<li>Mozilla</li>
-</ul>
-         
-               </div>
-    </div>
+<p>Join the <a href="http://identi.ca/group/libreplanet">LibrePlanet group</a> and <a href="http://identi.ca/libreplanet">follow us on Identi.ca</a>, the free software microblogging site.</p>
 
+</div>
+    </div>
 
-       <div class="yui-g">
-<h2><img src="i/hacking-banner.png" alt="Plus: three day dedicated hacking track! Bring your laptop and work on your own projects! Network Services, phone hacking and graphics libraries" /></h2>
+   </div>
 
-       </div>
+   <div id="ft" role="contentinfo">
 
-       <div class="yui-g" id="signup">
 
-         <p><a href="http://groups.fsf.org/wiki/LibrePlanet2010/Attendees">Sign up today!</a> &mdash; $60 for non-FSF associate members &mdash; <a href="https://my.fsf.org/associate/support_freedom?referrer=7776">join now</a></p>
+<div id="fsfcopyright">Copyright 2009, <a href="http://www.fsf.org/">Free Software Foundation</a>, Inc.</div>
 
-       </div>
+     <p><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"></a></p>
 
-</div>
+         <p id="feedback">Your feedback on our new website is welcome. <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a></p>
 
-<div id="ft">
 
-   <p>March 19th &mdash; 21st 2010 &nbsp;&mdash;&nbsp; Harvard Science Center</p>
-
-</div>
 </div>
-<div id="womens">
-
-<p>This year's conference features a dedicated track to help increase women's participation in free software. You can help this vital issue, by <a href="https://my.fsf.org/associate/support_freedom/donate?benefit_of=womenscaucus">donating to the travel fund</a>.</p>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
index 719dd2bfea0a83357caccaa2a5e60a913239770f..9bbee0acd1ee0fe815782d3f40e31f86b098caff 100644 (file)
--- a/join.php
+++ b/join.php
@@ -8,7 +8,7 @@
 
         <div id="big-globe">
  
-<p><img src="big-globe.png" /></p>
+<p><a href="/2010"><img src="http://static.fsf.org/nosvn/260px-LibrePlanet2010-flyer.png" alt="LibrePlanet 2010, March 19th, 20th, 21st 2010 at Harvard Science Center, Cambridge, MA" /></a></p>
 
      </div>
 
index 55568519476738ee64b2dd9bf62674c46b3443d1..b7ad18e08102007145823e256e1dbca4735f86c8 100644 (file)
 
      .middlebox{background-color: #ddd !important;}
 
-     #tab-projects #content li{font-size: 18px !important; line-height: 26px;}
\ No newline at end of file
+     #tab-projects #content li{font-size: 18px !important; line-height: 26px;}
+
+#tab-content #content a{ color: yellow; }
\ No newline at end of file