[gnomeweb-wml] Fix t-shirt contest pages



commit 9a75a9a4be4b84634b7560adffe53fafde0fee0a
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Jan 5 09:55:07 2011 +0100

    Fix t-shirt contest pages
    
    Headers/footers should not be in the wml files, and formsubmit.php is
    really just a page_DATA not page_SCRIPTS.

 www.gnome.org/contest/Makefile.am                  |    4 +-
 www.gnome.org/contest/error.html.wml               |   71 --------------------
 .../contest/{formsubmit.wml => formsubmit.php}     |    0
 www.gnome.org/contest/index.wml                    |   29 --------
 www.gnome.org/contest/thank-you.html.wml           |   71 --------------------
 5 files changed, 2 insertions(+), 173 deletions(-)
---
diff --git a/www.gnome.org/contest/Makefile.am b/www.gnome.org/contest/Makefile.am
index 18333c2..edc62ea 100644
--- a/www.gnome.org/contest/Makefile.am
+++ b/www.gnome.org/contest/Makefile.am
@@ -7,12 +7,12 @@ page_SCRIPTS = \
 	index.html \
 	rules.html \
 	error.html.php \
-	formsubmit.php \
 	thank-you.html.php 
 	
 
 include $(top_srcdir)/rules.common
 
-page_DATA =
+page_DATA = \
+	formsubmit.php
 
 EXTRA_DIST=$(page_DATA)
diff --git a/www.gnome.org/contest/error.html.wml b/www.gnome.org/contest/error.html.wml
index aa00fdc..057b2aa 100644
--- a/www.gnome.org/contest/error.html.wml
+++ b/www.gnome.org/contest/error.html.wml
@@ -1,11 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>
 <html>
 <head>
-  <link href="../www.gnome.org/css/layout.css" rel="stylesheet" type="text/css" media="screen">
-  <link href="../www.gnome.org/css/style.css" rel="stylesheet" type="text/css" media="all">
-  <link rel="icon" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png";>
-  <link rel="SHORTCUT ICON" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png";>
-
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>GNOME t-shirt contest</title>
 <link rel="stylesheet" href="css/reset.css" />
@@ -16,49 +11,6 @@
 </head>
 
 <body>
-  <!-- site header -->
-  <div id="page">
-    <ul id="general">
-      <li id="siteaction-gnome_home" class="home">
-        <a href="http://www.gnome.org/"; title="Home">Home</a>
-      </li>
-      <li id="siteaction-gnome_news">
-        <a href="http://news.gnome.org/"; title="News">News</a>
-      </li>
-      <li id="siteaction-gnome_projects">
-        <a href="http://projects.gnome.org/"; title="Projects">Projects</a>
-      </li>
-      <li id="siteaction-gnome_art">
-        <a href="http://art.gnome.org/"; title="Art">Art</a>
-      </li>
-      <li id="siteaction-gnome_support">
-        <a href="http://www.gnome.org/support/"; title="Support">Support</a>
-      </li>
-      <li id="siteaction-gnome_development">
-        <a href="http://library.gnome.org/devel/"; title="Development">Development</a>
-      </li>
-      <li id="siteaction-gnome_community">
-        <a href="http://www.gnome.org/community/"; title="Community">Community</a>
-      </li>
-    </ul>
-    <div id="header">
-      <h1></h1>
-      <div id="tabs">
-        <ul id="portal-globalnav">
-<li><a href="http://www.gnome.org/about/";><span>About</span></a></li> <li><a href="http://www.gnome.org/start/stable/";><span>Latest Release</span></a></li> <li><a href="http://www.gnome.org/support/";><span>Support</span></a></li> <li><a href="http://www.gnome.org/community/";><span>Contribute</span></a></li> <li><a href="http://www.gnome.org/contact/";><span>Contact</span></a></li>
-        </ul>
-      </div> <!-- end of #tabs -->
-    </div> <!-- end of #header -->
-  </div>
-<!-- end site header -->
-
-  
-
-  <div id="body">
-    <div id="content">
-
-
-
 <div class="container_16 contest-content">
 <div class="grid_5 tshirt">&nbsp;</div>
 
@@ -85,28 +37,5 @@
 </div>
 </div> <!-- container_16 -->
 </div>
-
-
-  </div> <!-- end of div#content -->
-
-  <div id="footer">
-    Copyright &copy; 2005-2010 <a href="http://www.gnome.org/";>The GNOME Project</a>.<br>
-    <a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href="http://www.w3.org/";>standards</a>. Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.
-  </div>
-
-  </div> <!-- end of div#body -->
-
-<!-- Piwik -->
-<!-- <script type="text/javascript"<>
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=1"; style="border:0" alt=""/></p></noscript> -->
-<!-- End Piwik Tag -->
 </body>
 </html>
