Author: andreasr
Date: Sun Sep 27 17:21:07 2015
New Revision: 29982

URL: http://svn.gna.org/viewcvs/freeciv?rev=29982&view=rev
Log:
Update based on latest feedback.

Modified:
    website/donate.html
    website/download.html
    website/index.html
    website/js/freeciv.js

Modified: website/donate.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/donate.html?rev=29982&r1=29981&r2=29982&view=diff
==============================================================================
--- website/donate.html (original)
+++ website/donate.html Sun Sep 27 17:21:07 2015
@@ -1,3 +1,65 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Freeciv.org - Freeciv is a Free and Open Source empire-building 
strategy game.</title>
+
+    <link rel="apple-touch-icon" href="images/civicon.png" />
+    <link rel="shortcut icon" href="images/civicon.png" />
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/freeciv.css" rel="stylesheet">
+
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-40584174-1', 'auto');
+  ga('send', 'pageview');  
+
+</script> 
+<style>
+.container {
+  display: none;
+}
+</style>
+  </head>
+  <body>
+  <script type="text/javascript" 
src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-553240ed5ba009c1" 
async="async"></script>
+
+    <!-- Fixed navbar -->
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target="#navbar" aria-expanded="false" 
aria-controls="navbar">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="http://www.freeciv.org";><img 
id="top_logo" alt="Freeciv.org" src="images/logo-top.png"></a> <!--Logo font 
is: Liberation Sans Bold Italic -->
+        </div>
+        <div id="navbar" class="collapse navbar-collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="http://www.freeciv.org";>Home</a></li>
+            <li><a href="http://www.freeciv.org/wiki/";>Wiki</a></li>
+            <li><a href="download.html">Download</a></li>
+            <li><a href="https://play.freeciv.org";>Freeciv-web</a></li>
+            <li><a href="http://meta.freeciv.org";>Metaserver</a></li>
+            <li><a href="http://forum.freeciv.org";>Forum</a></li>
+          </ul>
+         <form class="navbar-form navbar-right searchbox">
+               <iframe 
src="https://duckduckgo.com/search.html?width=170&amp;site=www.freeciv.org,forum.freeciv.org,freeciv.wikia.com,play.freeciv.org&amp;prefill=Search
 Freeciv.org" 
style="overflow:hidden;margin:0;padding:0;width:228px;height:40px;" 
frameborder="0"></iframe>
+          </form>
+        </div>
+      </div>
+    </nav>
+
+    <!-- Begin page content -->
+    <div id="content" class="container">
     
 
 <div class="row" >
@@ -29,4 +91,23 @@
 </div>
 
   
+    </div>
 
+
+    <footer class="footer">
+      <div class="container">
+        <p class="text-muted">&copy; The Freeciv Project 1996-<script 
type="text/javascript">document.write(new Date().getFullYear());</script>. 
+              Freeciv is free and open source software. Freeciv is released 
under the <a href="https://www.gnu.org/copyleft/gpl.html";>GNU General Public 
License</a>, while the Freeciv-web client is released under the <a 
href="http://www.gnu.org/licenses/agpl-3.0.html";>GNU Affero General Public 
License</a>.</p>
+      </div>
+    </footer>
+
+
+
+    <script src="js/jquery.min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/detect.js"></script>
+    <script src="js/freeciv.js"></script>
+  </body>
+</html>
+
+

