Skip to content

Commit 15c6c0e

Browse files
golorodenisaacs
authored andcommitted
website: download page
- Improved styling of download links. - index.html#download now redirects to /download/ - Added missing hyphens, and added the missing "and 64-bit" for the Mac Installer.
1 parent 3ccee08 commit 15c6c0e

File tree

10 files changed

+111
-185
lines changed

10 files changed

+111
-185
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ apidoc_sources = $(wildcard doc/api/*.markdown)
114114
apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html)) \
115115
$(addprefix out/,$(apidoc_sources:.markdown=.json))
116116

117-
apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos out/doc/images
117+
apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/download out/doc/logos out/doc/images
118118

119119
apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))
120120

@@ -132,6 +132,7 @@ website_files = \
132132
out/doc/pipe.css \
133133
out/doc/about/index.html \
134134
out/doc/community/index.html \
135+
out/doc/download/index.html \
135136
out/doc/logos/index.html \
136137
out/doc/changelog.html \
137138
$(doc_images)

doc/about/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div id="column2" class="interior">
2929
<ul>
3030
<li><a href="/" class="home">Home</a></li>
31-
<li><a href="/#download" class="download">Download</a></li>
31+
<li><a href="/download/" class="download">Download</a></li>
3232
<li><a href="/about/" class="about current">About</a></li>
3333
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
3434
<li><a href="http://nodejs.org/api/" class="docs">Docs</a></li>

doc/blog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<ul>
8282
<li><a href="http://nodejs.org/" class="home">Home</a></li>
8383

84-
<li><a href="http://nodejs.org/#download" class=
84+
<li><a href="http://nodejs.org/download/" class=
8585
"download">Download</a></li>
8686

8787
<li><a href="http://nodejs.org/about/" class="about">About</a></li>

doc/changelog-foot.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div id="footer">
55
<ul class="clearfix">
66
<li><a href="/">Node.js</a></li>
7-
<li><a href="/#download">Download</a></li>
7+
<li><a href="/download/">Download</a></li>
88
<li><a href="/about/">About</a></li>
99
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
1010
<li><a href="http://nodejs.org/api/">Docs</a></li>

doc/changelog-head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div id="column2" class="interior">
1818
<ul>
1919
<li><a href="/" class="home">Home</a></li>
20-
<li><a href="/#download" class="download">Download</a></li>
20+
<li><a href="/download/" class="download">Download</a></li>
2121
<li><a href="/about/" class="about">About</a></li>
2222
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
2323
<li><a href="http://nodejs.org/api/" class="docs current">Docs</a></li>

doc/community/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<div id="column2" class="interior">
3131
<ul>
3232
<li><a href="/" class="home">Home</a></li>
33-
<li><a href="/#download" class="download">Download</a></li>
33+
<li><a href="/download/" class="download">Download</a></li>
3434
<li><a href="/about/" class="about">About</a></li>
3535
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
3636
<li><a href="http://nodejs.org/api/" class="docs">Docs</a></li>
@@ -179,7 +179,7 @@ <h2 class="irc">IRC</h2>
179179
<div id="footer">
180180
<ul class="clearfix">
181181
<li><a href="/">Node.js</a></li>
182-
<li><a href="/#download">Download</a></li>
182+
<li><a href="/download/">Download</a></li>
183183
<li><a href="/about/">About</a></li>
184184
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
185185
<li><a href="http://nodejs.org/api/">Docs</a></li>

doc/download/index.html

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<style>
6+
ul {
7+
padding: 0;
8+
margin: 0;
9+
}
10+
</style>
11+
<link type="image/x-icon" rel="icon" href="../favicon.ico">
12+
<link type="image/x-icon" rel="shortcut icon" href="../favicon.ico">
13+
<link rel="stylesheet" href="../pipe.css">
14+
<link rel="stylesheet" href="../sh_vim-dark.css">
15+
<link rel="alternate"
16+
type="application/rss+xml"
17+
title="node blog"
18+
href="http://feeds.feedburner.com/nodejs/123123123">
19+
<title>node.js</title>
20+
</head>
21+
<body class="int">
22+
<div id="intro" class="interior">
23+
<a href="/" title="Go back to the home page">
24+
<img id="logo" src="http://nodejs.org/images/logo.png" alt="node.js">
25+
</a>
26+
</div>
27+
<div id="content" class="clearfix">
28+
<div id="column2" class="interior">
29+
<ul>
30+
<li><a href="/" class="home">Home</a></li>
31+
<li><a href="/download/" class="download current">Download</a></li>
32+
<li><a href="/about/" class="about">About</a></li>
33+
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
34+
<li><a href="http://nodejs.org/api/" class="docs">Docs</a></li>
35+
<li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
36+
<li><a href="/community/" class="community">Community</a></li>
37+
<li><a href="/logos/" class="logos">Logos</a></li>
38+
<li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li>
39+
</ul>
40+
<p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p>
41+
</div>
42+
<div id="column1" class="interior row">
43+
<p>
44+
Download the Node.js source code or a pre-built installer for your platform, and start developing today.
45+
</p>
46+
</div>
47+
<div id="column1" class="interior row">
48+
<h2 id="installers" class="installers">Installers</h2>
49+
<p>
50+
To install Node.js and npm use the appropriate installer for your platform, or discover <a href="https://raw.github.com/joyent/node/__VERSION__/ChangeLog">what's new</a> in <strong>Node.js __VERSION__</strong>.
51+
</p>
52+
<p>
53+
<strong>Mac OS X Installer</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.pkg">32- and 64-bit (.pkg)</a><br />
54+
<strong>Windows Installer</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-x86.msi">32-bit (.msi)</a> or
55+
<a href="http://nodejs.org/dist/__VERSION__/x64/node-__VERSION__-x64.msi">64-bit (.msi)</a><br />
56+
<strong>Linux Binaries</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x86.tar.gz">32-bit (.tar.gz)</a> or
57+
<a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x64.tar.gz">64-bit (.tar.gz)</a><br />
58+
<strong>Solaris Binaries</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x86.tar.gz">32-bit (.tar.gz)</a> or
59+
<a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x64.tar.gz">64-bit (.tar.gz)</a>
60+
</p>
61+
<p>
62+
Alternatively, you can install Node.js using various <a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">package managers</a>.
63+
</p>
64+
</div>
65+
<div id="column1" class="interior row">
66+
<h2 id="apiDocumentationAndSourceCode">API Documentation and Source Code</h2>
67+
<p>
68+
If you are unsure about how to use Node.js, the <a href="http://nodejs.org/docs/__VERSION__/api/">API documentation</a> is there to help.
69+
</p>
70+
<p>
71+
You can also have a look at the <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.tar.gz">source code</a>, or contribute to Node.js by
72+
forking the <a href="https://github.com/joyent/node">GitHub repository</a> and creating pull requests.
73+
</p>
74+
<p>
75+
There exist some <a href="http://nodejs.org/dist/__VERSION__">other release files</a> as well.
76+
</p>
77+
</div>
78+
<div id="column1" class="interior row">
79+
<h2 id="license">License</h2>
80+
<p>
81+
You may also be interested in the <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a> of Node.js.
82+
</p>
83+
</div>
84+
</div>
85+
</body>
86+
</html>

doc/index.html

Lines changed: 8 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
lightweight and efficient, perfect for data-intensive real-time
3030
applications that run across distributed devices.</p>
3131

32-
<a href="#download" class="button" id="downloadbutton">Download</a>
32+
<a href="download/" class="button" id="downloadbutton">Download</a>
3333
<a href="api/" class="button" id="docsbutton">Docs</a>
3434
<p class="version">__VERSION__</p>
3535

@@ -77,81 +77,6 @@ <h2>Node.js in the Industry</h2>
7777
</ul>
7878
</div>
7979

80-
<div id="download">
81-
<a href="#" id="download-close">X</a>
82-
<img id="download-logo" src="http://nodejs.org/images/download-logo.png" alt="node.js">
83-
<ul id="installers" class="clearfix">
84-
<li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-x86.msi">Windows Installer</a><br>node-__VERSION__-x86.msi</li>
85-
<li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.pkg">Macintosh Installer</a><br>node-__VERSION__.pkg</li>
86-
<li id="source"><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.tar.gz">Source Code</a><br>node-__VERSION__.tar.gz</li>
87-
</ul>
88-
<ul id="documentation">
89-
<li><a href="https://raw.github.com/joyent/node/__VERSION__/ChangeLog">Change Log</a></li>
90-
<li><a href="http://nodejs.org/docs/__VERSION__/api/">Documentation</a></li>
91-
<li><a href="http://nodejs.org/dist/__VERSION__">Other release files</a></li>
92-
<li><a href="http://nodejs.org/dist/__VERSION__/x64/node-__VERSION__-x64.msi">Windows x64 Installer</a></li>
93-
<li><a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">License</a></li>
94-
<li><a href="https://github.com/joyent/node">Git Repository</a></li>
95-
<li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing
96-
with a Package Manager</a>
97-
</ul>
98-
</div>
99-
100-
<script>;(function() {
101-
// attach as soon as the required elements are in the DOM.
102-
// don't need to wait for entire document to be ready, since we're
103-
// not adding any *new* nodes to the <body>, so there's no threat
104-
// of 'Invalid operation' errors in old MSIE 6.
105-
document.getElementById('downloadbutton').onclick = function(e) {
106-
e = e || window.event;
107-
e.stopPropagation && e.stopPropagation();
108-
e.cancelBubble = true;
109-
// need to give the hash a tick to update
110-
setTimeout(downloadDialogUpdate, 0);
111-
};
112-
113-
document.getElementById('download-close').onclick =
114-
document.documentElement.onclick = function(e) {
115-
e = e || window.event;
116-
if (location.hash === '#download') location.hash = '';
117-
downloadDialogUpdate();
118-
};
119-
120-
document.getElementById('download').onclick = function(e) {
121-
e = e || window.event;
122-
e.stopPropagation && e.stopPropagation();
123-
e.cancelBubble = true;
124-
};
125-
126-
// I keep expecting <Esc> to close the dialog...
127-
document.documentElement.onkeydown = function(e) {
128-
e = e || window.event;
129-
var k = e.which || e.keyCode || e.keyIdentifier;
130-
if (typeof k === 'string') k = k.charCodeAt(0);
131-
if (k === 27) document.documentElement.onclick(e);
132-
};
133-
134-
// hacky workaround for old ie browsers that don't support :target css.
135-
function downloadDialogUpdate () {
136-
var div = document.getElementById('download');
137-
if (!div) return;
138-
var expect = location.hash === '#download' ? 'block' : 'none';
139-
var actual = div.currentStyle ? div.currentStyle.display
140-
: window.getComputedStyle
141-
? document.defaultView.getComputedStyle(div, null).getPropertyValue('display')
142-
: null;
143-
144-
// it looks like a string, but it might not actually be a string.
145-
// explicitly cast for MSIE 6 and 7.
146-
actual = '' + actual;
147-
expect = '' + expect;
148-
if (actual !== expect) {
149-
div.style.display = expect;
150-
}
151-
}
152-
downloadDialogUpdate();
153-
})();</script>
154-
15580
<div id="content" class="clearfix">
15681
<div id="column1">
15782
<h2>An example: Webserver</h2>
@@ -204,7 +129,7 @@ <h2>Explore Node.js</h2>
204129
<div id="footer">
205130
<ul class="clearfix">
206131
<li><a href="/">Node.js</a></li>
207-
<li><a href="/#download">Download</a></li>
132+
<li><a href="/download/">Download</a></li>
208133
<li><a href="/about/">About</a></li>
209134
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
210135
<li><a href="http://nodejs.org/api/">Docs</a></li>
@@ -223,6 +148,12 @@ <h2>Explore Node.js</h2>
223148
<script src="sh_javascript.min.js"></script>
224149
<script>highlight(undefined, undefined, 'pre');</script>
225150

151+
<script type="text/javascript">
152+
if (location.hash === '#download') {
153+
location.href = 'download/';
154+
}
155+
</script>
156+
226157
<script>
227158
window._gaq = [['_setAccount', 'UA-10874194-2'], ['_trackPageview']];
228159
(function(d, t) {

doc/pipe.css

Lines changed: 7 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ h1 a, h2 a, h3 a, h4 a
308308
.row h2.conferences { background-position: left -522px; }
309309
.row h2.localized { background-position: left -414px; }
310310
.row h2.irc { background-position: left -626px; }
311+
.row h2.installers { background-position: left -522px; }
311312

312313
.block {
313314
width: 280px;
@@ -447,111 +448,18 @@ h1 a, h2 a, h3 a, h4 a
447448
}
448449

449450

450-
451-
div#download {
452-
position: absolute;
453-
width: 580px;
454-
text-align: center;
455-
top: 0;
456-
left: 50%;
457-
margin-left: -290px;
458-
-webkit-border-bottom-right-radius: 4px;
459-
-webkit-border-bottom-left-radius: 4px;
460-
-moz-border-radius-bottomright: 4px;
461-
-moz-border-radius-bottomleft: 4px;
462-
border-bottom-right-radius: 4px;
463-
border-bottom-left-radius: 4px;
464-
padding-top: 40px;
465-
-webkit-box-shadow: 0 0 32px #000;
466-
-moz-box-shadow: 0 0 32px #000;
467-
box-shadow: 0 0 32px #000;
468-
background:white;
469-
display: none;
470-
}
471-
472-
div#download:target {
473-
display: block;
474-
}
475-
476-
#download-close {
477-
background: url(http://nodejs.org/images/close-downloads.png) no-repeat top right;
478-
width: 64px;
479-
height: 64px;
480-
position: absolute;
481-
display: block;
482-
top:0;
483-
right:0;
484-
text-indent:-999em;
485-
}
486-
487-
div#download ul#installers {
488-
width: 550px;
489-
text-align: center;
490-
margin: 0 auto;
491-
background: url(http://nodejs.org/images/platform-icons.png) no-repeat top center;
492-
padding-top: 65px;
493-
padding-bottom: 50px;
494-
}
495-
496-
div#download ul#installers li {
497-
list-style-type: none;
498-
width: 165px;
499-
padding-left: 18px;
500-
float: left;
501-
display: block;
502-
color: #33342d;
503-
font-size: 10px;
504-
}
505-
506-
div#download ul#installers li#source {
507-
padding-left: 0;
508-
}
509-
510-
div#download ul#installers li a {
511-
font-size: 16px;
512-
padding-top: 50px;
513-
margin-top: -50px;
514-
}
515-
516-
div#download ul#documentation {
517-
background-color: #d4d7c3;
518-
padding: 20px 0 20px 40px;
519-
-webkit-border-bottom-right-radius: 4px;
520-
-webkit-border-bottom-left-radius: 4px;
521-
-moz-border-radius-bottomright: 4px;
522-
-moz-border-radius-bottomleft: 4px;
523-
border-bottom-right-radius: 4px;
524-
border-bottom-left-radius: 4px;
525-
}
526-
527-
div#download ul#documentation li {
528-
margin-left: 40px;
529-
text-align: left;
530-
color: #33342d;
531-
font-size: 14px;
532-
font-weight: bold;
533-
padding-bottom: 5px;
534-
}
535-
536-
div#download ul#documentation li a {
537-
color: #76a83f;
538-
}
539-
540-
#download-logo {
541-
margin-bottom: 37px;
542-
}
543-
544-
pre, tt, code {
545-
color: #d2d8ba;
451+
pre, tt, code {
452+
color: #d2d8ba;
546453
font-size: 14px;
547454
line-height: 22px;
548455
font-family: Monaco, Consolas, "Lucida Console", monospace;
549456
margin: 0; padding: 0;
550-
}
551-
#front pre, #front tt, #front code {
457+
}
458+
459+
#front pre, #front tt, #front code {
552460
font-size:12px;
553461
line-height:22px;
554-
}
462+
}
555463

556464
pre {
557465
padding-left: 1em;

0 commit comments

Comments
 (0)