#597 Handlebars compilation script and template sources added. Adding…

… id to modal dialog buttons in the game.
ocadotechnology · Aug 25, 2015 · da5a09c · da5a09c
1 parent 7d89a46
commit da5a09c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 43 deletions.
diff --git a/compile_handlebars.sh b/compile_handlebars.sh
@@ -0,0 +1 @@
+handlebars handlebars --min -f game/static/game/js/templates.js 
diff --git a/game/static/game/js/button.js b/game/static/game/js/button.js
@@ -42,8 +42,8 @@ var ocargo = ocargo || {};
 ocargo.button = {};
 
 // Returns the html code for a button which closes the popup using handlebars precompiled templates
-ocargo.button.getDismissButtonHtml = function(label){
-    return Handlebars.templates['button-dismiss']({label: label});
+ocargo.button.getDismissButtonHtml = function(id, label){
+    return Handlebars.templates['button-dismiss']({label: label, id: id});
 }
 
 // Returns the html code for a button which redirects to location using handlebars precompiled templates
@@ -53,5 +53,5 @@ ocargo.button.getRedirectButtonHtml = function(location, label){
 
 // Returns the html code for a button which shows the try again message and closes the popup
 ocargo.button.getTryAgainButtonHtml = function(){
-    return ocargo.button.getDismissButtonHtml(ocargo.messages.tryagainLabel)
+    return ocargo.button.getDismissButtonHtml('try_again_button', ocargo.messages.tryagainLabel)
 }
diff --git a/game/static/game/js/drawing.js b/game/static/game/js/drawing.js
@@ -938,7 +938,7 @@ ocargo.Drawing.startPopup = function(title, subtitle, message, mascot, buttons,
     if(buttons){
         $('#modal-buttons').html(buttons);
     } else {
-        $('#modal-buttons').html(ocargo.button.getDismissButtonHtml("Close"));
+        $('#modal-buttons').html(ocargo.button.getDismissButtonHtml('close_button', 'Close'));
     }
 
     setTimeout( function() { $('#myModal').foundation('reveal', 'open'); }, delay);

diff --git a/game/static/game/js/game.js b/game/static/game/js/game.js
@@ -103,7 +103,7 @@ ocargo.Game.prototype.setup = function() {
         }
     }
     ocargo.Drawing.startPopup(title, LESSON,
-         loggedOutWarning, true, ocargo.button.getDismissButtonHtml('Play'));
+         loggedOutWarning, true, ocargo.button.getDismissButtonHtml('play_button', 'Play'));
 };
 
 ocargo.Game.prototype.reset = function() {

diff --git a/game/static/game/js/templates.js b/game/static/game/js/templates.js
diff --git a/handlebars/button-dismiss.handlebars b/handlebars/button-dismiss.handlebars
@@ -0,0 +1,3 @@
+<button id="{{id}}" class="navigation_button long_button" onclick="document.getElementById('close-modal').click()">
+    <span>{{label}}</span>
+</button>
diff --git a/handlebars/button-redirect.handlebars b/handlebars/button-redirect.handlebars
@@ -0,0 +1,3 @@
+<button class="navigation_button long_button" onclick="window.location.href={{location}}">
+    <span>{{label}}</span>
+</button>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		handlebars handlebars --min -f game/static/game/js/templates.js