Modified: website/download.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/download.html?rev=29982&r1=29981&r2=29982&view=diff
==============================================================================
--- website/download.html       (original)
+++ website/download.html       Sun Sep 27 17:21:07 2015
@@ -1,3 +1,65 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Freeciv.org - Freeciv is a Free and Open Source empire-building 
strategy game.</title>
+
+    <link rel="apple-touch-icon" href="images/civicon.png" />
+    <link rel="shortcut icon" href="images/civicon.png" />
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/freeciv.css" rel="stylesheet">
+
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-40584174-1', 'auto');
+  ga('send', 'pageview');  
+
+</script> 
+<style>
+.container {
+  display: none;
+}
+</style>
+  </head>
+  <body>
+  <script type="text/javascript" 
src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-553240ed5ba009c1" 
async="async"></script>
+
+    <!-- Fixed navbar -->
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target="#navbar" aria-expanded="false" 
aria-controls="navbar">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="http://www.freeciv.org";><img 
id="top_logo" alt="Freeciv.org" src="images/logo-top.png"></a> <!--Logo font 
is: Liberation Sans Bold Italic -->
+        </div>
+        <div id="navbar" class="collapse navbar-collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="http://www.freeciv.org";>Home</a></li>
+            <li><a href="http://www.freeciv.org/wiki/";>Wiki</a></li>
+            <li><a href="download.html">Download</a></li>
+            <li><a href="https://play.freeciv.org";>Freeciv-web</a></li>
+            <li><a href="http://meta.freeciv.org";>Metaserver</a></li>
+            <li><a href="http://forum.freeciv.org";>Forum</a></li>
+          </ul>
+         <form class="navbar-form navbar-right searchbox">
+               <iframe 
src="https://duckduckgo.com/search.html?width=170&amp;site=www.freeciv.org,forum.freeciv.org,freeciv.wikia.com,play.freeciv.org&amp;prefill=Search
 Freeciv.org" 
style="overflow:hidden;margin:0;padding:0;width:228px;height:40px;" 
frameborder="0"></iframe>
+          </form>
+        </div>
+      </div>
+    </nav>
+
+    <!-- Begin page content -->
+    <div id="content" class="container">
     
 
     <div class="row" >
@@ -59,3 +121,23 @@
 
   
 
+
+    </div>
+
+
+    <footer class="footer">
+      <div class="container">
+        <p class="text-muted">&copy; The Freeciv Project 1996-<script 
type="text/javascript">document.write(new Date().getFullYear());</script>. 
+              Freeciv is free and open source software. Freeciv is released 
under the <a href="https://www.gnu.org/copyleft/gpl.html";>GNU General Public 
License</a>, while the Freeciv-web client is released under the <a 
href="http://www.gnu.org/licenses/agpl-3.0.html";>GNU Affero General Public 
License</a>.</p>
+      </div>
+    </footer>
+
+
+
+    <script src="js/jquery.min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/detect.js"></script>
+    <script src="js/freeciv.js"></script>
+  </body>
+</html>
+

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=29982&r1=29981&r2=29982&view=diff
==============================================================================
--- website/index.html  (original)
+++ website/index.html  Sun Sep 27 17:21:07 2015
@@ -46,7 +46,7 @@
           <ul class="nav navbar-nav">
             <li class="active"><a href="http://www.freeciv.org";>Home</a></li>
             <li><a href="http://www.freeciv.org/wiki/";>Wiki</a></li>
-            <li><a href="?page=download">Download</a></li>
+            <li><a href="download.html">Download</a></li>
             <li><a href="https://play.freeciv.org";>Freeciv-web</a></li>
             <li><a href="http://meta.freeciv.org";>Metaserver</a></li>
             <li><a href="http://forum.freeciv.org";>Forum</a></li>
@@ -66,7 +66,7 @@
                        <div id="lead_text">Freeciv is a Free and Open Source 
empire-building strategy game inspired by the history of human 
civilization.</div>
                </div>
                <div id="links_box">
-               <div id="download_box"><a id="download_button" class="dl_link" 
href="?page=download">Download Freeciv</a> 
+               <div id="download_box"><a id="download_button" class="dl_link" 
href="download.html">Download Freeciv</a> 
                <p class="dl_text">Stable Version 2.5.1 released on 15th Aug 
2015</p></div>
                <div id="web_box"><a class="dl_link" 
