From e56e7b549bf02a87a0dc9757c1677df352c02454 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 23 Apr 2013 16:18:43 -0400 Subject: [PATCH] more stuff on pw reset --- public/src/app.js | 2 +- public/src/templates.js | 2 +- public/templates/header.tpl | 12 ++++++------ public/templates/reset_code.tpl | 26 ++++++++++++++++++++++++++ src/templates.js | 2 +- src/webserver.js | 5 +++++ 6 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 public/templates/reset_code.tpl diff --git a/public/src/app.js b/public/src/app.js index 7418b2d5a6..dd379f8306 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -5,7 +5,7 @@ var socket, (function() { $.ajax({ - url: 'config.json?v=' + new Date().getTime(), + url: '/config.json?v=' + new Date().getTime(), success: function(data) { config = data; socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : ''); diff --git a/public/src/templates.js b/public/src/templates.js index 5e1c11f0a6..cbe94d1643 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -5,7 +5,7 @@ function loadTemplates(templatesToLoad) { for (var t in templatesToLoad) { (function(template) { - $.get('templates/' + template + '.tpl?v=' + timestamp, function(html) { + $.get('/templates/' + template + '.tpl?v=' + timestamp, function(html) { templates[template] = html; }); }(templatesToLoad[t])); diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 8799e79534..d25675eb5f 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -3,13 +3,13 @@ - + - - - - - + + + + +