changeset 259:b18d0f96829d

Merge sjl/hg-website
author David Soria Parra <dsp@php.net>
date Sun, 04 Oct 2009 04:21:47 +0200
parents f6ace8678dd1 (diff) 37c381bc813d (current diff)
children dd7fababf8b6
files templates/base.html templates/frontpage.html
diffstat 4 files changed, 30 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Sat Oct 03 22:05:20 2009 -0400
+++ b/.hgsubstate	Sun Oct 04 04:21:47 2009 +0200
@@ -1,1 +1,1 @@
-914a04f4f87c8339c587fe6f810482529be31731 content
+6293e2d423105e6abe6a21f81d3ab67616ea2096 content
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/javascript/download.js	Sun Oct 04 04:21:47 2009 +0200
@@ -0,0 +1,10 @@
+function os_detection() {
+    var OSName="Source";
+    if (navigator.appVersion.indexOf("Win")!=-1) OSName="Windows";
+    if (navigator.appVersion.indexOf("Mac")!=-1) OSName="Mac OS X";
+    if (navigator.appVersion.indexOf("X11")!=-1) OSName="UNIX";
+    if (navigator.appVersion.indexOf("Linux")!=-1) OSName="Linux";
+
+    document.write(OSName);
+}
+
--- a/templates/base.html	Sat Oct 03 22:05:20 2009 -0400
+++ b/templates/base.html	Sun Oct 04 04:21:47 2009 +0200
@@ -8,6 +8,7 @@
         <link href="/css/styles.css" type="text/css" rel="stylesheet">
         <script type="text/javascript" src="/javascript/typeface.js"></script>
         <script type="text/javascript" src="/javascript/optimer_regular.typeface.js"></script>
+        <script type="text/javascript" src="/javascript/download.js"></script>
         <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
 
         <title>Mercurial SCM</title>
@@ -46,7 +47,21 @@
                     </div>
                     <div class="col">
                         {% block sidebar %}
-                            No sidebar on this page yet.
+                        <a class="download typeface-js" href="/downloads">
+                                    <strong>Download now</strong>
+                                    Mercurial <em>1.3.1</em>
+                                    <span><script language="javascript">os_detection();</script></span>
+                        </a>
+                        <dl>
+                            <dt class="typeface-js">Requirements</dt>
+                            <dd>Python 2.4 (<a href="http://www.python.org">get python</a>)</dd>
+                            <!--2.4 is necessary for TortoiseHG, Mercurial only needs 2.3-->
+
+                            <dt>Another OS?<br><em>Get mercurial for:</em></dt>
+                            <dd><a href="/downloads">Mac OS X</a></dd>
+                            <dd><a href="/downloads">Windows</a></dd>
+                            <dd><a href="/downloads">other</a></dd>
+                        </dl>
                         {% endblock %}
                     </div>
                 </div>
--- a/templates/frontpage.html	Sat Oct 03 22:05:20 2009 -0400
+++ b/templates/frontpage.html	Sun Oct 04 04:21:47 2009 +0200
@@ -8,7 +8,9 @@
         <h2>Mercurial is a free, distributed source control management tool. It efficiently handles projects of any size and offers an easy and intuitive interface.</h2>
     </div>
     <div class="col">                   
-        {# TODO: download button #}
+        {% block sidebar %}
+         {{ super() }}
+        {% endblock %}
     </div>
 </div>