diff --git a/example/rp/index.html b/example/rp/index.html
index 1ff44aa9ed0e37be846258e0d91e30166d335665..7f75d42c0f62cdf793320e90a88df5ba4066f356 100644
--- a/example/rp/index.html
+++ b/example/rp/index.html
@@ -195,8 +195,8 @@ $(document).ready(function() {
privacyURL: $('#privacy').attr('checked') ? "/privacy.html" : undefined,
tosURL: $('#tos').attr('checked') ? "/TOS.html" : undefined,
requiredEmail: requiredEmail,
- name: name,
- logoURL: logoURL,
+ siteName: name,
+ siteLogo: logoURL,
oncancel: function() {
loggit("oncancel");
$(".specify button.assertion").removeAttr('disabled');
diff --git a/resources/static/dialog/controllers/dialog.js b/resources/static/dialog/controllers/dialog.js
index 740994a93ce35b50aa2b4736b6ef07cb9ebbef59..8d9725d5120c29f38b095d7a1cb747e0706eeb5e 100644
--- a/resources/static/dialog/controllers/dialog.js
+++ b/resources/static/dialog/controllers/dialog.js
@@ -173,15 +173,15 @@ BrowserID.Modules.Dialog = (function() {
params.privacyURL = fixupURL(origin_url, paramsFromRP.privacyPolicy);
}
- if (paramsFromRP.logoURL) {
+ if (paramsFromRP.siteLogo) {
// Until we have our head around the dangers of data uris and images
// that come from other domains, only allow absolute paths from the
// origin.
- params.logoURL = fixupAbsolutePath(origin_url, paramsFromRP.logoURL);
+ params.siteLogo = fixupAbsolutePath(origin_url, paramsFromRP.siteLogo);
}
- if (paramsFromRP.name) {
- params.name = _.escape(paramsFromRP.name);
+ if (paramsFromRP.siteName) {
+ params.siteName = _.escape(paramsFromRP.siteName);
}
if (hash.indexOf("#CREATE_EMAIL=") === 0) {
diff --git a/resources/static/dialog/controllers/rp_info.js b/resources/static/dialog/controllers/rp_info.js
index 92384bfcac6d200781dbf47fd5ff887a698aee98..3bc9b20edd9efb34d9466a815024b6e09c0775e9 100644
--- a/resources/static/dialog/controllers/rp_info.js
+++ b/resources/static/dialog/controllers/rp_info.js
@@ -31,8 +31,8 @@ BrowserID.Modules.RPInfo = (function() {
*/
renderer.render("#rp_info", "rp_info", {
hostname: options.hostname,
- name: options.name,
- logoURL: options.logoURL
+ siteName: options.siteName,
+ siteLogo: options.siteLogo
});
sc.start.call(this, options);
diff --git a/resources/static/dialog/css/popup.css b/resources/static/dialog/css/popup.css
index b1d96da234a3a74fc4fc6aff7c7832a555c3ef8a..39d97a1f508042e5650c79ca03fa7d77b6f0dff5 100644
--- a/resources/static/dialog/css/popup.css
+++ b/resources/static/dialog/css/popup.css
@@ -291,11 +291,19 @@ section > .contents {
#favicon h2, #favicon h3 {
white-space: nowrap;
text-overflow: ellipsis;
- height: 1.2em; /* the 1.2em is to keep y, g, j, etc from having their bottoms chopped off */
+ line-height: 1.3; /* the 1.3em is to keep y, g, j, etc from having their bottoms chopped off */
overflow: hidden;
+}
+
+#favicon h2 {
margin: 10px 0 0 0;
}
+#favicon h3 {
+ font-size: 19px;
+ margin-top: 0;
+}
+
#favicon .vertical {
display: table-cell;
text-align: center;
diff --git a/resources/static/dialog/views/rp_info.ejs b/resources/static/dialog/views/rp_info.ejs
index dd3be3f921fbefe2ae0cced7971b6de4edcf2980..5928a18d6c945d726598017558fbb69f1f4d16e1 100644
--- a/resources/static/dialog/views/rp_info.ejs
+++ b/resources/static/dialog/views/rp_info.ejs
@@ -2,17 +2,17 @@
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. */ %>
-<% if(logoURL) { %>
- <img id="rp_logo" src="<%= logoURL %>" />
+<% if(siteLogo) { %>
+ <img id="rp_logo" src="<%= siteLogo %>" />
<% } %>
-<% if(name) { %>
- <h2 id="rp_name"><%= name %></h2>
+<% if(siteName) { %>
+ <h2 id="rp_name"><%= siteName %></h2>
<% } %>
<% if(hostname) { %>
- <% if(name) { %>
+ <% if(siteName) { %>
<h3 id="rp_hostname"><%= hostname %></h3>
<% } else { %>
<h2 id="rp_hostname"><%= hostname %></h2>
diff --git a/resources/static/test/cases/controllers/dialog.js b/resources/static/test/cases/controllers/dialog.js
index 6efbdefb2d58e2d83a979fddb57a203508c5155e..ed8aba8d28f0a540b76b9d7790ee3d1af438e1e1 100644
--- a/resources/static/test/cases/controllers/dialog.js
+++ b/resources/static/test/cases/controllers/dialog.js
@@ -469,7 +469,7 @@
});
});
- asyncTest("get with relative logoURL - not allowed", function() {
+ asyncTest("get with relative siteLogo - not allowed", function() {
createController({
ready: function() {
mediator.subscribe("start", function(msg, info) {
@@ -477,7 +477,7 @@
});
var retval = controller.get(HTTP_TEST_DOMAIN, {
- logoURL: "logo.png",
+ siteLogo: "logo.png",
});
equal(retval, "must be an absolute path: (logo.png)", "expected error");
@@ -487,7 +487,7 @@
});
});
- asyncTest("get with javascript: logoURL - not allowed", function() {
+ asyncTest("get with javascript: siteLogo - not allowed", function() {
createController({
ready: function() {
mediator.subscribe("start", function(msg, info) {
@@ -495,7 +495,7 @@
});
var retval = controller.get(HTTP_TEST_DOMAIN, {
- logoURL: "javascript:alert('xss')",
+ siteLogo: "javascript:alert('xss')",
});
equal(retval, "must be an absolute path: (javascript:alert('xss'))", "expected error");
@@ -505,7 +505,7 @@
});
});
- asyncTest("get with data-uri: logoURL - not allowed", function() {
+ asyncTest("get with data-uri: siteLogo - not allowed", function() {
createController({
ready: function() {
mediator.subscribe("start", function(msg, info) {
@@ -513,7 +513,7 @@
});
var retval = controller.get(HTTP_TEST_DOMAIN, {
- logoURL: "data:image/png,FAKEDATA",
+ siteLogo: "data:image/png,FAKEDATA",
});
equal(retval, "must be an absolute path: (data:image/png,FAKEDATA)", "expected error");
@@ -523,7 +523,7 @@
});
});
- asyncTest("get with http: logoURL - not allowed", function() {
+ asyncTest("get with http: siteLogo - not allowed", function() {
createController({
ready: function() {
mediator.subscribe("start", function(msg, info) {
@@ -531,7 +531,7 @@
});
var retval = controller.get(HTTP_TEST_DOMAIN, {
- logoURL: HTTP_TEST_DOMAIN + "://logo.png",
+ siteLogo: HTTP_TEST_DOMAIN + "://logo.png",
});
equal(retval, "must be an absolute path: (" + HTTP_TEST_DOMAIN + "://logo.png)", "expected error");
@@ -541,7 +541,7 @@
});
});
- asyncTest("get with https: logoURL - not allowed", function() {
+ asyncTest("get with https: siteLogo - not allowed", function() {
createController({
ready: function() {
mediator.subscribe("start", function(msg, info) {
@@ -549,7 +549,7 @@
});
var retval = controller.get(HTTP_TEST_DOMAIN, {
- logoURL: HTTPS_TEST_DOMAIN + "://logo.png",
+ siteLogo: HTTPS_TEST_DOMAIN + "://logo.png",
});
equal(retval, "must be an absolute path: (" + HTTPS_TEST_DOMAIN + "://logo.png)", "expected error");
@@ -567,15 +567,15 @@
startInfo = info;
});
- var logoURL = '/i/card.png" onerror="alert(\'xss\')" <script>alert(\'more xss\')</script>';
+ var siteLogo = '/i/card.png" onerror="alert(\'xss\')" <script>alert(\'more xss\')</script>';
var retval = controller.get(HTTP_TEST_DOMAIN, {
- logoURL: logoURL
+ siteLogo: siteLogo
});
start();
testHelpers.testObjectValuesEqual(startInfo, {
- logoURL: encodeURI(HTTP_TEST_DOMAIN + logoURL)
+ siteLogo: encodeURI(HTTP_TEST_DOMAIN + siteLogo)
});
equal(typeof retval, "undefined", "no error expected");
testErrorNotVisible();
diff --git a/resources/static/test/cases/controllers/rp_info.js b/resources/static/test/cases/controllers/rp_info.js
index 07a57d1c48248844c52ad4528953518c140f47e5..0b89868ab973653fcec4d665f707b5f77b5580dc 100644
--- a/resources/static/test/cases/controllers/rp_info.js
+++ b/resources/static/test/cases/controllers/rp_info.js
@@ -42,16 +42,16 @@
controller.start(options || {});
}
- test("neither name nor logo specified - use site's rp_hostname as name", function() {
+ test("neither siteName nor logo specified - show rp_hostname only", function() {
createController();
equal($("#rp_hostname").html(), RP_HOSTNAME, "rp_hostname filled in");
ok(!$("#rp_name").html(), "rp_name empty");
ok(!$("#rp_logo").attr("src"), "rp logo not shown");
});
- test("name only specified - show specified name and rp_hostname", function() {
+ test("siteName only specified - show specified siteName and rp_hostname", function() {
createController({
- name: RP_NAME,
+ siteName: RP_NAME,
});
equal($("#rp_hostname").html(), RP_HOSTNAME, "rp_hostname filled in");
@@ -59,13 +59,13 @@
ok(!$("#rp_logo").attr("src"), "rp logo not shown");
});
- test("logoURLs are allowed", function() {
+ test("siteLogos are allowed", function() {
var docMock = new WindowMock().document;
docMock.location.protocol = "http:";
createController({
document: docMock,
- logoURL: RP_HTTPS_LOGO
+ siteLogo: RP_HTTPS_LOGO
});
equal($("#rp_logo").attr("src"), RP_HTTPS_LOGO, "rp logo shown");
@@ -73,10 +73,10 @@
ok(!$("#rp_name").html(), "rp_name empty");
});
- test("both name and logo specified - show name, logo and rp_hostname", function() {
+ test("both siteName and siteLogo specified - show siteName, siteLogo and rp_hostname", function() {
createController({
- name: RP_NAME,
- logoURL: RP_HTTPS_LOGO
+ siteName: RP_NAME,
+ siteLogo: RP_HTTPS_LOGO
});
equal($("#rp_hostname").html(), RP_HOSTNAME, "rp_hostname filled in");