Skip to content
Browse files

Merge branch 'issue-1502' of github.com:mozilla/browserid into issue-…

…1502
  • Loading branch information...
2 parents 3a2fa77 + b839aae commit 2445861acd0a2cecc14a085e949cc22e07b86813 @benadida benadida committed
Showing with 309 additions and 324 deletions.
  1. +3 −3 bin/browserid
  2. +99 −99 lib/static_resources.js
  3. +1 −1 resources/static/{css/ie8_common.css → common/css/ie8.css}
  4. +20 −20 resources/static/{css/common.css → common/css/style.css}
  5. 0 resources/static/{ → common}/fonts/LICENSE.txt
  6. 0 resources/static/{ → common}/fonts/OpenSans-Bold.eot
  7. 0 resources/static/{ → common}/fonts/OpenSans-Bold.ttf
  8. 0 resources/static/{ → common}/fonts/OpenSans-Bold.woff
  9. 0 resources/static/{ → common}/fonts/OpenSans-BoldItalic.eot
  10. 0 resources/static/{ → common}/fonts/OpenSans-BoldItalic.ttf
  11. 0 resources/static/{ → common}/fonts/OpenSans-BoldItalic.woff
  12. 0 resources/static/{ → common}/fonts/OpenSans-Italic.eot
  13. 0 resources/static/{ → common}/fonts/OpenSans-Italic.ttf
  14. 0 resources/static/{ → common}/fonts/OpenSans-Italic.woff
  15. 0 resources/static/{ → common}/fonts/OpenSans-Light.eot
  16. 0 resources/static/{ → common}/fonts/OpenSans-Light.ttf
  17. 0 resources/static/{ → common}/fonts/OpenSans-Light.woff
  18. 0 resources/static/{ → common}/fonts/OpenSans-LightItalic.eot
  19. 0 resources/static/{ → common}/fonts/OpenSans-LightItalic.ttf
  20. 0 resources/static/{ → common}/fonts/OpenSans-LightItalic.woff
  21. 0 resources/static/{ → common}/fonts/OpenSans-Regular.eot
  22. 0 resources/static/{ → common}/fonts/OpenSans-Regular.ttf
  23. 0 resources/static/{ → common}/fonts/OpenSans-Regular.woff
  24. +33 −0 resources/static/common/fonts/fonts_common.css
  25. 0 resources/static/{ → common}/fonts/fonts_dialog.css
  26. +12 −0 resources/static/common/fonts/fonts_pages.css
  27. 0 resources/static/{ → common}/i/button-arrow.png
  28. 0 resources/static/{ → common}/i/grain.png
  29. 0 resources/static/{shared → common/js}/browser-support.js
  30. 0 resources/static/{shared → common/js}/browserid.js
  31. 0 resources/static/{shared → common/js}/class.js
  32. 0 resources/static/{shared → common/js}/command.js
  33. 0 resources/static/{shared → common/js}/enable_cookies_url.js
  34. 0 resources/static/{shared → common/js}/error-display.js
  35. 0 resources/static/{shared → common/js}/error-messages.js
  36. 0 resources/static/{shared → common/js}/gettext.js
  37. 0 resources/static/{shared → common/js}/helpers.js
  38. 0 resources/static/{shared → common/js}/history.js
  39. 0 resources/static/{shared → common/js}/javascript-extensions.js
  40. 0 resources/static/{ → common/js}/lib/base64.js
  41. +1 −0 resources/static/common/js/lib/bidbundle.js
  42. 0 resources/static/{ → common/js}/lib/dom-jquery.js
  43. 0 resources/static/{ → common/js}/lib/ejs.js
  44. 0 resources/static/{ → common/js}/lib/highlight.js
  45. 0 resources/static/{ → common/js}/lib/html5shim.js
  46. 0 resources/static/{ → common/js}/lib/hub.js
  47. 0 resources/static/{ → common/js}/lib/jquery-1.7.1.min.js
  48. 0 resources/static/{ → common/js}/lib/jschannel.js
  49. 0 resources/static/{ → common/js}/lib/json2.js
  50. 0 resources/static/{ → common/js}/lib/micrajax.js
  51. 0 resources/static/{ → common/js}/lib/module.js
  52. 0 resources/static/{ → common/js}/lib/underscore.js
  53. 0 resources/static/{ → common/js}/lib/urlparse.js
  54. 0 resources/static/{ → common/js}/lib/winchan.js
  55. 0 resources/static/{shared → common/js}/mediator.js
  56. 0 resources/static/{shared → common/js}/models/interaction_data.js
  57. 0 resources/static/{shared → common/js}/models/models.js
  58. 0 resources/static/{shared → common/js}/modules/cookie_check.js
  59. 0 resources/static/{shared → common/js}/modules/development.js
  60. 0 resources/static/{shared → common/js}/modules/interaction_data.js
  61. 0 resources/static/{shared → common/js}/modules/page_module.js
  62. 0 resources/static/{shared → common/js}/modules/xhr_delay.js
  63. 0 resources/static/{shared → common/js}/modules/xhr_disable_form.js
  64. 0 resources/static/{shared → common/js}/network.js
  65. 0 resources/static/{shared → common/js}/provisioning.js
  66. 0 resources/static/{shared → common/js}/renderer.js
  67. 0 resources/static/{shared → common/js}/screens.js
  68. 0 resources/static/{shared → common/js}/state_machine.js
  69. 0 resources/static/{shared → common/js}/storage.js
  70. 0 resources/static/{shared → common/js}/templates.js
  71. 0 resources/static/{shared → common/js}/tooltip.js
  72. 0 resources/static/{shared → common/js}/user.js
  73. 0 resources/static/{shared → common/js}/validation.js
  74. 0 resources/static/{shared → common/js}/wait-messages.js
  75. 0 resources/static/{shared → common/js}/xhr.js
  76. 0 resources/static/{shared → common/js}/xhr_transport.js
  77. BIN resources/static/css/sil.ttf
  78. BIN resources/static/css/ts.ttf
  79. +9 −9 resources/static/dialog/css/{popup.css → style.css}
  80. 0 resources/static/{ → dialog}/i/arrow_grey.png
  81. 0 resources/static/{ → dialog}/i/firefox_logo.png
  82. 0 resources/static/{ → dialog}/i/persona-logo-transparent.png
  83. 0 resources/static/dialog/{resources → js/misc}/helpers.js
  84. 0 resources/static/dialog/{resources → js/misc}/internal_api.js
  85. 0 resources/static/dialog/{resources → js/misc}/screen_size_hacks.js
  86. +0 −7 resources/static/dialog/{resources → js/misc}/state.js
  87. 0 resources/static/dialog/{controllers → js/modules}/actions.js
  88. 0 resources/static/dialog/{controllers → js/modules}/add_email.js
  89. 0 resources/static/dialog/{controllers → js/modules}/authenticate.js
  90. 0 resources/static/dialog/{controllers → js/modules}/check_registration.js
  91. 0 resources/static/dialog/{controllers → js/modules}/dialog.js
  92. 0 resources/static/dialog/{controllers → js/modules}/generate_assertion.js
  93. 0 resources/static/dialog/{controllers → js/modules}/is_this_your_computer.js
  94. 0 resources/static/dialog/{controllers → js/modules}/pick_email.js
  95. 0 resources/static/dialog/{controllers → js/modules}/primary_user_provisioned.js
  96. 0 resources/static/dialog/{controllers → js/modules}/provision_primary_user.js
  97. 0 resources/static/dialog/{controllers → js/modules}/required_email.js
  98. 0 resources/static/dialog/{controllers → js/modules}/rp_info.js
  99. 0 resources/static/dialog/{controllers → js/modules}/set_password.js
  100. 0 resources/static/dialog/{controllers → js/modules}/verify_primary_user.js
  101. 0 resources/static/dialog/{ → js}/start.js
  102. BIN resources/static/dialog/mozilla.png
  103. +0 −33 resources/static/fonts/fonts_common.css
  104. +0 −12 resources/static/fonts/fonts_mainsite.css
  105. BIN resources/static/i/count.png
  106. BIN resources/static/i/faux-tabzilla.png
  107. BIN resources/static/i/hint.png
  108. BIN resources/static/i/tutorial_1.png
  109. BIN resources/static/i/tutorial_2.png
  110. BIN resources/static/i/tutorial_3.png
  111. +0 −1 resources/static/lib/bidbundle.js
  112. +1 −1 resources/static/{css/ie8_main.css → pages/css/ie8.css}
  113. 0 resources/static/{ → pages}/css/m.css
  114. +3 −3 resources/static/{ → pages}/css/style.css
  115. 0 resources/static/{ → pages}/i/badge.png
  116. 0 resources/static/{ → pages}/i/developers-link.png
  117. 0 resources/static/{ → pages}/i/flexible-graphic.png
  118. 0 resources/static/{ → pages}/i/marketplace-header.png
  119. 0 resources/static/{ → pages}/i/one-password-graphic.png
  120. 0 resources/static/{ → pages}/i/persona-logo-wordmark.png
  121. 0 resources/static/{ → pages}/i/slit.png
  122. 0 resources/static/pages/{ → js}/about.js
  123. 0 resources/static/pages/{ → js}/forgot.js
  124. 0 resources/static/pages/{ → js}/index.js
  125. 0 resources/static/pages/{ → js}/manage_account.js
  126. 0 resources/static/pages/{ → js}/page_helpers.js
  127. 0 resources/static/pages/{ → js}/signin.js
  128. 0 resources/static/pages/{ → js}/signup.js
  129. 0 resources/static/pages/{ → js}/start.js
  130. 0 resources/static/pages/{ → js}/verify_secondary_address.js
  131. 0 resources/static/test/cases/{shared → common/js}/browser-support.js
  132. 0 resources/static/test/cases/{shared → common/js}/class.js
  133. 0 resources/static/test/cases/{shared → common/js}/command.js
  134. 0 resources/static/test/cases/{shared → common/js}/enable_cookies_url.js
  135. 0 resources/static/test/cases/{shared → common/js}/error-display.js
  136. 0 resources/static/test/cases/{shared → common/js}/helpers.js
  137. 0 resources/static/test/cases/{shared → common/js}/history.js
  138. 0 resources/static/test/cases/{shared → common/js}/models/interaction_data.js
  139. 0 resources/static/test/cases/{shared → common/js}/modules/cookie_check.js
  140. 0 resources/static/test/cases/{shared → common/js}/modules/interaction_data.js
  141. 0 resources/static/test/cases/{shared → common/js}/modules/page_module.js
  142. 0 resources/static/test/cases/{shared → common/js}/modules/xhr_delay.js
  143. 0 resources/static/test/cases/{shared → common/js}/modules/xhr_disable_form.js
  144. 0 resources/static/test/cases/{shared → common/js}/network.js
  145. 0 resources/static/test/cases/{shared → common/js}/renderer.js
  146. 0 resources/static/test/cases/{shared → common/js}/screens.js
  147. 0 resources/static/test/cases/{shared → common/js}/state_machine.js
  148. 0 resources/static/test/cases/{shared → common/js}/storage.js
  149. 0 resources/static/test/cases/{shared → common/js}/tooltip.js
  150. 0 resources/static/test/cases/{shared → common/js}/user.js
  151. 0 resources/static/test/cases/{shared → common/js}/validation.js
  152. 0 resources/static/test/cases/{shared → common/js}/xhr.js
  153. +0 −9 resources/static/test/cases/dialog.js
  154. 0 resources/static/test/cases/{resources → dialog/js/misc}/helpers.js
  155. 0 resources/static/test/cases/{resources → dialog/js/misc}/internal_api.js
  156. 0 resources/static/test/cases/{resources → dialog/js/misc}/state.js
  157. 0 resources/static/test/cases/{controllers → dialog/js/modules}/actions.js
  158. 0 resources/static/test/cases/{controllers → dialog/js/modules}/add_email.js
  159. 0 resources/static/test/cases/{controllers → dialog/js/modules}/authenticate.js
  160. 0 resources/static/test/cases/{controllers → dialog/js/modules}/check_registration.js
  161. 0 resources/static/test/cases/{controllers → dialog/js/modules}/dialog.js
  162. 0 resources/static/test/cases/{controllers → dialog/js/modules}/forgot_password.js
  163. 0 resources/static/test/cases/{controllers → dialog/js/modules}/generate_assertion.js
  164. 0 resources/static/test/cases/{controllers → dialog/js/modules}/is_this_your_computer.js
  165. 0 resources/static/test/cases/{controllers → dialog/js/modules}/pick_email.js
  166. 0 resources/static/test/cases/{controllers → dialog/js/modules}/primary_user_provisioned.js
  167. 0 resources/static/test/cases/{controllers → dialog/js/modules}/provision_primary_user.js
  168. 0 resources/static/test/cases/{controllers → dialog/js/modules}/required_email.js
  169. 0 resources/static/test/cases/{controllers → dialog/js/modules}/rp_info.js
  170. 0 resources/static/test/cases/{controllers → dialog/js/modules}/set_password.js
  171. 0 resources/static/test/cases/{controllers → dialog/js/modules}/verify_primary_user.js
  172. 0 resources/static/test/cases/pages/{ → js}/about.js
  173. 0 resources/static/test/cases/pages/{ → js}/browserid.js
  174. 0 resources/static/test/cases/pages/{ → js}/forgot.js
  175. 0 resources/static/test/cases/pages/{ → js}/manage_account.js
  176. 0 resources/static/test/cases/pages/{ → js}/page_helpers.js
  177. 0 resources/static/test/cases/pages/{ → js}/signin.js
  178. 0 resources/static/test/cases/pages/{ → js}/signup.js
  179. 0 resources/static/test/cases/pages/{ → js}/verify_secondary_address.js
  180. +3 −3 resources/views/about.ejs
  181. +1 −1 resources/views/dialog_layout.ejs
  182. +1 −1 resources/views/index.ejs
  183. +1 −1 resources/views/layout.ejs
  184. +121 −120 resources/views/test.ejs
