diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2014-01-30 20:16:05 -0800 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2014-01-30 20:37:54 -0800 |
| commit | bbf247245f5395b98d15def3e689a7e804010212 (patch) | |
| tree | dc724754257fb95a6f3efe97b266af7e9f178c6c /src | |
| parent | e38de23db148ffb47bd5f076764ebbd5f2a35812 (diff) | |
Updating Videos and Script.20140130a
Video numbers may now be decimals (i.e. 5.1, 5.2). If the number is 0 it
is not displayed on the website.
Updating the videos-from-csv.py script to distinguish between user
facing video numbers and video ids.
Also updating urls for many videos.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/p4square/grow/frontend/TrainingPageResource.java | 6 | ||||
| -rw-r--r-- | src/templates/templates/training.ftl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/p4square/grow/frontend/TrainingPageResource.java b/src/com/p4square/grow/frontend/TrainingPageResource.java index 0706ead..2010ca3 100644 --- a/src/com/p4square/grow/frontend/TrainingPageResource.java +++ b/src/com/p4square/grow/frontend/TrainingPageResource.java @@ -58,10 +58,10 @@ public class TrainingPageResource extends FreeMarkerPageResource { return -1; } - int leftNumber = Integer.valueOf(leftNumberStr); - int rightNumber = Integer.valueOf(rightNumberStr); + double leftNumber = Double.valueOf(leftNumberStr); + double rightNumber = Double.valueOf(rightNumberStr); - return leftNumber - rightNumber; + return Double.compare(leftNumber, rightNumber); } }; diff --git a/src/templates/templates/training.ftl b/src/templates/templates/training.ftl index f40f4ce..3f5331e 100644 --- a/src/templates/templates/training.ftl +++ b/src/templates/templates/training.ftl @@ -37,7 +37,7 @@ <#list videos as video> <article> <div class="image <#if video.completed>completed</#if> <#if allowed>allowed</#if>" id="${video.id}"><a href="#" onclick="playVideo('${video.id}'); return false"><img src="${video.image!staticRoot+"/images/videoimage.jpg"}" alt="${video.title}" /></a></div> - <h2>${video.number}. ${video.title}</h2> + <h2><#if video.number != "0">${video.number}. </#if>${video.title}</h2> <span class="duration"><@hms seconds=video.length /></span> <#if (video.pdf!"") != ""> <span class="pdf"><a href="${video.pdf}" target="_blank">Outline</a></span> |