From bbf247245f5395b98d15def3e689a7e804010212 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Thu, 30 Jan 2014 20:16:05 -0800
Subject: Updating Videos and Script.

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.
---
 src/com/p4square/grow/frontend/TrainingPageResource.java | 6 +++---
 src/templates/templates/training.ftl                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.2.3