Skip to content

Commit f344ad7

Browse files
committed
chore: clean-up download page
- remove old analytics-label noise and dead code - fix checksum rendering to be OS-adaptive and updated for Windows - fix release notes links; moving next to the date
1 parent 75795ef commit f344ad7

23 files changed

Lines changed: 97 additions & 413 deletions

source/assets/javascripts/app/_download.js

Lines changed: 29 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -39,49 +39,42 @@ var showDownloadLinks = (function ($) {
3939
);
4040

4141
var addURLToFiles = function (release) {
42-
var addDetailsFrom = R.curry(function (release, analyticsIDPrefix, o) {
42+
var addDetailsFrom = R.curry(function (release, o) {
4343
var afterAddingURL = R.assoc(
4444
"url",
4545
settings.download_prefix + release["go_full_version"] + "/" + o["file"],
4646
o
4747
);
48-
var afterAddingFilename = R.assoc(
48+
return R.assoc(
4949
"filename",
5050
R.last(o["file"].split("/")),
5151
afterAddingURL,
5252
o
5353
);
54-
var afterAddingAnalyticsID = R.assoc(
55-
"analytics_id",
56-
analyticsIDPrefix + "_" + release["go_full_version"],
57-
afterAddingFilename,
58-
o
59-
);
60-
return afterAddingAnalyticsID;
6154
});
6255

6356
return R.evolve({
6457
win: {
65-
server: addDetailsFrom(release, "Windows-Server"),
66-
agent: addDetailsFrom(release, "Windows-Agent"),
58+
server: addDetailsFrom(release),
59+
agent: addDetailsFrom(release),
6760
},
6861
osx: {
69-
server: addDetailsFrom(release, "Mac-Server"),
70-
agent: addDetailsFrom(release, "Mac-Agent"),
71-
"server-aarch64": addDetailsFrom(release, "Mac-Server-Aarch64"),
72-
"agent-aarch64": addDetailsFrom(release, "Mac-Agent-Aarch64")
62+
server: addDetailsFrom(release), // only needed for "show older releases" until June 2027
63+
agent: addDetailsFrom(release), // only needed for "show older releases" until June 2027
64+
"server-aarch64": addDetailsFrom(release),
65+
"agent-aarch64": addDetailsFrom(release)
7366
},
7467
deb: {
75-
server: addDetailsFrom(release, "LinuxDeb-Server"),
76-
agent: addDetailsFrom(release, "LinuxDeb-Agent")
68+
server: addDetailsFrom(release),
69+
agent: addDetailsFrom(release)
7770
},
7871
rpm: {
79-
server: addDetailsFrom(release, "LinuxRpm-Server"),
80-
agent: addDetailsFrom(release, "LinuxRpm-Agent")
72+
server: addDetailsFrom(release),
73+
agent: addDetailsFrom(release)
8174
},
8275
generic: {
83-
server: addDetailsFrom(release, "Package-Server"),
84-
agent: addDetailsFrom(release, "Package-Agent")
76+
server: addDetailsFrom(release),
77+
agent: addDetailsFrom(release)
8578
}
8679
},
8780
release
@@ -99,7 +92,7 @@ var showDownloadLinks = (function ($) {
9992
var addReleaseDate = R.curry(function (release) {
10093
return R.assoc(
10194
"release_date",
102-
new Date(release["release_time_readable"]).toDateString().substr(4),
95+
new Date(release["release_time_readable"]).toDateString().substring(4),
10396
release
10497
);
10598
});
@@ -229,9 +222,8 @@ var setupShowVerifyChecksumMessage = (function ($) {
229222
);
230223
$("#verify-checksum-message").html(
231224
template({
225+
installer_type: checksumElement.data("installer_type"),
232226
filename: checksumElement.data("filename"),
233-
md5sum: checksumElement.data("md5sum"),
234-
sha1sum: checksumElement.data("sha1sum"),
235227
sha256sum: checksumElement.data("sha256sum")
236228
})
237229
);
@@ -241,19 +233,9 @@ var setupShowVerifyChecksumMessage = (function ($) {
241233
})(jQuery);
242234

243235
var determinePackageNameBasedOnOS = function () {
244-
var userDefinedPackageName = window.location.hash.substr(1);
245-
var validPackageNames = [
246-
"zip",
247-
"windows",
248-
"osx",
249-
"debian",
250-
"redhat",
251-
"docker"
252-
];
253-
if (
254-
userDefinedPackageName !== "" &&
255-
validPackageNames.includes(userDefinedPackageName)
256-
) {
236+
var userDefinedPackageName = window.location.hash.substring(1);
237+
var validPackageNames = ["zip", "windows", "osx", "debian", "redhat", "docker"];
238+
if (userDefinedPackageName !== "" && validPackageNames.includes(userDefinedPackageName)) {
257239
return userDefinedPackageName;
258240
}
259241

@@ -273,24 +255,13 @@ var switchDownloadType = function (currentInstallerType) {
273255
$(".release-type input." + currentInstallerType).attr("checked", true);
274256
};
275257

276-
var showHelpLinksFor = (function ($) {
277-
return function (packageName) {
278-
var installer_type_to_help_link_type = {
279-
debian: "linux",
280-
redhat: "linux",
281-
windows: "windows",
282-
zip: "zip",
283-
osx: "osx"
284-
};
285-
var template = Handlebars.compile($("#downloads-help-links").html());
258+
Handlebars.registerHelper("in", function (string, substring) {
259+
return string.includes(substring);
260+
});
286261

287-
$("#help-links").html(
288-
template({
289-
os: installer_type_to_help_link_type[packageName]
290-
})
291-
);
292-
};
293-
})(jQuery);
262+
Handlebars.registerHelper("not_in", function (string, substring) {
263+
return !string.includes(substring);
264+
});
294265

295266
Handlebars.registerHelper("size", function (
296267
array,
@@ -326,7 +297,6 @@ Handlebars.registerHelper("size", function (
326297
options.inverse(this);
327298
default:
328299
throw "Invalid operator " + operator + ".";
329-
break;
330300
}
331301
});
332302

@@ -353,6 +323,10 @@ function additionalArch(release) {
353323
return archsFor(release)[1];
354324
}
355325

326+
Handlebars.registerHelper('json', function (context) {
327+
return JSON.stringify(context, null, 2);
328+
});
329+
356330
Handlebars.registerHelper("primary-arch", primaryArch);
357331

358332
Handlebars.registerHelper("additional-arch", additionalArch);

source/assets/javascripts/app/_main.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -127,25 +127,6 @@ jQuery(document).ready(function ($) {
127127
$(".imagemodal").hide();
128128
});
129129

130-
// Add smooth scrolling to analytics CTA and support page CTA
131-
$(".cta-analytics, .support-banner-cta").on('click', function(event) {
132-
var clickedElement = $(this);
133-
var anchorOfTargetElement = clickedElement.data('link-target');
134-
var offsetToUseForScrolling = parseInt(clickedElement.data('link-target-offset') || "0");
135-
136-
if (typeof anchorOfTargetElement === "undefined") {
137-
return;
138-
}
139-
140-
$('html, body').animate({
141-
scrollTop: $(anchorOfTargetElement).offset().top + offsetToUseForScrolling
142-
}, 800, function() {
143-
history.replaceState(null, null, anchorOfTargetElement);
144-
});
145-
146-
event.preventDefault();
147-
});
148-
149130
//why go-cd lightbox
150131
$('.chocolat-parent').Chocolat();
151132

source/assets/stylesheets/scss/_analytics-trial.scss

Lines changed: 0 additions & 21 deletions
This file was deleted.

source/assets/stylesheets/scss/_downloads.scss

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,6 @@ body.download {
173173
}
174174
}
175175

176-
.fa {
177-
display: none;
178-
}
179-
180176
.notes {
181177
margin: 20px 0;
182178

@@ -232,7 +228,6 @@ body.download {
232228
z-index: 20;
233229
padding: 30px;
234230
background: rgba(0, 0, 0, 0.80);
235-
left: 0;
236231

237232
@media (min-width: $screen-tablet) {}
238233

@@ -255,22 +250,20 @@ body.download {
255250

256251
@media (min-width: $screen-tablet) {
257252
width: 90%;
258-
width: 100%;
259253
transform: translateY(-50%);
260254
left: 0;
261255
top: 50%;
262256
}
263257

264258
@media (min-width: $screen-desktop) {
265259
width: 90%;
266-
width: 800px;
267260
transform: translate(-50%, -50%);
268261
left: 50%;
269262
top: 50%;
270263
}
271264

272265
.code {
273-
width: 735px;
266+
width: 90%;
274267

275268
.commands,
276269
.prompts,
@@ -286,14 +279,15 @@ body.download {
286279
.prompts {
287280
color: #777;
288281
float: left;
289-
width: 14%;
282+
width: 10%;
283+
height: 100%;
290284
margin: 10px 0 0 0;
291285
padding: 10px 10px 0 10px;
292286
}
293287

294288
.commands {
295289
float: right;
296-
width: 86%;
290+
width: 90%;
297291
margin: 10px 0 0 0;
298292
padding: 10px 10px 0 10px;
299293
}

source/assets/stylesheets/scss/_roadmap.scss

Lines changed: 0 additions & 28 deletions
This file was deleted.

source/assets/stylesheets/site.css.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@
4141
@import "scss/contribute";
4242
@import "scss/resources";
4343
@import "scss/releases";
44-
@import "scss/roadmap";
4544
@import "scss/innerpages";
4645
@import "scss/campaign";
4746
@import "scss/continuousdelivery";
4847
@import "scss/gocd-demo";
4948
@import "scss/test-drive-gocd";
5049
@import "scss/prism.min";
5150
@import "scss/pipeline_conf";
52-
@import "scss/analytics-trial";
5351
@import "scss/analytics-feedback";
5452
@import "chocolate_override";
5553
@import "scss/elastic-agents";

source/cd101/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ show_features: true
4141
</div>
4242
</div>
4343

44-
<%= link_to 'Download for free', "/assets/images/campaign/cd101/ebook-continuous-delivery-101.pdf", {:class => "btn button-brand cd101-cta", "analytics-label" => "campaign-download-cta"} %>
44+
<%= link_to 'Download for free', "/assets/images/campaign/cd101/ebook-continuous-delivery-101.pdf", {:class => "btn button-brand cd101-cta"} %>
4545

4646
</div>
4747
<% end %>

source/contribute.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ meta_keywords: "GoCD, continuous delivery, continuous delivery software, continu
132132
<h3>How to start contributing</h3>
133133
<p>
134134
Decide how you want to contribute: picking up an <a href="https://github.com/gocd/gocd/issues">outstanding
135-
issue</a>, adding a new feature, or building a plugin, etc. Looking for inspiration? Check out <%= link_to 'GoCD\'s Roadmap', '/roadmap/index.html' %> for a view into where the product is heading this year.
135+
issue</a>, adding a new feature, or building a plugin, etc.
136136
</p>
137137

138138
<p>

0 commit comments

Comments
 (0)