rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Base url was a bad choice...

This commit is contained in:
Vincent Fiduccia 2017-03-09 13:23:15 -07:00
parent ffd50935b4
commit 173f2c5e95
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/host-row/template.hbs
View File

@ -58,11 +58,11 @@
{{#if expanded}} {{#if expanded}}
<tr class="sub-row hide">{{! make the alternating color match }}</tr> <tr class="sub-row hide">{{! make the alternating color match }}</tr>
<tr class="sub-row no-top"> <tr class="sub-row no-top">
<td colspan="{{fullColspan}}" class="p-0"> <td colspan="{{fullColspan}}" class="pr-40 pl-40">
{{container-table {{container-table
body=model.instances body=model.instances
stickyHeader=false stickyHeader=false
bulkActions=true bulkActions=false
search=false search=false
searchText=searchText searchText=searchText
subRow=true subRow=true

27
app/mixins/cattle-transitioning-resource.js
View File

@ -12,33 +12,38 @@ const defaultStateMap = {
'creating': {icon: 'icon icon-tag', color: 'text-info' }, 'creating': {icon: 'icon icon-tag', color: 'text-info' },
'deactivating': {icon: 'icon icon-adjust', color: 'text-info' }, 'deactivating': {icon: 'icon icon-adjust', color: 'text-info' },
'degraded': {icon: 'icon icon-alert', color: 'text-warning'}, 'degraded': {icon: 'icon icon-alert', color: 'text-warning'},
'disconnected': {icon: 'icon icon-alert', color: 'text-warning' }, 'disconnected': {icon: 'icon icon-alert', color: 'text-warning'},
'error': {icon: 'icon icon-alert', color: 'text-error' }, 'error': {icon: 'icon icon-alert', color: 'text-error' },
'inactive': {icon: 'icon icon-circle', 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'}, 'initializing': {icon: 'icon icon-alert', color: 'text-warning'},
'provisioning': {icon: 'icon icon-circle', color: 'text-info'}, 'migrating': {icon: 'icon icon-info', color: 'text-info' },
'purged': {icon: 'icon icon-purged', color: 'text-error' }, 'provisioning': {icon: 'icon icon-circle', color: 'text-info' },
'purged': {icon: 'icon icon-purged', color: 'text-error' },
'purging': {icon: 'icon icon-purged', color: 'text-info' }, 'purging': {icon: 'icon icon-purged', color: 'text-info' },
'reconnecting': {icon: 'icon icon-alert', color: 'text-error' }, 'reconnecting': {icon: 'icon icon-alert', color: 'text-error' },
'removed': {icon: 'icon icon-trash', color: 'text-error' }, 'removed': {icon: 'icon icon-trash', color: 'text-error' },
'removing': {icon: 'icon icon-trash', color: 'text-info' }, 'removing': {icon: 'icon icon-trash', color: 'text-info' },
'requested': {icon: 'icon icon-tag', color: 'text-info' }, 'requested': {icon: 'icon icon-tag', color: 'text-info' },
'registering': {icon: 'icon icon-tag', color: 'text-info' }, 'registering': {icon: 'icon icon-tag', color: 'text-info' },
'reinitializing': {icon: 'icon icon-alert', color: 'text-warning'}, 'reinitializing': {icon: 'icon icon-alert', color: 'text-warning'},
'restoring': {icon: 'icon icon-medicalcross', color: 'text-info' }, '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'}, 'running': {icon: 'icon icon-circle-o', color: 'text-success'},
'snapshotted': {icon: 'icon icon-snapshot', color: 'text-warning'}, 'snapshotted': {icon: 'icon icon-snapshot', color: 'text-warning'},
'started-once': {icon: 'icon icon-dot-circlefill',color: 'text-success'}, 'started-once': {icon: 'icon icon-dot-circlefill',color: 'text-success'},
'starting': {icon: 'icon icon-adjust', color: 'text-info' }, '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' }, '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': {icon: 'icon icon-tag', color: 'text-info' },
'updating-active': {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-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-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' }, 'waiting': {icon: 'icon icon-tag', color: 'text-info' },
}; };

8
server/caas/registration/api.js
View File

@ -14,7 +14,7 @@ module.exports = function(app/*, options*/) {
const rancherApiUrl = `${config.apiServer}${config.apiEndpoint}`; const rancherApiUrl = `${config.apiServer}${config.apiEndpoint}`;
const tablePrefix = process.env.DB_TABLE_PREFIX || ''; 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 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 from_email = new helper.Email('no-reply@rancher.com');
var to_email = new helper.Email(email); var to_email = new helper.Email(email);
var subject = 'Password Reset Request'; var subject = 'Password Reset Request';
var contentLink = `<html><a href="${baseUrl}/verify-reset-password/${token}">Reset Password</a></html>`; var contentLink = `<html><a href="${siteUrl}/verify-reset-password/${token}">Reset Password</a></html>`;
var content = new helper.Content( var content = new helper.Content(
'text/html', contentLink); 'text/html', contentLink);
var mail = new helper.Mail(from_email, subject, to_email, content); 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 from_email = new helper.Email('no-reply@rancher.com');
var to_email = new helper.Email(email); var to_email = new helper.Email(email);
var subject = 'Verify your Rancher Cloud Account'; var subject = 'Verify your Rancher Cloud Account';
var contentLink = `<html><a href="${baseUrl}/verify/${token}">Verify Email</a></html>`; var contentLink = `<html><a href="${siteUrl}/verify/${token}">Verify Email</a></html>`;
var content = new helper.Content( var content = new helper.Content(
'text/html', contentLink); 'text/html', contentLink);
var mail = new helper.Mail(from_email, subject, to_email, content); 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 from_email = new helper.Email('no-reply@rancher.com');
var to_email = new helper.Email(email); var to_email = new helper.Email(email);
var subject = 'Password Reset Confirmation'; var subject = 'Password Reset Confirmation';
var contentLink = `<html><a href="${baseUrl}/login?resetpw=true">Reset Password</a></html>`; var contentLink = `<html><a href="${siteUrl}/login?resetpw=true">Reset Password</a></html>`;
var content = new helper.Content( var content = new helper.Content(
'text/html', contentLink); 'text/html', contentLink);
var mail = new helper.Mail(from_email, subject, to_email, content); var mail = new helper.Mail(from_email, subject, to_email, content);