From ecb16aaba622a2d1f015a64eb63c6fa7f4a15c01 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Thu, 13 Sep 2012 15:42:41 -0700
Subject: [PATCH] review fixes
- dont escape siteName, we escape it right when we get it
- no longer need site views symlink
- remove ejs lib from /test
---
resources/static/dialog/views/authenticate.ejs | 2 +-
resources/static/dialog/views/confirm_email.ejs | 2 +-
resources/views/test.ejs | 1 -
scripts/postinstall.js | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/resources/static/dialog/views/authenticate.ejs b/resources/static/dialog/views/authenticate.ejs
index 99e82cad3..ad963538c 100644
--- a/resources/static/dialog/views/authenticate.ejs
+++ b/resources/static/dialog/views/authenticate.ejs
@@ -4,7 +4,7 @@
<div class="form_section">
<p class="start">
- <%- format(gettext('%s uses Persona instead of usernames to sign you in.'), ["<strong>" + escape(siteName) +"</strong>"]) %>
+ <%- format(gettext('%s uses Persona instead of usernames to sign you in.'), ["<strong>" + siteName + "</strong>"]) %>
</p>
diff --git a/resources/static/dialog/views/confirm_email.ejs b/resources/static/dialog/views/confirm_email.ejs
index 853019e62..f11114fe3 100644
--- a/resources/static/dialog/views/confirm_email.ejs
+++ b/resources/static/dialog/views/confirm_email.ejs
@@ -9,6 +9,6 @@
</p>
<p>
- <%- format(gettext('Click the link in the confirmation email. You\'ll then immediately be signed in to %s.'), ["<strong>" + escape(siteName) + "</strong>"]) %>
+ <%- format(gettext('Click the link in the confirmation email. You\'ll then immediately be signed in to %s.'), ["<strong>" + siteName + "</strong>"]) %>
</p>
diff --git a/resources/views/test.ejs b/resources/views/test.ejs
index 1a11a48e5..c4662d1d1 100644
--- a/resources/views/test.ejs
+++ b/resources/views/test.ejs
@@ -68,7 +68,6 @@
<script src="/include.js"></script>
<script src="/common/js/lib/jquery-1.7.1.min.js"></script>
<script src="/common/js/lib/underscore.js"></script>
- <script src="/common/js/lib/ejs.js"></script>
<script src="/common/js/lib/gobbledygook.js"></script>
<script src="/common/js/javascript-extensions.js"></script>
<script src="/common/js/lib/bidbundle.js"></script>
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index 9af5bec42..93e64ff06 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -28,7 +28,6 @@ function copy(src, dest) {
}
copy('../node_modules/jwcrypto/bidbundle.js', '../resources/static/common/js/lib/bidbundle.js');
-relativeLink('../resources/views', '../resources/static/dialog/views/site');
// generate ephemeral keys
--
GitLab