View
6 bin/browserid
@@ -8,7 +8,7 @@ const
fs = require('fs'),
path = require('path'),
url = require('url'),
-http = require('http');
+http = require('http'),
urlparse = require('urlparse'),
express = require('express');
@@ -62,7 +62,7 @@ app.use(i18n.abide({
var statsd_config = config.get('statsd');
if (statsd_config && statsd_config.enabled) {
- logger_statsd = require("connect-logger-statsd");
+ var logger_statsd = require("connect-logger-statsd");
app.use(logger_statsd({
host: statsd_config.hostname || "localhost",
port: statsd_config.port || 8125,
@@ -157,7 +157,7 @@ db.open(config.get('database'), function (error) {
// shut down express gracefully on SIGINT
shutdown.handleTerminationSignals(app, function(readyForShutdownCB) {
require('../lib/bcrypt.js').shutdown();
- db.close(readyForShutdownCB)
+ db.close(readyForShutdownCB);
});
var bindTo = config.get('bind_to');
View
198 lib/static_resources.js
@@ -16,60 +16,60 @@ var i18n = require('./i18n'),
// Common to browserid.js dialog.js
var common_js = [
- '/lib/jquery-1.7.1.min.js',
- '/lib/winchan.js',
- '/lib/underscore.js',
- '/lib/bidbundle.js',
- '/lib/ejs.js',
- '/lib/micrajax.js',
- '/lib/urlparse.js',
- '/shared/javascript-extensions.js',
+ '/common/js/lib/jquery-1.7.1.min.js',
+ '/common/js/lib/winchan.js',
+ '/common/js/lib/underscore.js',
+ '/common/js/lib/bidbundle.js',
+ '/common/js/lib/ejs.js',
+ '/common/js/lib/micrajax.js',
+ '/common/js/lib/urlparse.js',
+ '/common/js/javascript-extensions.js',
'/i18n/:locale/client.json',
- '/shared/gettext.js',
- '/shared/browserid.js',
- '/lib/hub.js',
- '/lib/dom-jquery.js',
- '/lib/module.js',
- '/lib/jschannel.js',
- '/shared/templates.js',
- '/shared/renderer.js',
- '/shared/class.js',
- '/shared/mediator.js',
- '/shared/tooltip.js',
- '/shared/validation.js',
- '/shared/helpers.js',
- '/shared/screens.js',
- '/shared/browser-support.js',
- '/shared/enable_cookies_url.js',
- '/shared/wait-messages.js',
- '/shared/error-messages.js',
- '/shared/error-display.js',
- '/shared/storage.js',
- '/shared/xhr_transport.js',
- '/shared/xhr.js',
- '/shared/network.js',
- '/shared/provisioning.js',
- '/shared/user.js',
- '/shared/modules/page_module.js',
- '/shared/modules/xhr_delay.js',
- '/shared/modules/xhr_disable_form.js',
- '/shared/modules/cookie_check.js',
- '/shared/modules/development.js'
+ '/common/js/gettext.js',
+ '/common/js/browserid.js',
+ '/common/js/lib/hub.js',
+ '/common/js/lib/dom-jquery.js',
+ '/common/js/lib/module.js',
+ '/common/js/lib/jschannel.js',
+ '/common/js/templates.js',
+ '/common/js/renderer.js',
+ '/common/js/class.js',
+ '/common/js/mediator.js',
+ '/common/js/tooltip.js',
+ '/common/js/validation.js',
+ '/common/js/helpers.js',
+ '/common/js/screens.js',
+ '/common/js/browser-support.js',
+ '/common/js/enable_cookies_url.js',
+ '/common/js/wait-messages.js',
+ '/common/js/error-messages.js',
+ '/common/js/error-display.js',
+ '/common/js/storage.js',
+ '/common/js/xhr_transport.js',
+ '/common/js/xhr.js',
+ '/common/js/network.js',
+ '/common/js/provisioning.js',
+ '/common/js/user.js',
+ '/common/js/modules/page_module.js',
+ '/common/js/modules/xhr_delay.js',
+ '/common/js/modules/xhr_disable_form.js',
+ '/common/js/modules/cookie_check.js',
+ '/common/js/modules/development.js'
];
var browserid_min_js = '/production/:locale/browserid.js';
var browserid_js = und.flatten([
common_js,
[
- '/pages/page_helpers.js',
- '/pages/index.js',
- '/pages/start.js',
- '/pages/verify_secondary_address.js',
- '/pages/forgot.js',
- '/pages/manage_account.js',
- '/pages/signin.js',
- '/pages/signup.js',
- '/pages/about.js'
+ '/pages/js/page_helpers.js',
+ '/pages/js/index.js',
+ '/pages/js/start.js',
+ '/pages/js/verify_secondary_address.js',
+ '/pages/js/forgot.js',
+ '/pages/js/manage_account.js',
+ '/pages/js/signin.js',
+ '/pages/js/signup.js',
+ '/pages/js/about.js'
]
]);
@@ -77,76 +77,76 @@ var dialog_min_js = '/production/:locale/dialog.js';
var dialog_js = und.flatten([
common_js,
[
- '/shared/command.js',
- '/shared/history.js',
- '/shared/state_machine.js',
+ '/common/js/command.js',
+ '/common/js/history.js',
+ '/common/js/state_machine.js',
- '/shared/models/models.js',
- '/shared/models/interaction_data.js',
+ '/common/js/models/models.js',
+ '/common/js/models/interaction_data.js',
- '/shared/modules/interaction_data.js',
+ '/common/js/modules/interaction_data.js',
- '/dialog/resources/internal_api.js',
- '/dialog/resources/helpers.js',
- '/dialog/resources/state.js',
- '/dialog/resources/screen_size_hacks.js',
+ '/dialog/js/misc/internal_api.js',
+ '/dialog/js/misc/helpers.js',
+ '/dialog/js/misc/state.js',
+ '/dialog/js/misc/screen_size_hacks.js',
- '/dialog/controllers/actions.js',
- '/dialog/controllers/dialog.js',
- '/dialog/controllers/authenticate.js',
- '/dialog/controllers/check_registration.js',
- '/dialog/controllers/pick_email.js',
- '/dialog/controllers/add_email.js',
- '/dialog/controllers/required_email.js',
- '/dialog/controllers/verify_primary_user.js',
- '/dialog/controllers/provision_primary_user.js',
- '/dialog/controllers/primary_user_provisioned.js',
- '/dialog/controllers/generate_assertion.js',
- '/dialog/controllers/is_this_your_computer.js',
- '/dialog/controllers/set_password.js',
- '/dialog/controllers/rp_info.js',
- '/dialog/start.js'
+ '/dialog/js/modules/actions.js',
+ '/dialog/js/modules/dialog.js',
+ '/dialog/js/modules/authenticate.js',
+ '/dialog/js/modules/check_registration.js',
+ '/dialog/js/modules/pick_email.js',
+ '/dialog/js/modules/add_email.js',
+ '/dialog/js/modules/required_email.js',
+ '/dialog/js/modules/verify_primary_user.js',
+ '/dialog/js/modules/provision_primary_user.js',
+ '/dialog/js/modules/primary_user_provisioned.js',
+ '/dialog/js/modules/generate_assertion.js',
+ '/dialog/js/modules/is_this_your_computer.js',
+ '/dialog/js/modules/set_password.js',
+ '/dialog/js/modules/rp_info.js',
+ '/dialog/js/start.js'
]]);
exports.resources = {
'/production/dialog.css': [
- '/fonts/fonts_common.css',
- '/fonts/fonts_dialog.css',
- '/css/common.css',
- '/dialog/css/popup.css',
+ '/common/fonts/fonts_common.css',
+ '/common/fonts/fonts_dialog.css',
+ '/common/css/style.css',
+ '/dialog/css/style.css',
'/dialog/css/m.css'
],
'/production/browserid.css': [
- '/fonts/fonts_common.css',
- '/fonts/fonts_mainsite.css',
- '/css/common.css',
- '/css/style.css',
- '/css/m.css'
+ '/common/fonts/fonts_common.css',
+ '/common/fonts/fonts_pages.css',
+ '/common/css/style.css',
+ '/pages/css/style.css',
+ '/pages/css/m.css'
],
'/production/ie8_main.css': [
- '/css/ie8_common.css',
- '/css/ie8_main.css'
+ '/common/css/ie8.css',
+ '/pages/css/ie8.css'
],
'/production/ie8_dialog.css': [
- '/css/ie8_common.css',
+ '/common/css/ie8.css',
'/dialog/css/ie8.css'
],
'/production/communication_iframe.js': [
- '/lib/jschannel.js',
- '/lib/winchan.js',
- '/lib/underscore.js',
- '/lib/bidbundle.js',
- '/lib/hub.js',
- '/lib/micrajax.js',
- '/shared/javascript-extensions.js',
- '/shared/browserid.js',
- '/shared/mediator.js',
- '/shared/helpers.js',
- '/shared/storage.js',
- '/shared/xhr_transport.js',
- '/shared/xhr.js',
- '/shared/network.js',
- '/shared/user.js',
+ '/common/js/lib/jschannel.js',
+ '/common/js/lib/winchan.js',
+ '/common/js/lib/underscore.js',
+ '/common/js/lib/bidbundle.js',
+ '/common/js/lib/hub.js',
+ '/common/js/lib/micrajax.js',
+ '/common/js/javascript-extensions.js',
+ '/common/js/browserid.js',
+ '/common/js/mediator.js',
+ '/common/js/helpers.js',
+ '/common/js/storage.js',
+ '/common/js/xhr_transport.js',
+ '/common/js/xhr.js',
+ '/common/js/network.js',
+ '/common/js/user.js',
'/communication_iframe/start.js'
],
'/production/include.js': [
View
2 resources/static/css/ie8_common.css → resources/static/common/css/ie8.css
@@ -11,7 +11,7 @@
.submit button:focus,
.submit .button:hover,
.submit .button:focus {
- background-image: url("/i/button-arrow.png");
+ background-image: url("/common/i/button-arrow.png");
background-position: center right;
background-repeat: no-repeat;
}
View
40 resources/static/css/common.css → resources/static/common/css/style.css
@@ -209,13 +209,13 @@ button::-moz-focus-inner, .button::-moz-focus-inner {
.submit button {
padding: 6px 45px 7px 10px;
background-color: #4eb5e5;
- background-image: url("/i/button-arrow.png");
- background-image: url("/i/button-arrow.png"), -webkit-gradient(linear, left top, left bottom, from(#4eb5e5), to(#3196cf));
- background-image: url("/i/button-arrow.png"), -webkit-linear-gradient(top, #4eb5e5, #3196cf);
- background-image: url("/i/button-arrow.png"), -moz-linear-gradient(top, #4eb5e5, #3196cf);
- background-image: url("/i/button-arrow.png"), -ms-linear-gradient(top, #4eb5e5, #3196cf);
- background-image: url("/i/button-arrow.png"), -o-linear-gradient(top, #4eb5e5, #3196cf);
- background-image: url("/i/button-arrow.png"), linear-gradient(top, #4eb5e5, #3196cf);
+ background-image: url("/common/i/button-arrow.png");
+ background-image: url("/common/i/button-arrow.png"), -webkit-gradient(linear, left top, left bottom, from(#4eb5e5), to(#3196cf));
+ background-image: url("/common/i/button-arrow.png"), -webkit-linear-gradient(top, #4eb5e5, #3196cf);
+ background-image: url("/common/i/button-arrow.png"), -moz-linear-gradient(top, #4eb5e5, #3196cf);
+ background-image: url("/common/i/button-arrow.png"), -ms-linear-gradient(top, #4eb5e5, #3196cf);
+ background-image: url("/common/i/button-arrow.png"), -o-linear-gradient(top, #4eb5e5, #3196cf);
+ background-image: url("/common/i/button-arrow.png"), linear-gradient(top, #4eb5e5, #3196cf);
background-repeat: no-repeat, no-repeat;
background-position: center right, center;
}
@@ -226,13 +226,13 @@ button::-moz-focus-inner, .button::-moz-focus-inner {
.submit .button:hover,
.submit .button:focus {
background-color: #43a6e2;
- background-image: url("/i/button-arrow.png");
- background-image: url("/i/button-arrow.png"), -webkit-gradient(linear, left top, left bottom, from(#43a6e2), to(#277ac1));
- background-image: url("/i/button-arrow.png"), -webkit-linear-gradient(top, #43a6e2, #277ac1);
- background-image: url("/i/button-arrow.png"), -moz-linear-gradient(top, #43a6e2, #277ac1);
- background-image: url("/i/button-arrow.png"), -ms-linear-gradient(top, #43a6e2, #277ac1);
- background-image: url("/i/button-arrow.png"), -o-linear-gradient(top, #43a6e2, #277ac1);
- background-image: url("/i/button-arrow.png"), linear-gradient(top, #43a6e2, #277ac1);
+ background-image: url("/common/i/button-arrow.png");
+ background-image: url("/common/i/button-arrow.png"), -webkit-gradient(linear, left top, left bottom, from(#43a6e2), to(#277ac1));
+ background-image: url("/common/i/button-arrow.png"), -webkit-linear-gradient(top, #43a6e2, #277ac1);
+ background-image: url("/common/i/button-arrow.png"), -moz-linear-gradient(top, #43a6e2, #277ac1);
+ background-image: url("/common/i/button-arrow.png"), -ms-linear-gradient(top, #43a6e2, #277ac1);
+ background-image: url("/common/i/button-arrow.png"), -o-linear-gradient(top, #43a6e2, #277ac1);
+ background-image: url("/common/i/button-arrow.png"), linear-gradient(top, #43a6e2, #277ac1);
}
button[disabled], .submit_disabled button, .submit_disabled .button,
@@ -369,12 +369,12 @@ footer .help {
#wait, #delay, #error {
background-color: #dadee1;
- background-image: url("/i/grain.png"), -webkit-gradient(linear, left top, left bottom, from(#dadee1), to(#c7ccd0));
- background-image: url("/i/grain.png"), -webkit-linear-gradient(top, #dadee1, #c7ccd0);
- background-image: url("/i/grain.png"), -moz-linear-gradient(top, #dadee1, #c7ccd0);
- background-image: url("/i/grain.png"), -ms-linear-gradient(top, #dadee1, #c7ccd0);
- background-image: url("/i/grain.png"), -o-linear-gradient(top, #dadee1, #c7ccd0);
- background-image: url("/i/grain.png"), linear-gradient(top, #dadee1, #c7ccd0);
+ background-image: url("/common/i/grain.png"), -webkit-gradient(linear, left top, left bottom, from(#dadee1), to(#c7ccd0));
+ background-image: url("/common/i/grain.png"), -webkit-linear-gradient(top, #dadee1, #c7ccd0);
+ background-image: url("/common/i/grain.png"), -moz-linear-gradient(top, #dadee1, #c7ccd0);
+ background-image: url("/common/i/grain.png"), -ms-linear-gradient(top, #dadee1, #c7ccd0);
+ background-image: url("/common/i/grain.png"), -o-linear-gradient(top, #dadee1, #c7ccd0);
+ background-image: url("/common/i/grain.png"), linear-gradient(top, #dadee1, #c7ccd0);
}
#wait, #delay {
View
0 resources/static/fonts/LICENSE.txt → resources/static/common/fonts/LICENSE.txt
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Bold.eot → ...ces/static/common/fonts/OpenSans-Bold.eot
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Bold.ttf → ...ces/static/common/fonts/OpenSans-Bold.ttf
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Bold.woff → ...es/static/common/fonts/OpenSans-Bold.woff
File renamed without changes.
View
0 ...rces/static/fonts/OpenSans-BoldItalic.eot → ...atic/common/fonts/OpenSans-BoldItalic.eot
File renamed without changes.
View
0 ...rces/static/fonts/OpenSans-BoldItalic.ttf → ...atic/common/fonts/OpenSans-BoldItalic.ttf
File renamed without changes.
View
0 ...ces/static/fonts/OpenSans-BoldItalic.woff → ...tic/common/fonts/OpenSans-BoldItalic.woff
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Italic.eot → ...s/static/common/fonts/OpenSans-Italic.eot
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Italic.ttf → ...s/static/common/fonts/OpenSans-Italic.ttf
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Italic.woff → .../static/common/fonts/OpenSans-Italic.woff
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Light.eot → ...es/static/common/fonts/OpenSans-Light.eot
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Light.ttf → ...es/static/common/fonts/OpenSans-Light.ttf
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Light.woff → ...s/static/common/fonts/OpenSans-Light.woff
File renamed without changes.
View
0 ...ces/static/fonts/OpenSans-LightItalic.eot → ...tic/common/fonts/OpenSans-LightItalic.eot
File renamed without changes.
View
0 ...ces/static/fonts/OpenSans-LightItalic.ttf → ...tic/common/fonts/OpenSans-LightItalic.ttf
File renamed without changes.
View
0 ...es/static/fonts/OpenSans-LightItalic.woff → ...ic/common/fonts/OpenSans-LightItalic.woff
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Regular.eot → .../static/common/fonts/OpenSans-Regular.eot
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Regular.ttf → .../static/common/fonts/OpenSans-Regular.ttf
File renamed without changes.
View
0 resources/static/fonts/OpenSans-Regular.woff → ...static/common/fonts/OpenSans-Regular.woff
File renamed without changes.
View
33 resources/static/common/fonts/fonts_common.css
@@ -0,0 +1,33 @@
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: url('/common/fonts/OpenSans-Regular.eot');
+ src: local('Open Sans'),
+ local('OpenSans'),
+ url('/common/fonts/OpenSans-Regular.eot') format('embedded-opentype'),
+ url('/common/fonts/OpenSans-Regular.woff') format('woff'),
+ url('/common/fonts/OpenSans-Regular.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 300;
+ src: url('/common/fonts/OpenSans-Light.eot');
+ src: local('Open Sans Light'),
+ local('OpenSans-Light'),
+ url('/common/fonts/OpenSans-Light.eot') format('embedded-opentype'),
+ url('/common/fonts/OpenSans-Light.woff') format('woff'),
+ url('/common/fonts/OpenSans-Light.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 700;
+ src: url('/common/fonts/OpenSans-Bold.eot');
+ src: local('Open Sans Bold'),
+ local('OpenSans-Bold'),
+ url('/common/fonts/OpenSans-Bold.eot') format('embedded-opentype'),
+ url('/common/fonts/OpenSans-Bold.woff') format('woff'),
+ url('/common/fonts/OpenSans-Bold.ttf') format('truetype');
+}
View
0 resources/static/fonts/fonts_dialog.css → ...rces/static/common/fonts/fonts_dialog.css
File renamed without changes.
View
12 resources/static/common/fonts/fonts_pages.css
@@ -0,0 +1,12 @@
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 400;
+ src: url('/common/fonts/OpenSans-Italic.eot');
+ src: local('Open Sans Italic'),
+ local('OpenSans-Italic'),
+ url('/common/fonts/OpenSans-Italic.eot') format('embedded-opentype'),
+ url('/common/fonts/OpenSans-Italic.woff') format('woff'),
+ url('/common/fonts/OpenSans-Italic.ttf') format('truetype');
+}
+
View
0 resources/static/i/button-arrow.png → resources/static/common/i/button-arrow.png
File renamed without changes
View
0 resources/static/i/grain.png → resources/static/common/i/grain.png
File renamed without changes
View
0 resources/static/shared/browser-support.js → ...urces/static/common/js/browser-support.js
File renamed without changes.
View
0 resources/static/shared/browserid.js → resources/static/common/js/browserid.js
File renamed without changes.
View
0 resources/static/shared/class.js → resources/static/common/js/class.js
File renamed without changes.
View
0 resources/static/shared/command.js → resources/static/common/js/command.js
File renamed without changes.
View
0 ...urces/static/shared/enable_cookies_url.js → ...es/static/common/js/enable_cookies_url.js
File renamed without changes.
View
0 resources/static/shared/error-display.js → resources/static/common/js/error-display.js
File renamed without changes.
View
0 resources/static/shared/error-messages.js → resources/static/common/js/error-messages.js
File renamed without changes.
View
0 resources/static/shared/gettext.js → resources/static/common/js/gettext.js
File renamed without changes.
View
0 resources/static/shared/helpers.js → resources/static/common/js/helpers.js
File renamed without changes.
View
0 resources/static/shared/history.js → resources/static/common/js/history.js
File renamed without changes.
View
0 ...es/static/shared/javascript-extensions.js → ...static/common/js/javascript-extensions.js
File renamed without changes.
View
0 resources/static/lib/base64.js → resources/static/common/js/lib/base64.js
File renamed without changes.
View
1 resources/static/common/js/lib/bidbundle.js
View
0 resources/static/lib/dom-jquery.js → resources/static/common/js/lib/dom-jquery.js
File renamed without changes.
View
0 resources/static/lib/ejs.js → resources/static/common/js/lib/ejs.js
File renamed without changes.
View
0 resources/static/lib/highlight.js → resources/static/common/js/lib/highlight.js
File renamed without changes.
View
0 resources/static/lib/html5shim.js → resources/static/common/js/lib/html5shim.js
File renamed without changes.
View
0 resources/static/lib/hub.js → resources/static/common/js/lib/hub.js
File renamed without changes.
View
0 resources/static/lib/jquery-1.7.1.min.js → .../static/common/js/lib/jquery-1.7.1.min.js
File renamed without changes.
View
0 resources/static/lib/jschannel.js → resources/static/common/js/lib/jschannel.js
File renamed without changes.
View
0 resources/static/lib/json2.js → resources/static/common/js/lib/json2.js
File renamed without changes.
View
0 resources/static/lib/micrajax.js → resources/static/common/js/lib/micrajax.js
File renamed without changes.
View
0 resources/static/lib/module.js → resources/static/common/js/lib/module.js
File renamed without changes.
View
0 resources/static/lib/underscore.js → resources/static/common/js/lib/underscore.js
File renamed without changes.
View
0 resources/static/lib/urlparse.js → resources/static/common/js/lib/urlparse.js
File renamed without changes.
View
0 resources/static/lib/winchan.js → resources/static/common/js/lib/winchan.js
File renamed without changes.
View
0 resources/static/shared/mediator.js → resources/static/common/js/mediator.js
File renamed without changes.
View
0 .../static/shared/models/interaction_data.js → ...atic/common/js/models/interaction_data.js
File renamed without changes.
View
0 resources/static/shared/models/models.js → resources/static/common/js/models/models.js
File renamed without changes.
View
0 ...ces/static/shared/modules/cookie_check.js → .../static/common/js/modules/cookie_check.js
File renamed without changes.
View
0 ...rces/static/shared/modules/development.js → ...s/static/common/js/modules/development.js
File renamed without changes.
View
0 ...static/shared/modules/interaction_data.js → ...tic/common/js/modules/interaction_data.js
File renamed without changes.
View
0 ...rces/static/shared/modules/page_module.js → ...s/static/common/js/modules/page_module.js
File renamed without changes.
View
0 resources/static/shared/modules/xhr_delay.js → ...ces/static/common/js/modules/xhr_delay.js
File renamed without changes.
View
0 ...static/shared/modules/xhr_disable_form.js → ...tic/common/js/modules/xhr_disable_form.js
File renamed without changes.
View
0 resources/static/shared/network.js → resources/static/common/js/network.js
File renamed without changes.
View
0 resources/static/shared/provisioning.js → resources/static/common/js/provisioning.js
File renamed without changes.
View
0 resources/static/shared/renderer.js → resources/static/common/js/renderer.js
File renamed without changes.
View
0 resources/static/shared/screens.js → resources/static/common/js/screens.js
File renamed without changes.
View
0 resources/static/shared/state_machine.js → resources/static/common/js/state_machine.js
File renamed without changes.
View
0 resources/static/shared/storage.js → resources/static/common/js/storage.js
File renamed without changes.
View
0 resources/static/shared/templates.js → resources/static/common/js/templates.js
File renamed without changes.
View
0 resources/static/shared/tooltip.js → resources/static/common/js/tooltip.js
File renamed without changes.
View
0 resources/static/shared/user.js → resources/static/common/js/user.js
File renamed without changes.
View
0 resources/static/shared/validation.js → resources/static/common/js/validation.js
File renamed without changes.
View
0 resources/static/shared/wait-messages.js → resources/static/common/js/wait-messages.js
File renamed without changes.
View
0 resources/static/shared/xhr.js → resources/static/common/js/xhr.js
File renamed without changes.
View
0 resources/static/shared/xhr_transport.js → resources/static/common/js/xhr_transport.js
File renamed without changes.
View
BIN resources/static/css/sil.ttf
Binary file not shown.
View
BIN resources/static/css/ts.ttf
Binary file not shown.
View
18 resources/static/dialog/css/popup.css → resources/static/dialog/css/style.css
@@ -5,13 +5,13 @@
body {
color: #383838;
background-color: #dee3e6;
- background-image: url('/i/grain.png');
- background-image: url("/i/grain.png"), -webkit-gradient(linear, left top, left bottom, from(rgba(113, 126, 137, 0)), to(rgba(113, 126, 137, 0.2)));
- background-image: url('/i/grain.png'), -webkit-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
- background-image: url('/i/grain.png'), -moz-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
- background-image: url('/i/grain.png'), -ms-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
- background-image: url('/i/grain.png'), -o-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
- background-image: url('/i/grain.png'), linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
+ background-image: url('/common/i/grain.png');
+ background-image: url("/common/i/grain.png"), -webkit-gradient(linear, left top, left bottom, from(rgba(113, 126, 137, 0)), to(rgba(113, 126, 137, 0.2)));
+ background-image: url('/common/i/grain.png'), -webkit-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
+ background-image: url('/common/i/grain.png'), -moz-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
+ background-image: url('/common/i/grain.png'), -ms-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
+ background-image: url('/common/i/grain.png'), -o-linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
+ background-image: url('/common/i/grain.png'), linear-gradient(top, rgba(113, 126, 137, 0), rgba(113, 126, 137, 0.2));
}
#signIn {
@@ -68,7 +68,7 @@ header {
.home {
width: 161px;
height: 40px;
- background: url("/i/persona-logo-transparent.png") 0 0 no-repeat;
+ background: url("/dialog/i/persona-logo-transparent.png") 0 0 no-repeat;
text-indent: -9999px;
display: inline-block;
*display: block;
@@ -259,7 +259,7 @@ section > .contents {
bottom: 0;
left: 0;
right: 0;
- background-image: url('/i/arrow_grey.png');
+ background-image: url('/dialog/i/arrow_grey.png');
background-repeat: no-repeat;
background-position: center;
background-color: transparent;
View
0 resources/static/i/arrow_grey.png → resources/static/dialog/i/arrow_grey.png
File renamed without changes
View
0 resources/static/i/firefox_logo.png → resources/static/dialog/i/firefox_logo.png
File renamed without changes
View
0 ...ces/static/i/persona-logo-transparent.png → ...tic/dialog/i/persona-logo-transparent.png
File renamed without changes
View
0 resources/static/dialog/resources/helpers.js → resources/static/dialog/js/misc/helpers.js
File renamed without changes.
View
0 ...s/static/dialog/resources/internal_api.js → ...ces/static/dialog/js/misc/internal_api.js
File renamed without changes.
View
0 ...tic/dialog/resources/screen_size_hacks.js → ...tatic/dialog/js/misc/screen_size_hacks.js
File renamed without changes.
View
7 resources/static/dialog/resources/state.js → resources/static/dialog/js/misc/state.js
@@ -62,13 +62,6 @@ BrowserID.State = (function() {
});
handleState("window_unload", function() {
- if (!self.success) {
- storage.setReturnTo("");
- // do not call doCancel here, let winchan's cancel
- // handling do the work. This gives us consistent semantics
- // across browsers on the RP side of the WinChan.
- }
-
// Round up final KPI stats as the user is leaving the dialog. This
// ensures the final state is sent to the KPI stats. Any new logins are
// counted, any new sites are counted, any new emails are included, etc.
View
0 ...rces/static/dialog/controllers/actions.js → ...urces/static/dialog/js/modules/actions.js
File renamed without changes.
View
0 ...es/static/dialog/controllers/add_email.js → ...ces/static/dialog/js/modules/add_email.js
File renamed without changes.
View
0 ...static/dialog/controllers/authenticate.js → .../static/dialog/js/modules/authenticate.js
File renamed without changes.
View
0 .../dialog/controllers/check_registration.js → ...c/dialog/js/modules/check_registration.js
File renamed without changes.
View
0 ...urces/static/dialog/controllers/dialog.js → resources/static/dialog/js/modules/dialog.js
File renamed without changes.
View
0 .../dialog/controllers/generate_assertion.js → ...c/dialog/js/modules/generate_assertion.js
File renamed without changes.
View
0 ...alog/controllers/is_this_your_computer.js → ...ialog/js/modules/is_this_your_computer.js
File renamed without changes.
View
0 ...s/static/dialog/controllers/pick_email.js → ...es/static/dialog/js/modules/pick_email.js
File renamed without changes.
View
0 ...g/controllers/primary_user_provisioned.js → ...og/js/modules/primary_user_provisioned.js
File renamed without changes.
View
0 ...log/controllers/provision_primary_user.js → ...alog/js/modules/provision_primary_user.js
File renamed without changes.
View
0 ...atic/dialog/controllers/required_email.js → ...tatic/dialog/js/modules/required_email.js
File renamed without changes.
View
0 ...rces/static/dialog/controllers/rp_info.js → ...urces/static/dialog/js/modules/rp_info.js
File renamed without changes.
View
0 ...static/dialog/controllers/set_password.js → .../static/dialog/js/modules/set_password.js
File renamed without changes.
View
0 ...dialog/controllers/verify_primary_user.js → .../dialog/js/modules/verify_primary_user.js
File renamed without changes.
View
0 resources/static/dialog/start.js → resources/static/dialog/js/start.js
File renamed without changes.
View
BIN resources/static/dialog/mozilla.png
Deleted file not rendered
View
33 resources/static/fonts/fonts_common.css
@@ -1,33 +0,0 @@
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 400;
- src: url('/fonts/OpenSans-Regular.eot');
- src: local('Open Sans'),
- local('OpenSans'),
- url('/fonts/OpenSans-Regular.eot') format('embedded-opentype'),
- url('/fonts/OpenSans-Regular.woff') format('woff'),
- url('/fonts/OpenSans-Regular.ttf') format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 300;
- src: url('/fonts/OpenSans-Light.eot');
- src: local('Open Sans Light'),
- local('OpenSans-Light'),
- url('/fonts/OpenSans-Light.eot') format('embedded-opentype'),
- url('/fonts/OpenSans-Light.woff') format('woff'),
- url('/fonts/OpenSans-Light.ttf') format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 700;
- src: url('/fonts/OpenSans-Bold.eot');
- src: local('Open Sans Bold'),
- local('OpenSans-Bold'),
- url('/fonts/OpenSans-Bold.eot') format('embedded-opentype'),
- url('/fonts/OpenSans-Bold.woff') format('woff'),
- url('/fonts/OpenSans-Bold.ttf') format('truetype');
-}
View
12 resources/static/fonts/fonts_mainsite.css
@@ -1,12 +0,0 @@
-@font-face {
- font-family: 'Open Sans';
- font-style: italic;
- font-weight: 400;
- src: url('/fonts/OpenSans-Italic.eot');
- src: local('Open Sans Italic'),
- local('OpenSans-Italic'),
- url('/fonts/OpenSans-Italic.eot') format('embedded-opentype'),
- url('/fonts/OpenSans-Italic.woff') format('woff'),
- url('/fonts/OpenSans-Italic.ttf') format('truetype');
-}
-
View
BIN resources/static/i/count.png
Deleted file not rendered
View
BIN resources/static/i/faux-tabzilla.png
Deleted file not rendered
View
BIN resources/static/i/hint.png
Deleted file not rendered
View
BIN resources/static/i/tutorial_1.png
Deleted file not rendered
View
BIN resources/static/i/tutorial_2.png
Deleted file not rendered
View
BIN resources/static/i/tutorial_3.png
Deleted file not rendered
View
1 resources/static/lib/bidbundle.js
View
2 resources/static/css/ie8_main.css → resources/static/pages/css/ie8.css
@@ -7,7 +7,7 @@
*/
body {
- background-image: url("/i/marketplace-header.png");
+ background-image: url("/pages/i/marketplace-header.png");
background-position: center top;
background-repeat: repeat-x;
}
View
0 resources/static/css/m.css → resources/static/pages/css/m.css
File renamed without changes.
View
6 resources/static/css/style.css → resources/static/pages/css/style.css
@@ -17,7 +17,7 @@ noscript {
body {
background-color: #6a7b86;
- background-image: url("/i/marketplace-header.png"), url("/i/grain.png");
+ background-image: url("/pages/i/marketplace-header.png"), url("/common/i/grain.png");
background-position: center top, center top;
background-repeat: repeat-x, repeat;
color: #fff;
@@ -396,7 +396,7 @@ button.delete:active {
position: absolute;
z-index: 1;
left: 0;
- background-image: url('/i/badge.png');
+ background-image: url('/pages/i/badge.png');
background-position: 0px center;
background-repeat: no-repeat;
@@ -525,7 +525,7 @@ header li {
.home {
width: 205px;
height: 50px;
- background: url("/i/persona-logo-wordmark.png") 0 0 no-repeat;
+ background: url("/pages/i/persona-logo-wordmark.png") 0 0 no-repeat;
text-indent: -9999px;
display: inline-block;
}
View
0 resources/static/i/badge.png → resources/static/pages/i/badge.png
File renamed without changes
View
0 resources/static/i/developers-link.png → resources/static/pages/i/developers-link.png
File renamed without changes
View
0 resources/static/i/flexible-graphic.png → ...urces/static/pages/i/flexible-graphic.png
File renamed without changes
View
0 resources/static/i/marketplace-header.png → ...ces/static/pages/i/marketplace-header.png
File renamed without changes
View
0 resources/static/i/one-password-graphic.png → ...s/static/pages/i/one-password-graphic.png
File renamed without changes
View
0 resources/static/i/persona-logo-wordmark.png → .../static/pages/i/persona-logo-wordmark.png
File renamed without changes
View
0 resources/static/i/slit.png → resources/static/pages/i/slit.png
File renamed without changes
View
0 resources/static/pages/about.js → resources/static/pages/js/about.js
File renamed without changes.
View
0 resources/static/pages/forgot.js → resources/static/pages/js/forgot.js
File renamed without changes.
View
0 resources/static/pages/index.js → resources/static/pages/js/index.js
File renamed without changes.
View
0 resources/static/pages/manage_account.js → resources/static/pages/js/manage_account.js
File renamed without changes.
View
0 resources/static/pages/page_helpers.js → resources/static/pages/js/page_helpers.js
File renamed without changes.
View
0 resources/static/pages/signin.js → resources/static/pages/js/signin.js
File renamed without changes.
View
0 resources/static/pages/signup.js → resources/static/pages/js/signup.js
File renamed without changes.
View
0 resources/static/pages/start.js → resources/static/pages/js/start.js
File renamed without changes.
View
0 .../static/pages/verify_secondary_address.js → ...atic/pages/js/verify_secondary_address.js
File renamed without changes.
View
0 ...atic/test/cases/shared/browser-support.js → ...c/test/cases/common/js/browser-support.js
File renamed without changes.
View
0 resources/static/test/cases/shared/class.js → ...rces/static/test/cases/common/js/class.js
File renamed without changes.
View
0 ...urces/static/test/cases/shared/command.js → ...es/static/test/cases/common/js/command.js
File renamed without changes.
View
0 ...c/test/cases/shared/enable_cookies_url.js → ...est/cases/common/js/enable_cookies_url.js
File renamed without changes.
View
0 ...static/test/cases/shared/error-display.js → ...tic/test/cases/common/js/error-display.js
File renamed without changes.
View
0 ...urces/static/test/cases/shared/helpers.js → ...es/static/test/cases/common/js/helpers.js
File renamed without changes.
View
0 ...urces/static/test/cases/shared/history.js → ...es/static/test/cases/common/js/history.js
File renamed without changes.
View
0 ...t/cases/shared/models/interaction_data.js → ...ases/common/js/models/interaction_data.js
File renamed without changes.
View
0 ...test/cases/shared/modules/cookie_check.js → ...t/cases/common/js/modules/cookie_check.js
File renamed without changes.
View
0 .../cases/shared/modules/interaction_data.js → ...ses/common/js/modules/interaction_data.js
File renamed without changes.
View
0 .../test/cases/shared/modules/page_module.js → ...st/cases/common/js/modules/page_module.js
File renamed without changes.
View
0 ...ic/test/cases/shared/modules/xhr_delay.js → ...test/cases/common/js/modules/xhr_delay.js
File renamed without changes.
View
0 .../cases/shared/modules/xhr_disable_form.js → ...ses/common/js/modules/xhr_disable_form.js
File renamed without changes.
View
0 ...urces/static/test/cases/shared/network.js → ...es/static/test/cases/common/js/network.js
File renamed without changes.
View
0 ...rces/static/test/cases/shared/renderer.js → ...s/static/test/cases/common/js/renderer.js
File renamed without changes.
View
0 ...urces/static/test/cases/shared/screens.js → ...es/static/test/cases/common/js/screens.js
File renamed without changes.
View
0 ...static/test/cases/shared/state_machine.js → ...tic/test/cases/common/js/state_machine.js
File renamed without changes.
View
0 ...urces/static/test/cases/shared/storage.js → ...es/static/test/cases/common/js/storage.js
File renamed without changes.
View
0 ...urces/static/test/cases/shared/tooltip.js → ...es/static/test/cases/common/js/tooltip.js
File renamed without changes.
View
0 resources/static/test/cases/shared/user.js → ...urces/static/test/cases/common/js/user.js
File renamed without changes.
View
0 ...es/static/test/cases/shared/validation.js → ...static/test/cases/common/js/validation.js
File renamed without changes.
View
0 resources/static/test/cases/shared/xhr.js → resources/static/test/cases/common/js/xhr.js
File renamed without changes.
View
9 resources/static/test/cases/dialog.js
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-module("dialog");
-
-test("dialog testing works", function(){
- ok(true,"an assert is run");
-});
View
0 ...es/static/test/cases/resources/helpers.js → ...atic/test/cases/dialog/js/misc/helpers.js
File renamed without changes.
View
0 ...atic/test/cases/resources/internal_api.js → ...test/cases/dialog/js/misc/internal_api.js
File renamed without changes.
View
0 ...rces/static/test/cases/resources/state.js → ...static/test/cases/dialog/js/misc/state.js
File renamed without changes.
View
0 .../static/test/cases/controllers/actions.js → ...c/test/cases/dialog/js/modules/actions.js
File renamed without changes.
View
0 ...tatic/test/cases/controllers/add_email.js → ...test/cases/dialog/js/modules/add_email.js
File renamed without changes.
View
0 ...ic/test/cases/controllers/authenticate.js → ...t/cases/dialog/js/modules/authenticate.js
File renamed without changes.
View
0 ...t/cases/controllers/check_registration.js → ...s/dialog/js/modules/check_registration.js
File renamed without changes.
View
0 ...s/static/test/cases/controllers/dialog.js → ...ic/test/cases/dialog/js/modules/dialog.js
File renamed without changes.
View
0 ...test/cases/controllers/forgot_password.js → ...ases/dialog/js/modules/forgot_password.js
File renamed without changes.
View
0 ...t/cases/controllers/generate_assertion.js → ...s/dialog/js/modules/generate_assertion.js
File renamed without changes.
View
0 ...ases/controllers/is_this_your_computer.js → ...ialog/js/modules/is_this_your_computer.js
File renamed without changes.
View
0 ...atic/test/cases/controllers/pick_email.js → ...est/cases/dialog/js/modules/pick_email.js
File renamed without changes.
View
0 ...s/controllers/primary_user_provisioned.js → ...og/js/modules/primary_user_provisioned.js
File renamed without changes.
View
0 ...ses/controllers/provision_primary_user.js → ...alog/js/modules/provision_primary_user.js
File renamed without changes.
View
0 .../test/cases/controllers/required_email.js → ...cases/dialog/js/modules/required_email.js
File renamed without changes.
View
0 .../static/test/cases/controllers/rp_info.js → ...c/test/cases/dialog/js/modules/rp_info.js
File renamed without changes.
View
0 ...ic/test/cases/controllers/set_password.js → ...t/cases/dialog/js/modules/set_password.js
File renamed without changes.
View
0 .../cases/controllers/verify_primary_user.js → .../dialog/js/modules/verify_primary_user.js
File renamed without changes.
View
0 resources/static/test/cases/pages/about.js → ...urces/static/test/cases/pages/js/about.js
File renamed without changes.
View
0 ...rces/static/test/cases/pages/browserid.js → ...s/static/test/cases/pages/js/browserid.js
File renamed without changes.
View
0 resources/static/test/cases/pages/forgot.js → ...rces/static/test/cases/pages/js/forgot.js
File renamed without changes.
View
0 ...static/test/cases/pages/manage_account.js → ...tic/test/cases/pages/js/manage_account.js
File renamed without changes.
View
0 ...s/static/test/cases/pages/page_helpers.js → ...tatic/test/cases/pages/js/page_helpers.js
File renamed without changes.
View
0 resources/static/test/cases/pages/signin.js → ...rces/static/test/cases/pages/js/signin.js
File renamed without changes.
View
0 resources/static/test/cases/pages/signup.js → ...rces/static/test/cases/pages/js/signup.js
File renamed without changes.
View
0 ...t/cases/pages/verify_secondary_address.js → ...ases/pages/js/verify_secondary_address.js
File renamed without changes.
View
6 resources/views/about.ejs
@@ -13,13 +13,13 @@
</div>
<div class="graphic">
- <img src="i/one-password-graphic.png" alt="One password to rule them all.">
+ <img src="/pages/i/one-password-graphic.png" alt="One password to rule them all.">
</div>
</article>
<article class="blurb flexible">
<div class="graphic first">
- <img src="i/flexible-graphic.png" alt="Use multiple email addresses">
+ <img src="/pages/i/flexible-graphic.png" alt="Use multiple email addresses">
</div>
<div class="info">
@@ -42,7 +42,7 @@
</article>
</section>
- <a href="https://developer.mozilla.org/en/BrowserID/Quick_Setup" class="developers"><img src="i/developers-link.png" alt="Persona for developers"><span>Implement Persona on your site </span>Developer guides and API documentation</a>
+ <a href="https://developer.mozilla.org/en/BrowserID/Quick_Setup" class="developers"><img src="/pages/i/developers-link.png" alt="Persona for developers"><span>Implement Persona on your site </span>Developer guides and API documentation</a>
</div><!-- #dashboard -->
</div>
View
2 resources/views/dialog_layout.ejs
@@ -10,7 +10,7 @@
<meta name="format-detection" content="email=no" />
<!--[if lt IE 9]>
- <script src="/lib/html5shim.js"></script>
+ <script src="/common/js/lib/html5shim.js"></script>
<![endif]-->
<%- cachify_css('/production/dialog.css') %>
<!--[if lt IE 9]>
View
2 resources/views/index.ejs
@@ -5,7 +5,7 @@
<div id="hAlign" class="display_nonauth">
<div id="vAlign">
<div id="signUp">
- <div id="card"><img src="<%- cachify('/i/slit.png') %>"></div>
+ <div id="card"><img src="<%- cachify('/pages/i/slit.png') %>"></div>
<h1 class="white headline-main">Connect with Mozilla Persona, the safest &amp; easiest way to sign in.</h1>
<p class="tour white">
View
2 resources/views/layout.ejs
@@ -8,7 +8,7 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, width=device-width" />
<meta name="format-detection" content="email=no" />
<!--[if lt IE 9]>
- <script src="/lib/html5shim.js"></script>
+ <script src="/common/js/lib/html5shim.js"></script>
<![endif]-->
<%- cachify_css('/production/browserid.css') %>
<!--[if lt IE 9]>
View
241 resources/views/test.ejs
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="qunit/qunit.css" />
<title>Persona QUnit Test</title>
<!--[if lt IE 9]>
- <script src="/lib/html5shim.js"></script>
+ <script src="/common/js/lib/html5shim.js"></script>
<![endif]-->
</head>
<body>
@@ -66,20 +66,21 @@
</script>
<script src="qunit/qunit.js"></script>
<script src="/include.js"></script>
- <script src="/lib/jquery-1.7.1.min.js"></script>
- <script src="/lib/underscore.js"></script>
- <script src="/lib/ejs.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="/i18n/en_US/client.json"></script>
- <script src="/shared/javascript-extensions.js"></script>
- <script src="/shared/gettext.js"></script>
- <script src="/lib/bidbundle.js"></script>
+ <script src="/common/js/javascript-extensions.js"></script>
+ <script src="/common/js/gettext.js"></script>
+ <script src="/common/js/lib/bidbundle.js"></script>
<script src="http://testmob.org/include.js"></script>
- <script src="/shared/browserid.js"></script>
- <script src="/lib/dom-jquery.js"></script>
- <script src="/lib/hub.js"></script>
- <script src="/lib/module.js"></script>
- <script src="/lib/jschannel.js"></script>
- <script src="/lib/urlparse.js"></script>
+ <script src="/common/js/browserid.js"></script>
+ <script src="/common/js/lib/dom-jquery.js"></script>
+ <script src="/common/js/lib/hub.js"></script>
+ <script src="/common/js/lib/module.js"></script>
+ <script src="/common/js/lib/jschannel.js"></script>
+ <script src="/common/js/lib/urlparse.js"></script>
+
<script src="mocks/mocks.js"></script>
<script src="mocks/xhr.js"></script>
<script src="mocks/templates.js"></script>
@@ -88,119 +89,119 @@
<script src="mocks/winchan.js"></script>
<script src="mocks/cachify.js"></script>
- <script src="/shared/renderer.js"></script>
- <script src="/shared/class.js"></script>
- <script src="/shared/mediator.js"></script>
- <script src="/shared/tooltip.js"></script>
- <script src="/shared/validation.js"></script>
- <script src="/shared/helpers.js"></script>
- <script src="/shared/screens.js"></script>
- <script src="/shared/browser-support.js"></script>
- <script src="/shared/enable_cookies_url.js"></script>
- <script src="/shared/wait-messages.js"></script>
- <script src="/shared/error-messages.js"></script>
- <script src="/shared/error-display.js"></script>
- <script src="/shared/storage.js"></script>
- <script src="/shared/xhr.js"></script>
- <script src="/shared/network.js"></script>
- <script src="/shared/provisioning.js"></script>
- <script src="/shared/user.js"></script>
- <script src="/shared/command.js"></script>
- <script src="/shared/history.js"></script>
- <script src="/shared/state_machine.js"></script>
-
- <script src="/shared/models/models.js"></script>
- <script src="/shared/models/interaction_data.js"></script>
-
- <script src="/shared/modules/page_module.js"></script>
- <script src="/shared/modules/xhr_delay.js"></script>
- <script src="/shared/modules/xhr_disable_form.js"></script>
- <script src="/shared/modules/cookie_check.js"></script>
- <script src="/shared/modules/interaction_data.js"></script>
-
- <script src="/dialog/resources/internal_api.js"></script>
- <script src="/dialog/resources/helpers.js"></script>
- <script src="/dialog/resources/state.js"></script>
-
- <script src="/dialog/controllers/actions.js"></script>
- <script src="/dialog/controllers/pick_email.js"></script>
- <script src="/dialog/controllers/add_email.js"></script>
- <script src="/dialog/controllers/dialog.js"></script>
- <script src="/dialog/controllers/check_registration.js"></script>
- <script src="/dialog/controllers/authenticate.js"></script>
- <script src="/dialog/controllers/required_email.js"></script>
- <script src="/dialog/controllers/verify_primary_user.js"></script>
- <script src="/dialog/controllers/generate_assertion.js"></script>
- <script src="/dialog/controllers/provision_primary_user.js"></script>
- <script src="/dialog/controllers/primary_user_provisioned.js"></script>
- <script src="/dialog/controllers/is_this_your_computer.js"></script>
- <script src="/dialog/controllers/set_password.js"></script>
- <script src="/dialog/controllers/rp_info.js"></script>
-
- <script src="/pages/page_helpers.js"></script>
- <script src="/pages/verify_secondary_address.js"></script>
- <script src="/pages/forgot.js"></script>
- <script src="/pages/manage_account.js"></script>
- <script src="/pages/signin.js"></script>
- <script src="/pages/signup.js"></script>
- <script src="/pages/about.js"></script>
+ <script src="/common/js/renderer.js"></script>
+ <script src="/common/js/class.js"></script>
+ <script src="/common/js/mediator.js"></script>
+ <script src="/common/js/tooltip.js"></script>
+ <script src="/common/js/validation.js"></script>
+ <script src="/common/js/helpers.js"></script>
+ <script src="/common/js/screens.js"></script>
+ <script src="/common/js/browser-support.js"></script>
+ <script src="/common/js/enable_cookies_url.js"></script>
+ <script src="/common/js/wait-messages.js"></script>
+ <script src="/common/js/error-messages.js"></script>
+ <script src="/common/js/error-display.js"></script>
+ <script src="/common/js/storage.js"></script>
+ <script src="/common/js/xhr.js"></script>
+ <script src="/common/js/network.js"></script>
+ <script src="/common/js/provisioning.js"></script>
+ <script src="/common/js/user.js"></script>
+ <script src="/common/js/command.js"></script>
+ <script src="/common/js/history.js"></script>
+ <script src="/common/js/state_machine.js"></script>
+
+ <script src="/common/js/models/models.js"></script>
+ <script src="/common/js/models/interaction_data.js"></script>
+
+ <script src="/common/js/modules/page_module.js"></script>
+ <script src="/common/js/modules/xhr_delay.js"></script>
+ <script src="/common/js/modules/xhr_disable_form.js"></script>
+ <script src="/common/js/modules/cookie_check.js"></script>
+ <script src="/common/js/modules/interaction_data.js"></script>
+
+ <script src="/dialog/js/misc/internal_api.js"></script>
+ <script src="/dialog/js/misc/helpers.js"></script>
+ <script src="/dialog/js/misc/state.js"></script>
+
+ <script src="/dialog/js/modules/actions.js"></script>
+ <script src="/dialog/js/modules/pick_email.js"></script>
+ <script src="/dialog/js/modules/add_email.js"></script>
+ <script src="/dialog/js/modules/dialog.js"></script>
+ <script src="/dialog/js/modules/check_registration.js"></script>
+ <script src="/dialog/js/modules/authenticate.js"></script>
+ <script src="/dialog/js/modules/required_email.js"></script>
+ <script src="/dialog/js/modules/verify_primary_user.js"></script>
+ <script src="/dialog/js/modules/generate_assertion.js"></script>
+ <script src="/dialog/js/modules/provision_primary_user.js"></script>
+ <script src="/dialog/js/modules/primary_user_provisioned.js"></script>
+ <script src="/dialog/js/modules/is_this_your_computer.js"></script>
+ <script src="/dialog/js/modules/set_password.js"></script>
+ <script src="/dialog/js/modules/rp_info.js"></script>
+
+ <script src="/pages/js/page_helpers.js"></script>
+ <script src="/pages/js/verify_secondary_address.js"></script>
+ <script src="/pages/js/forgot.js"></script>
+ <script src="/pages/js/manage_account.js"></script>
+ <script src="/pages/js/signin.js"></script>
+ <script src="/pages/js/signup.js"></script>
+ <script src="/pages/js/about.js"></script>
<script src="testHelpers/helpers.js"></script>
<script src="cases/include.js"></script>
- <script src="cases/shared/helpers.js"></script>
- <script src="cases/shared/renderer.js"></script>
- <script src="cases/shared/screens.js"></script>
- <script src="cases/shared/tooltip.js"></script>
- <script src="cases/shared/error-display.js"></script>
- <script src="cases/shared/browser-support.js"></script>
- <script src="cases/shared/enable_cookies_url.js"></script>
- <script src="cases/shared/validation.js"></script>
- <script src="cases/shared/storage.js"></script>
- <script src="cases/shared/xhr.js"></script>
- <script src="cases/shared/network.js"></script>
- <script src="cases/shared/user.js"></script>
- <script src="cases/shared/command.js"></script>
- <script src="cases/shared/history.js"></script>
- <script src="cases/shared/state_machine.js"></script>
-
- <script src="cases/shared/models/interaction_data.js"></script>
-
- <script src="cases/shared/modules/page_module.js"></script>
- <script src="cases/shared/modules/xhr_delay.js"></script>
- <script src="cases/shared/modules/xhr_disable_form.js"></script>
- <script src="cases/shared/modules/cookie_check.js"></script>
- <script src="cases/shared/modules/interaction_data.js"></script>
-
- <script src="cases/pages/browserid.js"></script>
- <script src="cases/pages/page_helpers.js"></script>
- <script src="cases/pages/verify_secondary_address.js"></script>
- <script src="cases/pages/forgot.js"></script>
- <script src="cases/pages/signin.js"></script>
- <script src="cases/pages/signup.js"></script>
- <script src="cases/pages/manage_account.js"></script>
- <script src="cases/pages/about.js"></script>
-
- <script src="cases/resources/internal_api.js"></script>
- <script src="cases/resources/helpers.js"></script>
- <script src="cases/resources/state.js"></script>
-
- <script src="cases/controllers/actions.js"></script>
- <script src="cases/controllers/pick_email.js"></script>
- <script src="cases/controllers/add_email.js"></script>
- <script src="cases/controllers/check_registration.js"></script>
- <script src="cases/controllers/authenticate.js"></script>
- <script src="cases/controllers/required_email.js"></script>
- <script src="cases/controllers/verify_primary_user.js"></script>
- <script src="cases/controllers/generate_assertion.js"></script>
- <script src="cases/controllers/provision_primary_user.js"></script>
- <script src="cases/controllers/primary_user_provisioned.js"></script>
- <script src="cases/controllers/is_this_your_computer.js"></script>
- <script src="cases/controllers/set_password.js"></script>
- <script src="cases/controllers/rp_info.js"></script>
+ <script src="cases/common/js/helpers.js"></script>
+ <script src="cases/common/js/renderer.js"></script>
+ <script src="cases/common/js/screens.js"></script>
+ <script src="cases/common/js/tooltip.js"></script>
+ <script src="cases/common/js/error-display.js"></script>
+ <script src="cases/common/js/browser-support.js"></script>
+ <script src="cases/common/js/enable_cookies_url.js"></script>
+ <script src="cases/common/js/validation.js"></script>
+ <script src="cases/common/js/storage.js"></script>
+ <script src="cases/common/js/xhr.js"></script>
+ <script src="cases/common/js/network.js"></script>
+ <script src="cases/common/js/user.js"></script>
+ <script src="cases/common/js/command.js"></script>
+ <script src="cases/common/js/history.js"></script>
+ <script src="cases/common/js/state_machine.js"></script>
+
+ <script src="cases/common/js/models/interaction_data.js"></script>
+
+ <script src="cases/common/js/modules/page_module.js"></script>
+ <script src="cases/common/js/modules/xhr_delay.js"></script>
+ <script src="cases/common/js/modules/xhr_disable_form.js"></script>
+ <script src="cases/common/js/modules/cookie_check.js"></script>
+ <script src="cases/common/js/modules/interaction_data.js"></script>
+
+ <script src="cases/pages/js/browserid.js"></script>
+ <script src="cases/pages/js/page_helpers.js"></script>
+ <script src="cases/pages/js/verify_secondary_address.js"></script>
+ <script src="cases/pages/js/forgot.js"></script>
+ <script src="cases/pages/js/signin.js"></script>
+ <script src="cases/pages/js/signup.js"></script>
+ <script src="cases/pages/js/manage_account.js"></script>
+ <script src="cases/pages/js/about.js"></script>
+
+ <script src="cases/dialog/js/misc/internal_api.js"></script>
+ <script src="cases/dialog/js/misc/helpers.js"></script>
+ <script src="cases/dialog/js/misc/state.js"></script>
+
+ <script src="cases/dialog/js/modules/actions.js"></script>
+ <script src="cases/dialog/js/modules/pick_email.js"></script>
+ <script src="cases/dialog/js/modules/add_email.js"></script>
+ <script src="cases/dialog/js/modules/check_registration.js"></script>
+ <script src="cases/dialog/js/modules/authenticate.js"></script>
+ <script src="cases/dialog/js/modules/required_email.js"></script>
+ <script src="cases/dialog/js/modules/verify_primary_user.js"></script>
+ <script src="cases/dialog/js/modules/generate_assertion.js"></script>
+ <script src="cases/dialog/js/modules/provision_primary_user.js"></script>
+ <script src="cases/dialog/js/modules/primary_user_provisioned.js"></script>
+ <script src="cases/dialog/js/modules/is_this_your_computer.js"></script>
+ <script src="cases/dialog/js/modules/set_password.js"></script>
+ <script src="cases/dialog/js/modules/rp_info.js"></script>
<!-- must go last or all other tests will fail. -->
- <script src="cases/controllers/dialog.js"></script>
+ <script src="cases/dialog/js/modules/dialog.js"></script>
</body>
</html>

0 comments on commit 2445861

Please sign in to comment.
Something went wrong with that request. Please try again.