diff --git a/www.gnome.org/contest/formsubmit.wml b/www.gnome.org/contest/formsubmit.php
similarity index 100%
rename from www.gnome.org/contest/formsubmit.wml
rename to www.gnome.org/contest/formsubmit.php
diff --git a/www.gnome.org/contest/index.wml b/www.gnome.org/contest/index.wml
index c44b371..563b161 100644
--- a/www.gnome.org/contest/index.wml
+++ b/www.gnome.org/contest/index.wml
@@ -1,11 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>
 <html>
 <head>
-  <link href="/css/layout.css" rel="stylesheet" type="text/css" media="screen">
-  <link href="/css/style.css" rel="stylesheet" type="text/css" media="all">
-  <link rel="icon" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png";>
-  <link rel="SHORTCUT ICON" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png";>
-
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>GNOME t-shirt contest</title>
 <link rel="stylesheet" href="css/reset.css" />
@@ -16,12 +11,6 @@
 </head>
 
 <body>
-
-  <div id="body">
-    <div id="content">
-
-
-
 <div class="container_16 contest-content">
 <div class="grid_5 tshirt">&nbsp;</div>
 
@@ -321,23 +310,5 @@
 </div>
 </div> <!-- container_16 -->
 </div>
-
-
-  </div> <!-- end of div#content -->
-
-  </div> <!-- end of div#body -->
-
-<!-- Piwik -->
-<!-- <script type="text/javascript"<>
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=1"; style="border:0" alt=""/></p></noscript> -->
-<!-- End Piwik Tag -->
 </body>
 </html>
diff --git a/www.gnome.org/contest/thank-you.html.wml b/www.gnome.org/contest/thank-you.html.wml
index bb4ca70..0034048 100644
--- a/www.gnome.org/contest/thank-you.html.wml
+++ b/www.gnome.org/contest/thank-you.html.wml
@@ -1,11 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>
 <html>
 <head>
-  <link href="../www.gnome.org/css/layout.css" rel="stylesheet" type="text/css" media="screen">
-  <link href="../www.gnome.org/css/style.css" rel="stylesheet" type="text/css" media="all">
-  <link rel="icon" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png";>
-  <link rel="SHORTCUT ICON" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png";>
-
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>GNOME t-shirt contest</title>
 <link rel="stylesheet" href="css/reset.css" />
@@ -16,49 +11,6 @@
 </head>
 
 <body>
-  <!-- site header -->
-  <div id="page">
-    <ul id="general">
-      <li id="siteaction-gnome_home" class="home">
-        <a href="http://www.gnome.org/"; title="Home">Home</a>
-      </li>
-      <li id="siteaction-gnome_news">
-        <a href="http://news.gnome.org/"; title="News">News</a>
-      </li>
-      <li id="siteaction-gnome_projects">
-        <a href="http://projects.gnome.org/"; title="Projects">Projects</a>
-      </li>
-      <li id="siteaction-gnome_art">
-        <a href="http://art.gnome.org/"; title="Art">Art</a>
-      </li>
-      <li id="siteaction-gnome_support">
-        <a href="http://www.gnome.org/support/"; title="Support">Support</a>
-      </li>
-      <li id="siteaction-gnome_development">
-        <a href="http://library.gnome.org/devel/"; title="Development">Development</a>
-      </li>
-      <li id="siteaction-gnome_community">
-        <a href="http://www.gnome.org/community/"; title="Community">Community</a>
-      </li>
-    </ul>
-    <div id="header">
-      <h1></h1>
-      <div id="tabs">
-        <ul id="portal-globalnav">
-<li><a href="http://www.gnome.org/about/";><span>About</span></a></li> <li><a href="http://www.gnome.org/start/stable/";><span>Latest Release</span></a></li> <li><a href="http://www.gnome.org/support/";><span>Support</span></a></li> <li><a href="http://www.gnome.org/community/";><span>Contribute</span></a></li> <li><a href="http://www.gnome.org/contact/";><span>Contact</span></a></li>
-        </ul>
-      </div> <!-- end of #tabs -->
-    </div> <!-- end of #header -->
-  </div>
-<!-- end site header -->
-
-  
-
-  <div id="body">
-    <div id="content">
-
-
-
 <div class="container_16 contest-content">
 <div class="grid_5 tshirt">&nbsp;</div>
 
@@ -85,28 +37,5 @@
 </div>
 </div> <!-- container_16 -->
 </div>
-
-
-  </div> <!-- end of div#content -->
-
-  <div id="footer">
-    Copyright &copy; 2005-2010 <a href="http://www.gnome.org/";>The GNOME Project</a>.<br>
-    <a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href="http://www.w3.org/";>standards</a>. Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.
-  </div>
-
-  </div> <!-- end of div#body -->
-
-<!-- Piwik -->
-<!-- <script type="text/javascript"<>
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=1"; style="border:0" alt=""/></p></noscript> -->
-<!-- End Piwik Tag -->
 </body>
 </html>



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