Author: andreasr
Date: Fri Sep 18 21:26:39 2015
New Revision: 29925

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

Added:
    website/donate.html
    website/images/flattr.png   (with props)
    website/images/freeciv-screenshot-2.5.0.png   (with props)
    website/images/paypal.gif   (with props)
Modified:
    website/download.html
    website/index.html
    website/js/freeciv.js

Added: website/donate.html
URL: http://svn.gna.org/viewcvs/freeciv/website/donate.html?rev=29925&view=auto
==============================================================================
--- website/donate.html (added)
+++ website/donate.html Fri Sep 18 21:26:39 2015
@@ -0,0 +1,32 @@
+    
+
+<div class="row" >
+   <div class="col-lg-10 left_pagepart" >
+        <h1>Donations</h1>
+
+<br>Follow a link below to donate to the Freeciv Project!<br><br>
+
+<a 
href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QKGC4Q5FSMKLC";>
+<img src="images/paypal.gif"> Donate via PayPal</a> <br><br>
+<a href="http://flattr.com/thing/449279/Freeciv-org";>
+<img src="images/flattr.png">
+Donate via Flattr</a> <br><br>
+A big THANK YOU to all who have contributed. <br><br>
+
+As of May 2013, new donations all go towards hosting for freeciv.org, and 
specifically mostly for the web version (<a 
href="https://play.freeciv.org";>play.freeciv.org</a>), which requires 
moderately substantial hardware. Freeciv hosting is shared with the Warzone 
2100 project. 
+
+<br><br>
+
+Currently we don't have any up-to-date information on donations we've had, but 
you can browse some <a href="http://www.freeciv.org/wiki/Donations/old";>old 
information.</a>  <br>
+
+
+
+
+
+
+   </div>
+
+</div>
+
+  
+

Modified: website/download.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/download.html?rev=29925&r1=29924&r2=29925&view=diff
==============================================================================
--- website/download.html       (original)
+++ website/download.html       Fri Sep 18 21:26:39 2015
@@ -1,60 +1,3 @@
-<!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> 
-  </head>
-  <body>
-
-
-    <!-- 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><a href="http://www.freeciv.org";>Home</a></li>
-            <li><a href="http://www.freeciv.org/wiki/";>Wiki</a></li>
-            <li class="active"><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&prefill=Search
 for Freeciv.org" 
style="overflow:hidden;margin:0;padding:0;width:228px;height:40px;" 
frameborder="0"></iframe>
-          </form>
-        </div>
-      </div>
-    </nav>
-
-    <div class="container">
-
     
 
     <div class="row" >
@@ -63,7 +6,7 @@
 
 
 
-Here you can download the latest version of Freeciv: 2.5.1. To learn what's 
changed between releases, see the <a 
href="http://freeciv.wikia.com/wiki/NEWS";>NEWS</a> page. For more download 
distributions, see the <a 
href="http://freeciv.wikia.com/wiki/More_distributions";>wiki</a>. 
+Here you can download the latest version of Freeciv: 2.5.1. To learn what's 
changed between releases, see the <a 
href="http://www.freeciv.org/wiki/NEWS";>NEWS</a> page. For more download 
distributions, see the <a 
href="http://www.freeciv.org/wiki/More_distributions";>wiki</a>. 
 
 <h2>Stable 2.5</h2>
 See the list of changes in the most recent release.
@@ -98,7 +41,7 @@
 Pick one. You can play the same Freeciv games with them; only the user 
interface is different. 
 
 <br><br>
-For older releases of Freeciv, see the <a 
href="http://freeciv.wikia.com/wiki/Download";>wiki</a>.
+For older releases of Freeciv, see the <a 
href="http://www.freeciv.org/wiki/Download";>wiki</a>.
 
 
 
@@ -116,21 +59,3 @@
 
   
 
-    </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>

Added: website/images/flattr.png
URL: 
http://svn.gna.org/viewcvs/freeciv/website/images/flattr.png?rev=29925&view=auto
==============================================================================
Binary file - no diff available.

Propchange: website/images/flattr.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: website/images/freeciv-screenshot-2.5.0.png
URL: 
http://svn.gna.org/viewcvs/freeciv/website/images/freeciv-screenshot-2.5.0.png?rev=29925&view=auto
==============================================================================
Binary file - no diff available.

