[pypy-commit] pypy.org extradoc: merge heads
arigo
noreply at buildbot.pypy.org
Thu May 16 18:17:37 CEST 2013
Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r433:39f12d0d5bca
Date: 2013-05-16 18:17 +0200
http://bitbucket.org/pypy/pypy.org/changeset/39f12d0d5bca/
Log: merge heads
diff --git a/archive.html b/archive.html
--- a/archive.html
+++ b/archive.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/compat.html b/compat.html
--- a/compat.html
+++ b/compat.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/contact.html b/contact.html
--- a/contact.html
+++ b/contact.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/css/site.css b/css/site.css
--- a/css/site.css
+++ b/css/site.css
@@ -353,6 +353,7 @@
#menu-follow {
float: right;
+ margin-top: 17px;
}
#menu-follow div {
@@ -379,6 +380,11 @@
font-size: 1em;
padding-bottom: 10px;
text-align: center;
+ line-height:1.75em;
+}
+
+#menu-sub a{
+ white-space: nowrap;
}
.menu-sub-sep {
diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/features.html b/features.html
--- a/features.html
+++ b/features.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/howtohelp.html b/howtohelp.html
--- a/howtohelp.html
+++ b/howtohelp.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/index.html b/index.html
--- a/index.html
+++ b/index.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/js/detect.js b/js/detect.js
deleted file mode 100644
--- a/js/detect.js
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$(document).ready(function() {
- var download_url, download_text;
- var base = 'https://bitbucket.org/pypy/pypy/downloads/';
- if (navigator.platform.indexOf('Linux') != -1) {
- if (navigator.platform.indexOf('64') != -1) {
- download_url = base + 'pypy-1.7-linux64.tar.bz2';
- download_text = 'Download linux x86-64 bin';
- } else {
- download_url = base + 'pypy-1.7-linux.tar.bz2';
- download_text = 'Download linux x86 bin (32 bit)';
- }
- } else if (navigator.platform.indexOf('Win') != -1) {
- download_url = base + 'pypy-1.7-win32.zip';
- download_text = 'Download Windows x86 bin (BETA)';
- } else if (navigator.platform.indexOf('Mac') != 1) {
- download_url = base + 'pypy-1.7-osx64.tar.bz2';
- download_text = 'Download Mac OS X 10.6 bin (64 bit)';
- } else {
- download_url = "download.html";
- download_text = "Download page";
- }
- $("#main_download").attr('href', download_url);
- $("#main_download").text(download_text);
-});
diff --git a/js/script2.js b/js/script2.js
--- a/js/script2.js
+++ b/js/script2.js
@@ -1,28 +1,21 @@
+function set_sidebar_html(html) {
+ $("#sidebar").html(html);
+}
function py3k_donate() {
- $.get("don1.html#", function (html) {
- $("#sidebar").html(html);
- });
+ $.get("don1.html", set_sidebar_html);
}
function stm_donate() {
- $.get("don4.html#", function (html) {
- $("#sidebar").html(html);
- });
+ $.get("don4.html", set_sidebar_html);
}
function general_donate() {
- $.get("don2.html#", function (html) {
- $("#sidebar").html(html);
- });
+ $.get("don2.html", set_sidebar_html);
}
function numpy_donate() {
- $.get("don3.html#", function (html) {
- $("#sidebar").html(html);
- });
+ $.get("don3.html", set_sidebar_html);
}
-$(document).ready(function() {
- stm_donate();
-});
\ No newline at end of file
+$(document).ready(stm_donate);
diff --git a/numpydonate.html b/numpydonate.html
--- a/numpydonate.html
+++ b/numpydonate.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/people.html b/people.html
--- a/people.html
+++ b/people.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/performance.html b/performance.html
--- a/performance.html
+++ b/performance.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/py3donate.html b/py3donate.html
--- a/py3donate.html
+++ b/py3donate.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/source/_layouts/site.genshi b/source/_layouts/site.genshi
--- a/source/_layouts/site.genshi
+++ b/source/_layouts/site.genshi
@@ -46,7 +46,6 @@
</py:if>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"/>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/sponsor.html b/sponsor.html
--- a/sponsor.html
+++ b/sponsor.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/success.html b/success.html
--- a/success.html
+++ b/success.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
diff --git a/tmdonate.html b/tmdonate.html
--- a/tmdonate.html
+++ b/tmdonate.html
@@ -15,7 +15,6 @@
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
- <script type="text/javascript" src="js/detect.js"></script>
<script type="text/javascript" src="js/script2.js?bust=1"></script>
</head>
<body>
More information about the pypy-commit
mailing list