Skip to content

Commit

Permalink
Entity2298 HOTFIX (#334)
Browse files Browse the repository at this point in the history 
* [entity2298] Update Language in Role Change Confirmation Email

* [entity2298] Whitespace Fix

* [entity2298] Fixing Issues With Email Template

* [entity2298] Fixing Issue with Button Spacing in Confirmation Modal

* [entity2298] Fixing strings for email notification message

* [bug] Fixed issue with user profile form button alignment
  • Loading branch information
@jeznorth @sutherlanda
jeznorth authored and sutherlanda committed Jan 9, 2020
1 parent 12e2a30 commit aa09bf3
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 65 deletions.
114 changes: 57 additions & 57 deletions auth-api/email_templates/role_changed_notification_email.html
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Your Role Has Been Changed</title>
<style>
/* Global Resets */
body, table, div, a, p {
font-family: Verdana, Arial, sans-serif;
}
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Your Role Has Been Changed</title>
<style>
/* Global Resets */
body, table, div, a, p {
font-family: Verdana, Arial, sans-serif;
}

body {
margin: 0;
padding: 0;
}
body {
margin: 0;
padding: 0;
}

table {
border-collapse: collapse;
}
table {
border-collapse: collapse;
}

img {
border: none;
}
</style>
<meta name="referrer" content="origin-when-cross-origin"/>
<title>chat.pathfinder.gov.bc.ca</title>
<meta name="application-name" content="chat.pathfinder.gov.bc.ca">
<meta name="apple-mobile-web-app-title" content="chat.pathfinder.gov.bc.ca">
<meta http-equiv="content-language" content="">
<meta name="language" content="">
<base href="/">
img {
border: none;
}
</style>
<meta name="referrer" content="origin-when-cross-origin"/>
<title>chat.pathfinder.gov.bc.ca</title>
<meta name="application-name" content="chat.pathfinder.gov.bc.ca">
<meta name="apple-mobile-web-app-title" content="chat.pathfinder.gov.bc.ca">
<meta http-equiv="content-language" content="">
<meta name="language" content="">
<base href="/">
</head>
<body>
<table style="width: 100%;" cellspacing="0" cellpadding="0">
<tr>
<td style="padding-left: 20px; padding-right: 20px;">
<table style="max-width: 640px; margin: 0 auto; border: 0; border-collapse: collapse; border-radius: 6px; background-color: #ffffff;"
cellspacing="0" cellpadding="0">
<tr>
<td style="padding-top: 30px; padding-bottom: 30px;">
<img src="{{ logo_url }}" height="54" alt="Government of British Columbia"/>
</td>
</tr>
<tr>
<td>
<h1 style="margin: 0; line-height: 34px; letter-spacing: -1px; font-family: Verdana, Arial, sans-serif; font-size: 24px; font-weight: 700;">
Your role in the <strong>{{ params['org_name'] }}</strong> team at Cooperatives Online has been changed and you are now {{params['role']}}.
</h1>
<p style="margin-top: 20px; margin-bottom: 0; line-height: 24px; font-family: Verdana, Arial, sans-serif; font-size: 16px;">
As {{params['role']}} , now you {{params['label']}}
</p>
<p style="margin-top: 20px; margin-bottom: 0; line-height: 24px; font-family: Verdana, Arial, sans-serif; font-size: 16px;">
As a To access this team, log into Cooperatives Online using your BC Services Card.
</p>
<div style="margin-top: 45px;">
<!--[if mso]> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{ url }}" style="height:55px; v-text-anchor:middle; width:250px;" arcsize="10%" stroke="f" fillcolor="#003366" alias="CTA1">Join Team<w:anchorlock/> <center> <![endif]-->
<a style="display: inline-block; width: 250px; color: #ffffff; border: none; border-radius: 6px; background-color: #003366; line-height: 55px; text-align: center; text-decoration: none; font-size: 16px; font-weight: bold;"
href="{{ url }}">Cooperatives Online</a>
<!--[if mso]> </center> </v:roundrect> <![endif]-->
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td style="padding-left: 20px; padding-right: 20px;">
<table style="max-width: 640px; margin: 0 auto; border: 0; border-collapse: collapse; border-radius: 6px; background-color: #ffffff;" cellspacing="0" cellpadding="0">
<tr>
<td style="padding-top: 30px; padding-bottom: 30px;">
<img src="{{ logo_url }}" height="54" alt="Government of British Columbia"/>
</td>
</tr>
<tr>
<td>
<h1 style="margin: 0; line-height: 34px; letter-spacing: -1px; font-family: Verdana, Arial, sans-serif; font-size: 24px; font-weight: 700;">
Your role on the <strong>{{params['org_name']}}</strong> team at Cooperatives Online has been changed.
</h1>
<p style="margin-top: 20px; margin-bottom: 0; line-height: 24px; font-family: Verdana, Arial, sans-serif; font-size: 16px;">
Your new role: {{params['role']}}<br>
As a {{params['role']}}, you <span class="text-transform: lowercase;">{{params['label']}}</span>
</p>
<p style="margin-top: 20px; margin-bottom: 0; line-height: 24px; font-family: Verdana, Arial, sans-serif; font-size: 16px;">
To access this team, log into Cooperatives Online using your BC Services Card.
</p>
<div style="margin-top: 45px;">
<!--[if mso]> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{ url }}" style="height:55px; v-text-anchor:middle; width:250px;" arcsize="10%" stroke="f" fillcolor="#003366" alias="CTA1">Join Team<w:anchorlock/> <center> <![endif]-->
<a style="display: inline-block; width: 250px; color: #ffffff; border: none; border-radius: 6px; background-color: #003366; line-height: 55px; text-align: center; text-decoration: none; font-size: 16px; font-weight: bold;"
href="{{ url }}">Cooperatives Online</a>
<!--[if mso]> </center> </v:roundrect> <![endif]-->
</div>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>
6 changes: 3 additions & 3 deletions auth-api/migrations/versions/93ba1db65ed3_update_membership_type.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def upgrade():
# ### end Alembic commands ###

