Author: jtn
Date: Sun Oct  4 17:06:10 2015
New Revision: 30013

URL: http://svn.gna.org/viewcvs/freeciv?rev=30013&view=rev
Log:
Pre-deployment website changes.

 - restore some links lost in translation from wiki
 - add commented-out placeholders for elements we'll need at release time
 - tweak wording on index.html navbar
 - demote Wiki link in toolbar
 - disable Javascript which guesses which download link to offer for now,
   as the resulting page will be misleading when the latest version is not
   yet available for Windows
 - minor formatting/link tidyup

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=30013&r1=30012&r2=30013&view=diff
==============================================================================
--- website/donate.html (original)
+++ website/donate.html Sun Oct  4 17:06:10 2015
@@ -40,16 +40,16 @@
             <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 -->
+          <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 class="active"><a href="http://www.freeciv.org/";>Home</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://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>
+            <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>
@@ -66,25 +66,19 @@
    <div class="col-lg-10 left_pagepart" >
         <h1>Donations</h1>
 
-<br>Follow a link below to donate to the Freeciv Project!<br><br>
+<p>Follow a link below to donate to the Freeciv Project!</p>
 
-<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>
+<p><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>
 <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>
+Donate via Flattr</a></p>
 
-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. 
+<p>A big THANK YOU to all who have contributed.</p>
 
-<br><br>
+<p>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 <a 
href="http://donations.wz2100.net/";>the Warzone 2100 project</a>.</p>
 
-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>
-
-
-
-
-
+<p>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>.</p>
 
    </div>
 
@@ -109,5 +103,3 @@
     <script src="js/freeciv.js"></script>
   </body>
 </html>
-
-

Modified: website/download.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/download.html?rev=30013&r1=30012&r2=30013&view=diff
==============================================================================
--- website/download.html       (original)
+++ website/download.html       Sun Oct  4 17:06:10 2015
@@ -40,16 +40,16 @@
             <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 -->
+          <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 class="active"><a href="http://www.freeciv.org/";>Home</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://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>
+            <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>
@@ -71,7 +71,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://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.
+See the <a href="http://www.freeciv.org/wiki/NEWS-2.5.1";>list of changes</a> 
in the most recent release.
 
 <h3>Source Code</h3>
 To compile Freeciv yourself, download the source code:
@@ -86,35 +86,30 @@
 </ul>
 
 <h3>Windows Packages</h3>
+
+<!-- <div style="width: 100%; text-align: center; font-size: 1em; color: 
white; background-color: black;"><b>Windows packages for the latest release are 
not available yet.</b></div> -->
+
 Windows binaries are available at:
 <br>
 
 <ul>
-<li><b>Freeciv-2.5.1-win32-gtk2-setup.exe Mainstream client</b><br>
+<li><b>Freeciv-2.5.1-win32-gtk2-setup.exe <i>Mainstream client</i></b><br>
 <a 
href="http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.1-win32-gtk2-setup.exe?download";>Mirror
 1 (sourceforge.net)</a><br>
-<a 
href="http://download.gna.org/freeciv/packages/windows/Freeciv-2.5.1-win32-gtk2-setup.exe";>Mirror
 2 (gna.org)</a><br><br></li>
-<li><b>Freeciv-2.5.1-win32-sdl-setup.exe Experimental and more immersive 
client</b><br>
+<a 
href="http://download.gna.org/freeciv/packages/windows/Freeciv-2.5.1-win32-gtk2-setup.exe";>Mirror
 2 (gna.org)</a><br></li>
+<li><b>Freeciv-2.5.1-win32-sdl-setup.exe <i>Experimental and more immersive 
client</i></b><br>
 <a 
href="http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.1-win32-sdl-setup.exe?download";>Mirror
 1 (sourceforge.net)</a><br>
 <a 
href="http://download.gna.org/freeciv/packages/windows/Freeciv-2.5.1-win32-sdl-setup.exe";>Mirror
 2 (gna.org)</a><br></li>
-<li><b>Freeciv-2.5.1-win32-qt-setup.exe New experimental client</b><br>
-<a 
href="http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.1-win32-qt-setup.exe?download";>Mirror
 1 (sourceforge.net)</A><br>
-<a 
href="http://download.gna.org/freeciv/packages/windows/Freeciv-2.5.1-win32-qt-setup.exe";>Mirror
 2 (gna.org)</A><br></li>
+<li><b>Freeciv-2.5.1-win32-qt-setup.exe <i>New experimental client</i></b><br>
+<a 
href="http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.1-win32-qt-setup.exe?download";>Mirror
 1 (sourceforge.net)</a><br>