href="https://play.freeciv.org";>Play Freeciv-web</a> 
                <p class="dl_text">The online browser version of Freeciv using 
HTML5</p></div>
@@ -84,7 +84,7 @@
           <a href="http://www.freeciv.org/wiki/Screenshots";>Screenshots</a> |
           <a 
href="http://www.freeciv.org/wiki/Interface_Language";>Languages</a> |
           <a href="http://www.freeciv.org/wiki/People";>Authors</a> |
-          <a href="?page=donate">Donate</a> | 
+          <a href="donate.html">Donate</a> | 
           <a href="http://gna.org/bugs/?group=freeciv";>Bug tracker</a> | 
           <a href="http://gna.org/projects/freeciv/";>Gna project</a> | 
           <a href="https://github.com/freeciv/freeciv-web";>Github</a> | 
@@ -97,7 +97,7 @@
         <div class="col-lg-8 left_pagepart" >
           <h2>Project news </h2>
                <ul>
-                <li><b>18th Sep 2015</b> - The Freeciv.org project website has 
been redesigned.</li>
+                <li><b>27th Sep 2015</b> - The Freeciv.org project website has 
been redesigned.</li>
                <li><b>15th Aug 2015</b> - Two new bugfix releases of Freeciv: 
2.5.1 and, for those still playing 2.4, a final 2.4.5 release.</li>
                <li><b>14th Mar 2015</b> - After 18 months, Freeciv 2.5.0 is 
released. NEWS-2.5.0 describes what's changed since 2.4.x.
 (The previous stable release, 2.4.4, is still available from the Download 
page.)</li>
@@ -113,7 +113,7 @@
         <div class="col-lg-4 right_pagepart" >
          <h2>Support the Freeciv project</h2>
                The best way to support the Freeciv project is to make a 
donation here:
-               <a href="?page=donate">Donate using Paypal</a>
+               <a href="donate.html">Donate using Paypal</a>
           <br>
                <h2>Screenshots of Freeciv</h2>
                 <a href="http://www.freeciv.org/wiki/Screenshots";><img 
style="width:90%; max-width: 400px;" 
src="images/freeciv-screenshot-2.5.0.png"></a>

Modified: website/js/freeciv.js
URL: 
http://svn.gna.org/viewcvs/freeciv/website/js/freeciv.js?rev=29982&r1=29981&r2=29982&view=diff
==============================================================================
--- website/js/freeciv.js       (original)
+++ website/js/freeciv.js       Sun Sep 27 17:21:07 2015
@@ -1,39 +1,10 @@
-var getUrlParameter = function getUrlParameter(sParam) {
-    var sPageURL = decodeURIComponent(window.location.search.substring(1)),
-        sURLVariables = sPageURL.split('&'),
-        sParameterName,
-        i;
-
-    for (i = 0; i < sURLVariables.length; i++) {
-        sParameterName = sURLVariables[i].split('=');
-
-        if (sParameterName[0] === sParam) {
-            return sParameterName[1] === undefined ? true : sParameterName[1];
-        }
-    }
-};
-
-
-var page = getUrlParameter('page');
-
-if (page == "download" || page == "donate") {
-  $.ajax({
-    url: page + ".html",
-    cache: true,
-    async: false
-  })
-  .done(function(doc) {
-    $( "#content" ).html(doc);
-  });
-
-}
 
 
 $(function() {
   $(".container").show();
 
   $("#download_box").click(function() {
-  window.location="?page=download";
+  window.location="download.html";
   });
   $("#web_box").click(function() {
   window.location="https://play.freeciv.org";;
@@ -53,7 +24,7 @@
   } else if (window.ui.os=="Mac OS X") {
     $("#download_button").attr("href", 
"http://freeciv.wikia.com/wiki/Install-MacOSX";);
   } else {
-    $("#download_button").attr("href", "?page=download");
+    $("#download_button").attr("href", "download.html");
   }
 
 });


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to