Propchange: website/images/freeciv-screenshot-2.5.0.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: website/images/paypal.gif
URL: 
http://svn.gna.org/viewcvs/freeciv/website/images/paypal.gif?rev=29925&view=auto
==============================================================================
Binary file - no diff available.

Propchange: website/images/paypal.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=29925&r1=29924&r2=29925&view=diff
==============================================================================
--- website/index.html  (original)
+++ website/index.html  Fri Sep 18 21:26:39 2015
@@ -21,6 +21,11 @@
   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>
@@ -41,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="download.html">Download</a></li>
+            <li><a href="?page=download">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>
@@ -54,20 +59,20 @@
     </nav>
 
     <!-- Begin page content -->
-    <div class="container">
+    <div id="content" class="container">
 
       <div class="jumbotron">
                <div id="header_teaser">
                        <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="download.html">Download Freeciv</a> 
+               <div id="download_box"><a id="download_button" class="dl_link" 
href="?page=download">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>
-               <div id="forum_box"><a class="dl_link" 
href="http://forum.freeciv.org";>Visit community</a> 
+               <div id="forum_box"><a class="dl_link" 
href="http://forum.freeciv.org";>Community Forum</a> 
                <p class="dl_text">Join forum to meet the users of 
Freeciv</p></div>
-               <div id="development_box"><a class="dl_link" 
href="http://freeciv.wikia.com/wiki/How_to_Contribute";>Help Development</a> 
+               <div id="development_box"><a class="dl_link" 
href="http://www.freeciv.org/wiki/How_to_Contribute";>Help Development</a> 
                <p class="dl_text">New developers are welcome to contribute to 
the project</p></div>
 
                </div>
@@ -75,14 +80,14 @@
 
     <div class="row subheadermenu">
         <div class="col-lg-12">
-          <a href="http://freeciv.wikia.com/wiki/Features";>About</a> |
-          <a href="http://freeciv.wikia.com/wiki/Screenshots";>Screenshots</a> |
-          <a 
href="http://freeciv.wikia.com/wiki/Interface_Language";>Languages</a> |
-          <a href="http://freeciv.wikia.com/wiki/People";>Authors</a> |
-          <a href="http://freeciv.wikia.com/wiki/Manual";>Manual</a> | 
-          <a href="http://freeciv.wikia.com/wiki/Donations";>Donate</a> | 
+          <a href="http://www.freeciv.org/wiki/Features";>About</a> |
+          <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="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> | 
           <a href="https://mail.gna.org/listinfo/freeciv-dev";>Mailing list</a> 
 
         </div>
     </div>
@@ -92,22 +97,27 @@
         <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>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>
                </ul>
+        <br>
+        <a href="http://www.freeciv.org/wiki/News_archive";>All news...</a>
 
-
-       <center><div style="margin-top: 80px;" 
class="addthis_sharing_toolbox"></div></center>
+       <center><div style="margin-top: 80px;" 
class="addthis_sharing_toolbox"></div>
+               <a href="https://twitter.com/freeciv"; 
class="twitter-follow-button" data-show-count="false" data-size="large">Follow 
@freeciv</a>
+               <script>!function(d,s,id){var 
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document,
 'script', 'twitter-wjs');</script>
+       </center>
         </div>
         <div class="col-lg-4 right_pagepart" >
-         <h2>Community news </h2>
-               <ul>
-               <li><b>6th Sep 2015</b> - The Freeciv.org project website has 
been redesigned.</li>
-               </ul>
          <h2>Support the Freeciv project</h2>
                The best way to support the Freeciv project is to make a 
donation here:
-               <a href="http://freeciv.wikia.com/wiki/Donations";>Donate using 
paypal</a>
+               <a href="?page=donate">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>
+
         </div>
       </div>
 

Modified: website/js/freeciv.js
URL: 
http://svn.gna.org/viewcvs/freeciv/website/js/freeciv.js?rev=29925&r1=29924&r2=29925&view=diff
==============================================================================
--- website/js/freeciv.js       (original)
+++ website/js/freeciv.js       Fri Sep 18 21:26:39 2015
@@ -1,7 +1,39 @@
+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="download.html";
+  window.location="?page=download";
   });
   $("#web_box").click(function() {
   window.location="https://play.freeciv.org";;
@@ -21,7 +53,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", "download.html");
+    $("#download_button").attr("href", "?page=download");
   }
 
 });


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

Reply via email to