+<a 
href="http://download.gna.org/freeciv/packages/windows/Freeciv-2.5.1-win32-qt-setup.exe";>Mirror
 2 (gna.org)</a><br></li>
 </ul>
 Pick one. You can play the same Freeciv games with them; only the user 
interface is different. 
+
+<!-- FIXME: beta downloads? -->
 
 <br><br>
 For older releases of Freeciv, see the <a 
href="http://www.freeciv.org/wiki/Download";>wiki</a>.
 
-
-
-
-
-
-
-
-
-
-       
         </div>
 
     </div>
@@ -140,4 +135,3 @@
     <script src="js/freeciv.js"></script>
   </body>
 </html>
-

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=30013&r1=30012&r2=30013&view=diff
==============================================================================
--- website/index.html  (original)
+++ website/index.html  Sun Oct  4 17:06:10 2015
@@ -40,16 +40,16 @@
             <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 -->
+          <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 class="active"><a href="http://www.freeciv.org/";>Home</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://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>
+            <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>
@@ -68,9 +68,9 @@
                <div id="links_box">
                <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> 
+               <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";>Community Forum</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://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>
@@ -80,27 +80,27 @@
 
     <div class="row subheadermenu">
         <div class="col-lg-12">
-          <a href="http://www.freeciv.org/wiki/Features";>About</a> |
+          <a href="http://www.freeciv.org/wiki/Features";>Features</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="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> | 
-          <a href="https://mail.gna.org/listinfo/freeciv-dev";>Mailing list</a> 
 
+          <a href="http://gna.org/projects/freeciv/";>Code</a> | 
+          <a href="https://github.com/freeciv/freeciv-web";>Freeciv-web 
Github</a> | 
+          <a href="https://gna.org/mail/?group=freeciv";>Mailing lists</a>  
         </div>
     </div>
 
 
     <div class="row" >
         <div class="col-lg-8 left_pagepart" >
-          <h2>Project news </h2>
+          <h2>Project news</h2>
                <ul>
-                <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>
+                <li><b>4th Oct 2015</b> - The Freeciv.org front page has been 
redesigned.</li>
+                <li><b>15th Aug 2015</b> - Two new bugfix releases of Freeciv: 
<a href="http://www.freeciv.org/wiki/NEWS-2.5.1";>2.5.1</a> and, for those still 
playing 2.4, a final <a href="http://www.freeciv.org/wiki/NEWS-2.4.5";>2.4.5</a> 
release.</li>
+                <li><b>14th Mar 2015</b> - After 18 months, Freeciv 2.5.0 is 
released. <a href="http://www.freeciv.org/wiki/NEWS-2.5.0";>NEWS-2.5.0</a> 
describes what's changed since 2.4.x.
+                <br>(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>

Modified: website/js/freeciv.js
URL: 
http://svn.gna.org/viewcvs/freeciv/website/js/freeciv.js?rev=30013&r1=30012&r2=30013&view=diff
==============================================================================
--- website/js/freeciv.js       (original)
+++ website/js/freeciv.js       Sun Oct  4 17:06:10 2015
@@ -7,26 +7,34 @@
   window.location="download.html";
   });
   $("#web_box").click(function() {
-  window.location="https://play.freeciv.org";;
+  window.location="https://play.freeciv.org/";;
   });
   $("#forum_box").click(function() {
-  window.location="http://forum.freeciv.org";;
+  window.location="http://forum.freeciv.org/";;
   });
   $("#development_box").click(function() {
-  window.location="http://freeciv.wikia.com/wiki/How_to_Contribute";;
+  window.location="http://www.freeciv.org/wiki/How_to_Contribute";;
   });
 
   /* show download link based on the user's operating system */
+  /* FIXME: commented out until we can arrange that the displayed version
+   * number is correct even when e.g. the Windows package is not yet
+   * up to date. Would also be good to identify the platform we've guessed
+   * to the user and provide a backup link to download.html in the same
+   * place.
+  
   if (window.ui.os=="Windows") {
     $("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.1-win32-gtk2-setup.exe?download";);
   } else if (window.ui.os=="Linux") {
     $("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.1.tar.bz2?download";);
   } else if (window.ui.os=="Mac OS X") {
-    $("#download_button").attr("href", 
"http://freeciv.wikia.com/wiki/Install-MacOSX";);
+    $("#download_button").attr("href", 
"http://www.freeciv.org/wiki/Install-MacOSX";);
   } else {
     $("#download_button").attr("href", "download.html");
   }
 
+   * end of FIXME */
+
 });
 
 


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

Reply via email to