# Update all existing user records to active
op.execute('update "membership_type" set icon=\'mdi-account\', label=\'Can add businesses, and file for a business.\' where code=\'MEMBER\'')
op.execute('update "membership_type" set icon=\'mdi-settings\', label=\'Can add/remove team members, add businesses, and file for a business.\' where code=\'ADMIN\'')
op.execute('update "membership_type" set icon=\'mdi-shield-key\', label=\'Can add/remove team members and businesses, and file for a business.\' where code=\'OWNER\'')
op.execute('update "membership_type" set icon=\'mdi-account\', label=\'can add businesses, and file for a business.\' where code=\'MEMBER\'')
op.execute('update "membership_type" set icon=\'mdi-settings\', label=\'can add/remove team members, add businesses, and file for a business.\' where code=\'ADMIN\'')
op.execute('update "membership_type" set icon=\'mdi-shield-key\', label=\'can add/remove team members and businesses, and file for a business.\' where code=\'OWNER\'')


def downgrade():
Expand Down
6 changes: 5 additions & 1 deletion auth-web/src/components/auth/UserProfileForm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,14 @@ export default class UserProfileForm extends Mixins(NextPageMixin) {
.form__btns {
display: flex;
justify-content: space-between;
justify-content: flex-end;
.v-btn + .v-btn {
margin-left: 0.5rem;
}
.deactivate-btn {
margin-right: auto;
}
}
</style>
6 changes: 2 additions & 4 deletions auth-web/src/views/management/UserManagement.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,8 @@
{{ confirmActionText }}
</template>
<template v-slot:actions>
<div>
<v-btn large color="primary" @click="confirmHandler()">{{ primaryActionText }}</v-btn>
<v-btn large color="default" @click="cancelEmailModal()">{{ secondaryActionText }}</v-btn>
</div>
<v-btn large color="primary" @click="confirmHandler()">{{ primaryActionText }}</v-btn>
<v-btn large color="default" @click="cancelEmailModal()">{{ secondaryActionText }}</v-btn>
</template>
</ModalDialog>

Expand Down

0 comments on commit aa09bf3

Please sign in to comment.