Skip to content
Snippets Groups Projects
Commit b839aaef authored by Shane Tomlinson's avatar Shane Tomlinson
Browse files

Merge branch 'dev' into issue-1502

parents 892999c5 3a4c6df0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 123 additions and 123 deletions
bin/browserid
+ 3
− 3
View file @ b839aaef
......@@ -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');
......
lib/static_resources.js
+ 99
− 99
View file @ b839aaef
......@@ -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': [
......
resources/static/css/ie8_common.css → resources/static/common/css/ie8.css
+ 1
− 1
View file @ b839aaef
......@@ -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;
}
......
resources/static/css/common.css → resources/static/common/css/style.css
+ 20
− 20
View file @ b839aaef
......@@ -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 {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment