Author: mfranklin
Date: Tue Mar 12 14:36:02 2013
New Revision: 1455550
URL: http://svn.apache.org/r1455550
Log:
Fixed rendering issues for new downloads format.
Modified:
rave/site/trunk/content/data/releases.json
rave/site/trunk/content/downloads.mdtext
rave/site/trunk/templates/skeleton.html
Modified: rave/site/trunk/content/data/releases.json
URL:
http://svn.apache.org/viewvc/rave/site/trunk/content/data/releases.json?rev=1455550&r1=1455549&r2=1455550&view=diff
==============================================================================
--- rave/site/trunk/content/data/releases.json (original)
+++ rave/site/trunk/content/data/releases.json Tue Mar 12 14:36:02 2013
@@ -3,13 +3,13 @@ releases = {
supported: {
title: "Supported",
releases: [
- "0.20.1"
+ version: "0.20.1"
]
},
archived: {
- title: "Archived",
+ title: "Archive",
releases: [
-
+ version: "0.20.1"
]
}
}
\ No newline at end of file
Modified: rave/site/trunk/content/downloads.mdtext
URL:
http://svn.apache.org/viewvc/rave/site/trunk/content/downloads.mdtext?rev=1455550&r1=1455549&r2=1455550&view=diff
==============================================================================
--- rave/site/trunk/content/downloads.mdtext (original)
+++ rave/site/trunk/content/downloads.mdtext Tue Mar 12 14:36:02 2013
@@ -48,8 +48,8 @@ All downloads can be verified using the
{{#each releases}}
<tr>
<td>{{version}} {{#if note}}<a
href="#{{note.id}}">note</a>{{/if}}</td>
- <td><a href="{{#getSource version}}">zip</a> (<a href="{{#getSource
version}}.asc">asc</a> <a href="{{#getSource version}}.md5">md5</a>)</td>
- <td><ul><li> <a href="{{#getTar version}}">tar.gz</a> (<a
href="{{#getTar version}}.asc">asc</a> <a href="{{#getTar
version}}.md5">md5</a>) </li><li> <a href="{{#getZip version}}">zip</a> (<a
href="{{#getZip version}}.asc">asc</a> <a href="{{#getZip
version}}.md5">md5</a> </li></ul></td>
+ <td><a href="{{sourceUrl}}">zip</a> (<a
href="{{sourceUrl}}.asc">asc</a> <a href="{{sourceUrl}}.md5">md5</a>)</td>
+ <td><ul><li> <a href="{{tarUrl}}">tar.gz</a> (<a
href="{{tarUrl}}.asc">asc</a> <a href="{{tarUrl}}.md5">md5</a>) </li><li> <a
href="{{zipUrl}}">zip</a> (<a href="{{zipUrl}}.asc">asc</a> <a
href="{{zipUrl}}.md5">md5</a> </li></ul></td>
</tr>
{{/each}}
</tbody>
@@ -57,7 +57,10 @@ All downloads can be verified using the
</script>
<script>
- function getMirrorUrl(version, type) {
+ rave = rave || {};
+ rave.downloads = {};
+
+ rave.downloads.getMirrorUrl =function(version, type) {
switch(type) {
case "SOURCE":
return
"http://www.apache.org/dyn/closer.cgi/rave/sources/rave-project-" + version +
"-source-release.zip",
@@ -68,7 +71,7 @@ All downloads can be verified using the
}
}
- function getArchiveUrl(version, type) {
+ rave.downloads.getArchiveUrl = function(version, type) {
switch(type) {
case "SOURCE":
return
"http://archive.apache.org/dist/rave/sources/rave-project-" + version +
"-source-release.zip",
@@ -79,32 +82,44 @@ All downloads can be verified using the
}
}
- function updateDownloadLinks(version) {
+ rave.downloads.updateDownloadLinks = function(version) {
$("#version_label").html(version);
- $("#source_dl").href(getMirrorUrl(version, "SOURCE"));
- $("#tar_dl").href(getMirrorUrl(version, "TAR"));
- $("#zip_dl").href(gitMirrorUrl(version, "ZIP"));
+ $("#source_dl").href(rave.downloads.getMirrorUrl(version, "SOURCE"));
+ $("#tar_dl").href(rave.downloads.getMirrorUrl(version, "TAR"));
+ $("#zip_dl").href(rave.downloads.gitMirrorUrl(version, "ZIP"));
}
- function renderReleases(template, type, data) {
+ rave.downloads.renderReleases =function(template, type, data) {
var items = data[type];
if(items && items.releases && items.releases.length > 0) {
+ rave.downloads.addUrls(type, items);
$("#" + type).html(template(items);
} else {
$("#" + type).html("<p>There are no " + type + " releases at this
time");
}
}
-</script>
-
-<script>
- $(document)(function() {
+ rave.downloads.addUrls(type, items) {
+ var fn = type == "supported" ? rave.downloads.getMirrorUrl :
rave.downloads.getArchiveUrl;
+ for(var i; i < items.releases.length; i++) {
+ var item = items.releases[i];
+ item.sourceUrl=fn(item.version, "SOURCE");
+ item.tarUrl=fn(item.version, "TAR");
+ item.zipUrl=fn(item.version, "ZIP");
+ }
+ }
+ rave.downloads.init =function() {
var template = Handlebars.compile($("#release-table").html());
if(typeof releases !== "undefined") {
- updateDownloadLinks(releases.latest);
- renderReleases(template, "supported", releases);
- renderReleases(template, "archived", releases);
+ rave.downloads.updateDownloadLinks(releases.latest);
+ rave.downloads.renderReleases(template, "supported", releases);
+ rave.downloads.renderReleases(template, "archived", releases);
}
- });
+ }
</script>
<script
src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.0.0-rc.3/handlebars.min.js"></script>
-<script src="/data/releases.json"></script>
\ No newline at end of file
+<script src="/data/releases.json"></script>
+<script>
+ if(typeof rave !== "undefined" && rave.initFunctions) {
+ rave.initFunctions.push(rave.downloads.init);
+ }
+</script>
\ No newline at end of file
Modified: rave/site/trunk/templates/skeleton.html
URL:
http://svn.apache.org/viewvc/rave/site/trunk/templates/skeleton.html?rev=1455550&r1=1455549&r2=1455550&view=diff
==============================================================================
--- rave/site/trunk/templates/skeleton.html (original)
+++ rave/site/trunk/templates/skeleton.html Tue Mar 12 14:36:02 2013
@@ -25,6 +25,7 @@
<link href="/css/bootstrap.min.css" rel="stylesheet"/>
<link href="/css/rave.css" rel="stylesheet"/>
<title>{% block title %}{{ headers.title }}{% endblock %}</title>
+ <script>rave={initFunctions:[]};</script>
</head>
<body>
@@ -85,18 +86,13 @@
<script
src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.1.1/bootstrap.min.js"></script>
<script src="//www.google.com/jsapi"></script>
<script>
- function init() {
- var tables=document.getElementsByTagName("table");
- for(var i=0; i<tables.length; i++) {
- tables[i].className += "table table-striped";
- }
- }
-
- if (window.addEventListener) {
- window.addEventListener('load', init, false)
- } else if (window.attachEvent) {
- window.attachEvent('onload', init);
- }
+ $(document).ready(function() {
+ for(var i; i<rave.initFunctions.length; i++) {
+ rave.initFunctions[i]();
+ }
+ $("table").addClass("table table-striped");
+ });
+
google.load('search', '1', {language : 'en'});
google.setOnLoadCallback(function() {
var customSearchOptions = {}; var customSearchControl = new
google.search.CustomSearchControl(