From 173f2c5e95c2cf7fe7f16379dbe3837a2d74f079 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Thu, 9 Mar 2017 13:23:15 -0700 Subject: [PATCH] Base url was a bad choice... --- app/components/host-row/template.hbs | 4 +-- app/mixins/cattle-transitioning-resource.js | 27 ++++++++++++--------- server/caas/registration/api.js | 8 +++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/components/host-row/template.hbs b/app/components/host-row/template.hbs index dcf35ed79..4e7de231b 100644 --- a/app/components/host-row/template.hbs +++ b/app/components/host-row/template.hbs @@ -58,11 +58,11 @@ {{#if expanded}} {{! make the alternating color match }} - + {{container-table body=model.instances stickyHeader=false - bulkActions=true + bulkActions=false search=false searchText=searchText subRow=true diff --git a/app/mixins/cattle-transitioning-resource.js b/app/mixins/cattle-transitioning-resource.js index 9a0680471..f7562c0d3 100644 --- a/app/mixins/cattle-transitioning-resource.js +++ b/app/mixins/cattle-transitioning-resource.js @@ -12,33 +12,38 @@ const defaultStateMap = { 'creating': {icon: 'icon icon-tag', color: 'text-info' }, 'deactivating': {icon: 'icon icon-adjust', color: 'text-info' }, 'degraded': {icon: 'icon icon-alert', color: 'text-warning'}, - 'disconnected': {icon: 'icon icon-alert', color: 'text-warning' }, - 'error': {icon: 'icon icon-alert', color: 'text-error' }, - 'inactive': {icon: 'icon icon-circle', color: 'text-error' }, + 'disconnected': {icon: 'icon icon-alert', color: 'text-warning'}, + 'error': {icon: 'icon icon-alert', color: 'text-error' }, + 'erroring': {icon: 'icon icon-alert', color: 'text-error' }, + 'inactive': {icon: 'icon icon-circle', color: 'text-error' }, 'initializing': {icon: 'icon icon-alert', color: 'text-warning'}, - 'provisioning': {icon: 'icon icon-circle', color: 'text-info'}, - 'purged': {icon: 'icon icon-purged', color: 'text-error' }, + 'migrating': {icon: 'icon icon-info', color: 'text-info' }, + 'provisioning': {icon: 'icon icon-circle', color: 'text-info' }, + 'purged': {icon: 'icon icon-purged', color: 'text-error' }, 'purging': {icon: 'icon icon-purged', color: 'text-info' }, - 'reconnecting': {icon: 'icon icon-alert', color: 'text-error' }, - 'removed': {icon: 'icon icon-trash', color: 'text-error' }, + 'reconnecting': {icon: 'icon icon-alert', color: 'text-error' }, + 'removed': {icon: 'icon icon-trash', color: 'text-error' }, 'removing': {icon: 'icon icon-trash', color: 'text-info' }, 'requested': {icon: 'icon icon-tag', color: 'text-info' }, 'registering': {icon: 'icon icon-tag', color: 'text-info' }, 'reinitializing': {icon: 'icon icon-alert', color: 'text-warning'}, 'restoring': {icon: 'icon icon-medicalcross', color: 'text-info' }, + 'restarting': {icon: 'icon icon-adjust', color: 'text-info' }, 'running': {icon: 'icon icon-circle-o', color: 'text-success'}, 'snapshotted': {icon: 'icon icon-snapshot', color: 'text-warning'}, 'started-once': {icon: 'icon icon-dot-circlefill',color: 'text-success'}, 'starting': {icon: 'icon icon-adjust', color: 'text-info' }, - 'stopped': {icon: 'icon icon-circle', color: 'text-error' }, + 'stopped': {icon: 'icon icon-circle', color: 'text-error' }, 'stopping': {icon: 'icon icon-adjust', color: 'text-info' }, - 'unhealthy': {icon: 'icon icon-alert', color: 'text-error' }, + 'unhealthy': {icon: 'icon icon-alert', color: 'text-error' }, 'updating': {icon: 'icon icon-tag', color: 'text-info' }, 'updating-active': {icon: 'icon icon-tag', color: 'text-info' }, 'updating-healthy': {icon: 'icon icon-tag', color: 'text-info' }, - 'updating-unhealthy': {icon: 'icon icon-tag', color: 'text-info' }, - 'updating-reinitializing': {icon: 'icon icon-alert', color: 'text-info' }, 'updating-inactive': {icon: 'icon icon-tag', color: 'text-info' }, + 'updating-unhealthy': {icon: 'icon icon-tag', color: 'text-info' }, + 'updating-reinitializing': {icon: 'icon icon-alert', color: 'text-warning'}, + 'updating-running': {icon: 'icon icon-tag', color: 'text-info' }, + 'updating-stopped': {icon: 'icon icon-tag', color: 'text-info' }, 'waiting': {icon: 'icon icon-tag', color: 'text-info' }, }; diff --git a/server/caas/registration/api.js b/server/caas/registration/api.js index c39aab164..449172041 100644 --- a/server/caas/registration/api.js +++ b/server/caas/registration/api.js @@ -14,7 +14,7 @@ module.exports = function(app/*, options*/) { const rancherApiUrl = `${config.apiServer}${config.apiEndpoint}`; const tablePrefix = process.env.DB_TABLE_PREFIX || ''; - const baseUrl = process.env.BASE_URL || ('https://' + process.env.RANCHER); + const siteUrl = process.env.SITE_URL || ('https://' + process.env.RANCHER); app.use(bodyParser.json()); // for parsing application/json @@ -313,7 +313,7 @@ module.exports = function(app/*, options*/) { var from_email = new helper.Email('no-reply@rancher.com'); var to_email = new helper.Email(email); var subject = 'Password Reset Request'; - var contentLink = `Reset Password`; + var contentLink = `Reset Password`; var content = new helper.Content( 'text/html', contentLink); var mail = new helper.Mail(from_email, subject, to_email, content); @@ -344,7 +344,7 @@ module.exports = function(app/*, options*/) { var from_email = new helper.Email('no-reply@rancher.com'); var to_email = new helper.Email(email); var subject = 'Verify your Rancher Cloud Account'; - var contentLink = `Verify Email`; + var contentLink = `Verify Email`; var content = new helper.Content( 'text/html', contentLink); var mail = new helper.Mail(from_email, subject, to_email, content); @@ -370,7 +370,7 @@ module.exports = function(app/*, options*/) { var from_email = new helper.Email('no-reply@rancher.com'); var to_email = new helper.Email(email); var subject = 'Password Reset Confirmation'; - var contentLink = `Reset Password`; + var contentLink = `Reset Password`; var content = new helper.Content( 'text/html', contentLink); var mail = new helper.Mail(from_email, subject, to_email, content);